* [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT
@ 2022-04-15 4:23 Peng Fan (OSS)
2022-04-15 4:23 ` [PATCH V2 01/12] configs: imx8mm_evk: drop unused SDHC macro Peng Fan (OSS)
` (11 more replies)
0 siblings, 12 replies; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam; +Cc: peng.fan, u-boot
From: Peng Fan <peng.fan@nxp.com>
V2:
Rebase to resolve conflicts
Add R-b/A-b
For platforms with DM_MMC and SPL_DM_MMC, the SDHC macros are not needed.
CONFIG_MMCROOT could be actually dropped.
Drop IMX_FEC_BASE for boards that not use it
Tom, Stefano
this patches changes lots of files, not only imx, to avoid conflict, Tom
would you directly pick up if no issues?
Peng Fan (12):
configs: imx8mm_evk: drop unused SDHC macro
configs: imx8mp_evk: drop unused SDHC macro
configs: imx8mn_evk: drop unused SDHC macro
configs: mx6sxsabresd: drop CONFIG_SYS_FSL_USDHC_NUM
configs: mx7dsabresd: drop unused SDHC macro
configs: imx8qm/qxp_evk: drop unused SDHC macro
configs: verdin-imx8m: drop unused SDHC macro
configs: imx8mm/n_venice: drop unused SDHC macro
configs: phycore_imx8mm/p: drop unused SDHC macro
configs: drop CONFIG_MMCROOT
scripts: config_whitelist: drop CONFIG_MMCROOT
configs: imx: drop IMX_FEC_BASE
include/configs/apalis-imx8x.h | 1 -
include/configs/aristainetos2.h | 4 +---
include/configs/capricorn-common.h | 1 -
include/configs/cgtqmx8.h | 3 +--
include/configs/cl-som-imx7.h | 1 -
include/configs/cm_fx6.h | 1 -
include/configs/colibri-imx6ull.h | 1 -
include/configs/dh_imx6.h | 1 -
include/configs/imx7-cm.h | 3 +--
include/configs/imx8mm-cl-iot-gate.h | 3 +--
include/configs/imx8mm_evk.h | 8 +-------
include/configs/imx8mm_venice.h | 4 ----
include/configs/imx8mn_evk.h | 8 +-------
include/configs/imx8mn_venice.h | 3 ---
include/configs/imx8mp_evk.h | 6 +-----
include/configs/imx8mp_rsb3720.h | 3 +--
include/configs/imx8mq_cm.h | 3 +--
include/configs/imx8mq_evk.h | 3 +--
include/configs/imx8mq_phanbell.h | 3 +--
include/configs/imx8qm_mek.h | 8 +-------
include/configs/imx8qm_rom7720.h | 3 +--
include/configs/imx8qxp_mek.h | 8 +-------
include/configs/imx8ulp_evk.h | 3 +--
include/configs/liteboard.h | 4 +---
include/configs/m53menlo.h | 1 -
include/configs/mccmon6.h | 1 -
include/configs/mx6sllevk.h | 3 +--
include/configs/mx6sxsabresd.h | 3 ---
include/configs/mx6ul_14x14_evk.h | 5 +----
include/configs/mx6ullevk.h | 3 +--
include/configs/mx7dsabresd.h | 9 ---------
include/configs/mx7ulp_com.h | 13 +++++++++++--
include/configs/mx7ulp_evk.h | 3 +--
include/configs/npi_imx6ull.h | 1 -
include/configs/phycore_imx8mm.h | 5 -----
include/configs/phycore_imx8mp.h | 5 -----
include/configs/pico-imx6.h | 1 -
include/configs/pico-imx6ul.h | 1 -
include/configs/pico-imx8mq.h | 3 +--
include/configs/somlabs_visionsom_6ull.h | 1 -
include/configs/tqma6.h | 1 -
include/configs/verdin-imx8mm.h | 3 ---
include/configs/verdin-imx8mp.h | 4 ----
include/configs/vf610twr.h | 1 -
include/configs/vining_2000.h | 1 -
include/configs/xpress.h | 4 +---
scripts/config_whitelist.txt | 1 -
47 files changed, 33 insertions(+), 126 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 01/12] configs: imx8mm_evk: drop unused SDHC macro
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 02/12] configs: imx8mp_evk: " Peng Fan (OSS)
` (10 subsequent siblings)
11 siblings, 1 reply; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam, Peng Fan; +Cc: u-boot, Fabio Estevam
From: Peng Fan <peng.fan@nxp.com>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
Reviewed-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
include/configs/imx8mm_evk.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 23467f599d6..f4b6353ea85 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -78,11 +78,6 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
-/* USDHC */
-
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-
#define CONFIG_FEC_MXC_PHYADDR 0
#define FEC_QUIRK_ENET_MAC
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH V2 02/12] configs: imx8mp_evk: drop unused SDHC macro
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
2022-04-15 4:23 ` [PATCH V2 01/12] configs: imx8mm_evk: drop unused SDHC macro Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-22 8:46 ` sbabic
2022-04-15 4:23 ` [PATCH V2 03/12] configs: imx8mn_evk: " Peng Fan (OSS)
` (9 subsequent siblings)
11 siblings, 1 reply; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam, Peng Fan; +Cc: u-boot, Fabio Estevam
From: Peng Fan <peng.fan@nxp.com>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
Reviewed-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
include/configs/imx8mp_evk.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 5b185cf1de2..35fc27bb370 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -90,7 +90,4 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-
#endif
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH V2 03/12] configs: imx8mn_evk: drop unused SDHC macro
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
2022-04-15 4:23 ` [PATCH V2 01/12] configs: imx8mm_evk: drop unused SDHC macro Peng Fan (OSS)
2022-04-15 4:23 ` [PATCH V2 02/12] configs: imx8mp_evk: " Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-22 8:46 ` sbabic
2022-04-15 4:23 ` [PATCH V2 04/12] configs: mx6sxsabresd: drop CONFIG_SYS_FSL_USDHC_NUM Peng Fan (OSS)
` (8 subsequent siblings)
11 siblings, 1 reply; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam, Peng Fan; +Cc: u-boot, Fabio Estevam
From: Peng Fan <peng.fan@nxp.com>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
Reviewed-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
include/configs/imx8mn_evk.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index 142fc3e4fff..f969314d6b2 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -77,9 +77,4 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
-/* USDHC */
-
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-
#endif
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH V2 04/12] configs: mx6sxsabresd: drop CONFIG_SYS_FSL_USDHC_NUM
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
` (2 preceding siblings ...)
2022-04-15 4:23 ` [PATCH V2 03/12] configs: imx8mn_evk: " Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-22 8:46 ` sbabic
2022-04-15 4:23 ` [PATCH V2 05/12] configs: mx7dsabresd: drop unused SDHC macro Peng Fan (OSS)
` (7 subsequent siblings)
11 siblings, 1 reply; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam; +Cc: peng.fan, u-boot, Fabio Estevam
From: Peng Fan <peng.fan@nxp.com>
With DM_MMC, CONFIG_SYS_FSL_USDHC_NUM is not needed.
Reviewed-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
include/configs/mx6sxsabresd.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index b679d13dc04..2552fc0222e 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -149,6 +149,4 @@
#endif
#endif
-#define CONFIG_SYS_FSL_USDHC_NUM 3
-
#endif /* __CONFIG_H */
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH V2 05/12] configs: mx7dsabresd: drop unused SDHC macro
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
` (3 preceding siblings ...)
2022-04-15 4:23 ` [PATCH V2 04/12] configs: mx6sxsabresd: drop CONFIG_SYS_FSL_USDHC_NUM Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-22 8:46 ` sbabic
2022-04-15 4:23 ` [PATCH V2 06/12] configs: imx8qm/qxp_evk: " Peng Fan (OSS)
` (6 subsequent siblings)
11 siblings, 1 reply; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam, Adrian Alonso; +Cc: peng.fan, u-boot, Fabio Estevam
From: Peng Fan <peng.fan@nxp.com>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDR
Reviewed-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
include/configs/mx7dsabresd.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index d411b1a3866..aaad232f0e4 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -14,9 +14,6 @@
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
-/* MMC Config*/
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-
#ifdef CONFIG_IMX_BOOTAUX
/* Set to QSPI1 A flash at default */
#define CONFIG_SYS_AUXCORE_BOOTDATA 0x60000000
@@ -111,12 +108,6 @@
/* DMA stuff, needed for GPMI/MXS NAND support */
#endif
-#ifdef CONFIG_NAND_MXS
-#define CONFIG_SYS_FSL_USDHC_NUM 1
-#else
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#endif
-
/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH V2 06/12] configs: imx8qm/qxp_evk: drop unused SDHC macro
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
` (4 preceding siblings ...)
2022-04-15 4:23 ` [PATCH V2 05/12] configs: mx7dsabresd: drop unused SDHC macro Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 07/12] configs: verdin-imx8m: " Peng Fan (OSS)
` (5 subsequent siblings)
11 siblings, 1 reply; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam, Peng Fan; +Cc: u-boot, Fabio Estevam
From: Peng Fan <peng.fan@nxp.com>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDR
Reviewed-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
include/configs/imx8qm_mek.h | 5 -----
include/configs/imx8qxp_mek.h | 5 -----
2 files changed, 10 deletions(-)
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 0fe38e61c4b..8a269225778 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -29,10 +29,6 @@
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
#endif
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-#define USDHC1_BASE_ADDR 0x5B010000
-#define USDHC2_BASE_ADDR 0x5B020000
-
#ifdef CONFIG_AHAB_BOOT
#define AHAB_ENV "sec_boot=yes\0"
#else
@@ -122,7 +118,6 @@
/* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */
#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
-#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SYS_SDRAM_BASE 0x80000000
#define PHYS_SDRAM_1 0x80000000
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index beb35c93435..01577932884 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -27,10 +27,6 @@
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
#endif
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-#define USDHC1_BASE_ADDR 0x5B010000
-#define USDHC2_BASE_ADDR 0x5B020000
-
#ifdef CONFIG_AHAB_BOOT
#define AHAB_ENV "sec_boot=yes\0"
#else
@@ -120,7 +116,6 @@
/* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */
#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
-#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SYS_SDRAM_BASE 0x80000000
#define PHYS_SDRAM_1 0x80000000
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH V2 07/12] configs: verdin-imx8m: drop unused SDHC macro
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
` (5 preceding siblings ...)
2022-04-15 4:23 ` [PATCH V2 06/12] configs: imx8qm/qxp_evk: " Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 08/12] configs: imx8mm/n_venice: " Peng Fan (OSS)
` (4 subsequent siblings)
11 siblings, 1 reply; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam, Marcel Ziswiler; +Cc: peng.fan, u-boot, Fabio Estevam
From: Peng Fan <peng.fan@nxp.com>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDR
Reviewed-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
include/configs/verdin-imx8mm.h | 3 ---
include/configs/verdin-imx8mp.h | 4 ----
2 files changed, 7 deletions(-)
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 6c5b190dd95..4ccae42d669 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -97,9 +97,6 @@
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
-/* USDHC */
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
/* ENET */
#define CONFIG_FEC_MXC_PHYADDR 7
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 9e29dc19033..eb2bd867edb 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -116,8 +116,4 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
-/* USDHC */
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-
#endif /* __VERDIN_IMX8MP_H */
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH V2 08/12] configs: imx8mm/n_venice: drop unused SDHC macro
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
` (6 preceding siblings ...)
2022-04-15 4:23 ` [PATCH V2 07/12] configs: verdin-imx8m: " Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 09/12] configs: phycore_imx8mm/p: " Peng Fan (OSS)
` (3 subsequent siblings)
11 siblings, 1 reply; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam, Tim Harvey; +Cc: peng.fan, u-boot, Fabio Estevam
From: Peng Fan <peng.fan@nxp.com>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDR
Reviewed-by: Fabio Estevam <festevam@denx.de>
Acked-By: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
include/configs/imx8mm_venice.h | 4 ----
include/configs/imx8mn_venice.h | 3 ---
2 files changed, 7 deletions(-)
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index eee59a4ca57..70c743559f0 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -108,10 +108,6 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
-/* USDHC */
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-
/* FEC */
#define CONFIG_FEC_MXC_PHYADDR 0
#define FEC_QUIRK_ENET_MAC
diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index d977d326520..b96af29e5d6 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -104,9 +104,6 @@
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
-/* USDHC */
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
/* FEC */
#define CONFIG_FEC_MXC_PHYADDR 0
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH V2 09/12] configs: phycore_imx8mm/p: drop unused SDHC macro
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
` (7 preceding siblings ...)
2022-04-15 4:23 ` [PATCH V2 08/12] configs: imx8mm/n_venice: " Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 10/12] configs: drop CONFIG_MMCROOT Peng Fan (OSS)
` (2 subsequent siblings)
11 siblings, 1 reply; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam, Teresa Remmet; +Cc: peng.fan, u-boot, Fabio Estevam
From: Peng Fan <peng.fan@nxp.com>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDR
Reviewed-by: Fabio Estevam <festevam@denx.de>
Acked-By: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
include/configs/phycore_imx8mm.h | 4 ----
include/configs/phycore_imx8mp.h | 4 ----
2 files changed, 8 deletions(-)
diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 7438d0a4647..528cda0dbe3 100644
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -92,8 +92,4 @@
#define CONFIG_SYS_MAXARGS 64
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-/* USDHC */
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-
#endif /* __PHYCORE_IMX8MM_H */
diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index 8c5ffeef544..db530965a2a 100644
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -92,8 +92,4 @@
#define CONFIG_SYS_MAXARGS 64
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-/* USDHC */
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-
#endif /* __PHYCORE_IMX8MP_H */
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH V2 10/12] configs: drop CONFIG_MMCROOT
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
` (8 preceding siblings ...)
2022-04-15 4:23 ` [PATCH V2 09/12] configs: phycore_imx8mm/p: " Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-21 13:16 ` Stefano Babic
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 11/12] scripts: config_whitelist: " Peng Fan (OSS)
2022-04-15 4:23 ` [PATCH V2 12/12] configs: imx: drop IMX_FEC_BASE Peng Fan (OSS)
11 siblings, 2 replies; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam, Heiko Schocher, Anatolij Gustschin,
Oliver Graute, Uri Mashiach, Ying-Chun Liu (PaulLiu),
Peng Fan, Ilko Iliev, Marco Franchi, Alifer Moraes,
Marcin Niestroj, Teresa Remmet, Marek Vasut
Cc: u-boot, Fabio Estevam
From: Peng Fan <peng.fan@nxp.com>
CONFIG_MMCROOT is only used to set mmcroot, no need a dedicated macro.
Script as below
"
for i in `ls include/configs/*.h`
do
mmcroot=`sed -n '/define.*MMCROOT/ p' $i | awk -F\" '{ print $2;}'`
if [ ! -n "$mmcroot" ]; then
continue
fi
sed -i '/define.*MMCROOT/ d' $i
sed -i 's,\" CONFIG_MMCROOT \",'$mmcroot',g' $i
done
"
Reviewed-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
include/configs/aristainetos2.h | 3 +--
include/configs/capricorn-common.h | 1 -
include/configs/cgtqmx8.h | 3 +--
include/configs/cl-som-imx7.h | 1 -
include/configs/imx7-cm.h | 3 +--
include/configs/imx8mm-cl-iot-gate.h | 3 +--
include/configs/imx8mm_evk.h | 3 +--
include/configs/imx8mn_evk.h | 3 +--
include/configs/imx8mp_evk.h | 3 +--
include/configs/imx8mp_rsb3720.h | 3 +--
include/configs/imx8mq_cm.h | 3 +--
include/configs/imx8mq_evk.h | 3 +--
include/configs/imx8mq_phanbell.h | 3 +--
include/configs/imx8qm_mek.h | 3 +--
include/configs/imx8qm_rom7720.h | 3 +--
include/configs/imx8qxp_mek.h | 3 +--
include/configs/imx8ulp_evk.h | 3 +--
include/configs/liteboard.h | 3 +--
include/configs/mx6sllevk.h | 3 +--
include/configs/mx6ul_14x14_evk.h | 3 +--
include/configs/mx6ullevk.h | 3 +--
include/configs/mx7ulp_com.h | 13 +++++++++++--
include/configs/mx7ulp_evk.h | 3 +--
include/configs/phycore_imx8mm.h | 1 -
include/configs/phycore_imx8mp.h | 1 -
include/configs/pico-imx8mq.h | 3 +--
include/configs/xpress.h | 3 +--
27 files changed, 33 insertions(+), 50 deletions(-)
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 611b6d724e1..0dcd4cae2fa 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -26,7 +26,6 @@
#include "mx6_common.h"
-#define CONFIG_MMCROOT "/dev/mmcblk0p1"
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
@@ -183,7 +182,7 @@
"${pubkey}\0" \
"mainRargs=setenv bootargs console=${console},${baudrate} " \
"rescue_sysnum=${rescue_sysnum} root=${emmcroot} rootfstype=ext4\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
"mmcRargs=setenv bootargs console=${console},${baudrate} " \
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 58d7a3a8ce2..08534cd1a30 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -109,7 +109,6 @@
#define CONFIG_SYS_INIT_SP_ADDR 0x80200000
/* On CCP board, USDHC1 is for eMMC */
-#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* eMMC */
#define CONFIG_SYS_SDRAM_BASE 0x80000000
#define PHYS_SDRAM_1 0x80000000
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index bd5c072382a..4b4694ec071 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -78,7 +78,7 @@
"fdt_file=imx8qm-cgt-qmx8.dtb\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot} earlycon\0 " \
"loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
@@ -122,7 +122,6 @@
#define CONFIG_SYS_INIT_SP_ADDR 0x80200000
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_SYS_FSL_USDHC_NUM 3
#define CONFIG_SYS_SDRAM_BASE 0x80000000
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 8af80f58f8e..4b494d8aeef 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -104,7 +104,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
#endif
/* USB Configs */
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 46ca1c58145..2d9f8bb510b 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -31,7 +31,7 @@
"fdt_addr=0x83000000\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
@@ -83,7 +83,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 14d3f3cac65..05fe2444f53 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -79,7 +79,7 @@
"bootm_size=0x10000000\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
"loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
@@ -131,7 +131,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
#define PHYS_SDRAM 0x40000000
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index f4b6353ea85..42b78485cfc 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -52,7 +52,7 @@
"initrd_addr=0x43800000\0" \
"bootm_size=0x10000000\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
/* Link Definitions */
@@ -63,7 +63,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
#define PHYS_SDRAM 0x40000000
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index f969314d6b2..86b75ab4625 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -51,7 +51,7 @@
"initrd_addr=0x43800000\0" \
"bootm_size=0x10000000\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
/* Link Definitions */
@@ -62,7 +62,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
#define PHYS_SDRAM 0x40000000
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 35fc27bb370..cc8d65cb54e 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -61,7 +61,7 @@
"initrd_addr=0x43800000\0" \
"bootm_size=0x10000000\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
/* Link Definitions */
@@ -72,7 +72,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
/* Totally 6GB DDR */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 62e06d23034..b80a5f91525 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -95,7 +95,7 @@
"bootm_size=0x10000000\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs ${jh_clk} console=${console} root=${mmcroot}\0 " \
"loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
@@ -146,7 +146,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
/* Totally 6GB or 4G DDR */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index a3bb3c9d291..989486aa6dc 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -55,7 +55,7 @@
"initrd_addr=0x43800000\0" \
"bootm_size=0x10000000\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
/* Link Definitions */
@@ -66,7 +66,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
#define PHYS_SDRAM 0x40000000
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 94886fa268c..f7929e5867e 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -62,7 +62,7 @@
"initrd_addr=0x43800000\0" \
"bootm_size=0x10000000\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
/* Link Definitions */
@@ -73,7 +73,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
#define PHYS_SDRAM 0x40000000
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index ef5992d7c39..f6410114b76 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -52,7 +52,7 @@
"initrd_high=0xffffffffffffffff\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
"loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
@@ -101,7 +101,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
#define PHYS_SDRAM 0x40000000
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 8a269225778..9452ba56152 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -50,7 +50,7 @@
"initrd_high=0xffffffffffffffff\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
"loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
@@ -117,7 +117,6 @@
/* Default environment is in SD */
/* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_SYS_SDRAM_BASE 0x80000000
#define PHYS_SDRAM_1 0x80000000
diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index 7532c6e7551..04a2216fcd8 100644
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -66,7 +66,7 @@
"initrd_addr=0x83800000\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk2p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot} earlycon\0 " \
"loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
@@ -114,7 +114,6 @@
* USDHC3 is for SD on base board On DDR4 board, USDHC1 is mux for NAND,
* USDHC2 is for SD, USDHC3 is for SD on base board
*/
-#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */
#define CONFIG_SYS_FSL_USDHC_NUM 3
#define CONFIG_SYS_SDRAM_BASE 0x80000000
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 01577932884..c290c19c347 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -48,7 +48,7 @@
"initrd_high=0xffffffffffffffff\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot}\0 " \
"loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
@@ -115,7 +115,6 @@
/* Default environment is in SD */
/* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_SYS_SDRAM_BASE 0x80000000
#define PHYS_SDRAM_1 0x80000000
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index f078c37c2de..46cba330b23 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -58,7 +58,7 @@
"initrd_addr=0x83800000\0" \
"bootm_size=0x10000000\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk2p2 rootwait rw\0" \
/* Link Definitions */
@@ -67,7 +67,6 @@
#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk2p2"
#define CONFIG_SYS_SDRAM_BASE 0x80000000
#define PHYS_SDRAM 0x80000000
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index d0960bcaf9a..e8fd4e7a8e8 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -35,7 +35,7 @@
"ip_dyn=yes\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
@@ -100,7 +100,6 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* FLASH and environment organization */
-#define CONFIG_MMCROOT "/dev/mmcblk0p2"
/* USB Configs */
#ifdef CONFIG_CMD_USB
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index 0793028ba1f..1b32f58afca 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -25,7 +25,7 @@
"ip_dyn=yes\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
@@ -92,7 +92,6 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* Environment organization */
-#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 17e7ae0b4cc..72554d18b0a 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -47,7 +47,7 @@
"videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
@@ -121,7 +121,6 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* environment organization */
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
/* USB Configs */
#ifdef CONFIG_CMD_USB
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index dfcdc00c061..bc494b46b69 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -43,7 +43,7 @@
"videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
@@ -118,7 +118,6 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* environment organization */
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_IOMUX_LPSR
diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
index ce6afcde2a0..c790374d1a5 100644
--- a/include/configs/mx7ulp_com.h
+++ b/include/configs/mx7ulp_com.h
@@ -17,7 +17,16 @@
#define CONFIG_SYS_BOOTM_LEN 0x1000000
-#define CONFIG_MMCROOT "/dev/mmcblk0p2"
+/*
+ * Detect overlap between U-Boot image and environment area in build-time
+ *
+ * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot-dtb.imx offset
+ * CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408
+ *
+ * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so
+ * write the direct value here
+ */
+#define CONFIG_BOARD_SIZE_LIMIT 785408
/* Using ULP WDOG for reset */
#define WDOG_BASE_ADDR WDG1_RBASE
@@ -41,7 +50,7 @@
"fdt_addr=0x63000000\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index e80d748d991..7644274d84b 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -13,7 +13,6 @@
#define CONFIG_SYS_BOOTM_LEN 0x1000000
-#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
/* Using ULP WDOG for reset */
#define WDOG_BASE_ADDR WDG1_RBASE
@@ -47,7 +46,7 @@
"ip_dyn=yes\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 528cda0dbe3..71f0c42ec0c 100644
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -77,7 +77,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index db530965a2a..0c963b62b3b 100644
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -77,7 +77,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 495fddf248d..95845276e7b 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -46,7 +46,7 @@
"initrd_high=0xffffffffffffffff\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
"loadbootscript=" \
@@ -80,7 +80,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
#define CONFIG_SYS_SDRAM_BASE 0x40000000
#define PHYS_SDRAM 0x40000000
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 13cfa2cd4bd..43b67a355b1 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -34,7 +34,6 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* Environment is in stored in the eMMC boot partition */
-#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC2 */
/* USB Configs */
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
@@ -61,7 +60,7 @@
"ip_dyn=yes\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH V2 11/12] scripts: config_whitelist: drop CONFIG_MMCROOT
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
` (9 preceding siblings ...)
2022-04-15 4:23 ` [PATCH V2 10/12] configs: drop CONFIG_MMCROOT Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 12/12] configs: imx: drop IMX_FEC_BASE Peng Fan (OSS)
11 siblings, 1 reply; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam; +Cc: peng.fan, u-boot, Fabio Estevam
From: Peng Fan <peng.fan@nxp.com>
Drop CONFIG_MMCROOT, no users now.
Reviewed-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
scripts/config_whitelist.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ef7dbbfe982..12dd6e0302d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -418,7 +418,6 @@ CONFIG_MII_DEFAULT_TSEC
CONFIG_MISC_COMMON
CONFIG_MIU_2BIT_21_7_INTERLEAVED
CONFIG_MIU_2BIT_INTERLEAVED
-CONFIG_MMCROOT
CONFIG_MMC_DEFAULT_DEV
CONFIG_MMC_SUNXI_SLOT
CONFIG_MONITOR_IS_IN_RAM
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH V2 12/12] configs: imx: drop IMX_FEC_BASE
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
` (10 preceding siblings ...)
2022-04-15 4:23 ` [PATCH V2 11/12] scripts: config_whitelist: " Peng Fan (OSS)
@ 2022-04-15 4:23 ` Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
11 siblings, 1 reply; 27+ messages in thread
From: Peng Fan (OSS) @ 2022-04-15 4:23 UTC (permalink / raw)
To: sbabic, festevam, Marcel Ziswiler, Heiko Schocher,
Nikita Kiryanov, Andreas Geisreiter, Christoph Niedermaier,
Marcin Niestroj, Marek Vasut, Olaf Mandel, Lukasz Majewski,
Peng Fan, Navin Sankar Velliangiri, Richard Hu, Arkadiusz Karas,
Markus Niebel, Alison Wang, Silvio Fricke
Cc: u-boot, Fabio Estevam, u-boot
From: Peng Fan <peng.fan@nxp.com>
IMX_FEC_BASE is not used in these boards, so drop it.
Reviewed-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
include/configs/apalis-imx8x.h | 1 -
include/configs/aristainetos2.h | 1 -
include/configs/cm_fx6.h | 1 -
include/configs/colibri-imx6ull.h | 1 -
include/configs/dh_imx6.h | 1 -
include/configs/liteboard.h | 1 -
include/configs/m53menlo.h | 1 -
include/configs/mccmon6.h | 1 -
include/configs/mx6sxsabresd.h | 1 -
include/configs/mx6ul_14x14_evk.h | 2 --
include/configs/npi_imx6ull.h | 1 -
include/configs/pico-imx6.h | 1 -
include/configs/pico-imx6ul.h | 1 -
include/configs/somlabs_visionsom_6ull.h | 1 -
include/configs/tqma6.h | 1 -
include/configs/vf610twr.h | 1 -
include/configs/vining_2000.h | 1 -
include/configs/xpress.h | 1 -
18 files changed, 19 deletions(-)
diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h
index 71a80f38bbb..762bc49e671 100644
--- a/include/configs/apalis-imx8x.h
+++ b/include/configs/apalis-imx8x.h
@@ -120,7 +120,6 @@
/* Networking */
#define CONFIG_FEC_ENET_DEV 0
-#define IMX_FEC_BASE 0x5b040000
#define CONFIG_FEC_MXC_PHYADDR 0x4
#define PHY_ANEG_TIMEOUT 20000
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 0dcd4cae2fa..8ee97f1d4e3 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -30,7 +30,6 @@
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index f836f920bd8..600999b8e72 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -147,7 +147,6 @@
/* Ethernet */
#define CONFIG_FEC_MXC_PHYADDR 0
-#define IMX_FEC_BASE ENET_BASE_ADDR
/* USB */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 281815e0863..5a7193a127f 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -16,7 +16,6 @@
#define PHYS_SDRAM_SIZE SZ_1G
/* ENET1 */
-#define IMX_FEC_BASE ENET2_BASE_ADDR
/* MMC Config */
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 3d3fab517e3..2b14464dff1 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -31,7 +31,6 @@
#define CONFIG_SYS_BOOTCOUNT_BE
/* FEC ethernet */
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 7
/* MMC Configs */
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index e8fd4e7a8e8..fdea7241b02 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -112,7 +112,6 @@
#ifdef CONFIG_CMD_NET
#define CONFIG_FEC_ENET_DEV 0
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x0
#endif
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 5bd6cbefc67..90877f548d6 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -69,7 +69,6 @@
* Ethernet on SOC (FEC)
*/
#ifdef CONFIG_CMD_NET
-#define IMX_FEC_BASE FEC_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x0
#endif
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 59184290f37..dcce52eb7d3 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -40,7 +40,6 @@
#define CONFIG_SYS_FLASH_BANKS_SIZES { (32 * SZ_1M) }
/* Ethernet Configuration */
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 1
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 2552fc0222e..76e3dc8b382 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -126,7 +126,6 @@
/* Network */
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x1
#ifdef CONFIG_CMD_USB
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 72554d18b0a..03d799ce654 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -134,10 +134,8 @@
#define CONFIG_FEC_ENET_DEV 1
#if (CONFIG_FEC_ENET_DEV == 0)
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x2
#elif (CONFIG_FEC_ENET_DEV == 1)
-#define IMX_FEC_BASE ENET2_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x1
#endif
#endif
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 1e40fad9644..c250fa65060 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -46,7 +46,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#ifdef CONFIG_CMD_NET
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x1
#endif
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 855d7993486..c288908046a 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -117,7 +117,6 @@
/* Environment organization */
/* Ethernet Configuration */
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 1
/* Framebuffer */
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 39be4335709..1f111ea3064 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -27,7 +27,6 @@
/* Network support */
-#define IMX_FEC_BASE ENET2_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x1
#define CONFIG_MXC_UART_BASE UART6_BASE_ADDR
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index 9946fe92fb4..d4761296c75 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -78,7 +78,6 @@
#endif
#ifdef CONFIG_CMD_NET
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x1
#endif
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index c11e5c1d88b..e0cd1ec2518 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -55,7 +55,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */
-#define IMX_FEC_BASE ENET_BASE_ADDR
#if defined(CONFIG_TQMA6X_MMC_BOOT)
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index db7c8be7ce0..ec9049e1b3d 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -23,7 +23,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 1
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0
/* I2C Configs */
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index e101739858f..e7d4fd16cc7 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -44,7 +44,6 @@
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
/* Network */
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x0
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 43b67a355b1..bd39b328a67 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -42,7 +42,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_FEC_ENET_DEV 0
-#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC_PHYADDR 0x0
#define CONFIG_UBOOT_SECTOR_START 0x2
--
2.35.1
^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCH V2 10/12] configs: drop CONFIG_MMCROOT
2022-04-15 4:23 ` [PATCH V2 10/12] configs: drop CONFIG_MMCROOT Peng Fan (OSS)
@ 2022-04-21 13:16 ` Stefano Babic
2022-04-21 13:19 ` Stefano Babic
2022-04-22 8:47 ` sbabic
1 sibling, 1 reply; 27+ messages in thread
From: Stefano Babic @ 2022-04-21 13:16 UTC (permalink / raw)
To: Peng Fan (OSS),
sbabic, festevam, Heiko Schocher, Anatolij Gustschin,
Oliver Graute, Uri Mashiach, Ying-Chun Liu (PaulLiu),
Peng Fan, Ilko Iliev, Marco Franchi, Alifer Moraes,
Marcin Niestroj, Teresa Remmet, Marek Vasut
Cc: u-boot, Fabio Estevam
On 15.04.22 06:23, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> CONFIG_MMCROOT is only used to set mmcroot, no need a dedicated macro.
>
> Script as below
> "
> for i in `ls include/configs/*.h`
> do
> mmcroot=`sed -n '/define.*MMCROOT/ p' $i | awk -F\" '{ print $2;}'`
>
> if [ ! -n "$mmcroot" ]; then
> continue
> fi
>
> sed -i '/define.*MMCROOT/ d' $i
> sed -i 's,\" CONFIG_MMCROOT \",'$mmcroot',g' $i
>
> done
> "
...but if this is generated by a script....
>
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
> include/configs/aristainetos2.h | 3 +--
> include/configs/capricorn-common.h | 1 -
> include/configs/cgtqmx8.h | 3 +--
> include/configs/cl-som-imx7.h | 1 -
> include/configs/imx7-cm.h | 3 +--
> include/configs/imx8mm-cl-iot-gate.h | 3 +--
> include/configs/imx8mm_evk.h | 3 +--
> include/configs/imx8mn_evk.h | 3 +--
> include/configs/imx8mp_evk.h | 3 +--
> include/configs/imx8mp_rsb3720.h | 3 +--
> include/configs/imx8mq_cm.h | 3 +--
> include/configs/imx8mq_evk.h | 3 +--
> include/configs/imx8mq_phanbell.h | 3 +--
> include/configs/imx8qm_mek.h | 3 +--
> include/configs/imx8qm_rom7720.h | 3 +--
> include/configs/imx8qxp_mek.h | 3 +--
> include/configs/imx8ulp_evk.h | 3 +--
> include/configs/liteboard.h | 3 +--
> include/configs/mx6sllevk.h | 3 +--
> include/configs/mx6ul_14x14_evk.h | 3 +--
> include/configs/mx6ullevk.h | 3 +--
> include/configs/mx7ulp_com.h | 13 +++++++++++--
> include/configs/mx7ulp_evk.h | 3 +--
> include/configs/phycore_imx8mm.h | 1 -
> include/configs/phycore_imx8mp.h | 1 -
> include/configs/pico-imx8mq.h | 3 +--
> include/configs/xpress.h | 3 +--
> 27 files changed, 33 insertions(+), 50 deletions(-)
>
> diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
> index 611b6d724e1..0dcd4cae2fa 100644
> --- a/include/configs/aristainetos2.h
> +++ b/include/configs/aristainetos2.h
> @@ -26,7 +26,6 @@
>
> #include "mx6_common.h"
>
> -#define CONFIG_MMCROOT "/dev/mmcblk0p1"
>
> /* MMC Configs */
> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
> @@ -183,7 +182,7 @@
> "${pubkey}\0" \
> "mainRargs=setenv bootargs console=${console},${baudrate} " \
> "rescue_sysnum=${rescue_sysnum} root=${emmcroot} rootfstype=ext4\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} " \
> "root=${mmcroot}\0" \
> "mmcRargs=setenv bootargs console=${console},${baudrate} " \
> diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
> index 58d7a3a8ce2..08534cd1a30 100644
> --- a/include/configs/capricorn-common.h
> +++ b/include/configs/capricorn-common.h
> @@ -109,7 +109,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR 0x80200000
>
> /* On CCP board, USDHC1 is for eMMC */
> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* eMMC */
>
> #define CONFIG_SYS_SDRAM_BASE 0x80000000
> #define PHYS_SDRAM_1 0x80000000
> diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
> index bd5c072382a..4b4694ec071 100644
> --- a/include/configs/cgtqmx8.h
> +++ b/include/configs/cgtqmx8.h
> @@ -78,7 +78,7 @@
> "fdt_file=imx8qm-cgt-qmx8.dtb\0" \
> "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot} earlycon\0 " \
> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> @@ -122,7 +122,6 @@
>
> #define CONFIG_SYS_INIT_SP_ADDR 0x80200000
>
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
> #define CONFIG_SYS_FSL_USDHC_NUM 3
>
> #define CONFIG_SYS_SDRAM_BASE 0x80000000
> diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
> index 8af80f58f8e..4b494d8aeef 100644
> --- a/include/configs/cl-som-imx7.h
> +++ b/include/configs/cl-som-imx7.h
> @@ -104,7 +104,6 @@
> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
>
> #define CONFIG_SYS_FSL_USDHC_NUM 2
> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
> #endif
>
> /* USB Configs */
> diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
> index 46ca1c58145..2d9f8bb510b 100644
> --- a/include/configs/imx7-cm.h
> +++ b/include/configs/imx7-cm.h
> @@ -31,7 +31,7 @@
> "fdt_addr=0x83000000\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} " \
> "root=${mmcroot}\0" \
> "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
> @@ -83,7 +83,6 @@
> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
> #define CONFIG_SYS_FSL_USDHC_NUM 2
>
> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
>
> /* USB Configs */
> #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
> diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
> index 14d3f3cac65..05fe2444f53 100644
> --- a/include/configs/imx8mm-cl-iot-gate.h
> +++ b/include/configs/imx8mm-cl-iot-gate.h
> @@ -79,7 +79,7 @@
> "bootm_size=0x10000000\0" \
> "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> @@ -131,7 +131,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR \
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> #define CONFIG_SYS_SDRAM_BASE 0x40000000
> #define PHYS_SDRAM 0x40000000
> diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
> index f4b6353ea85..42b78485cfc 100644
> --- a/include/configs/imx8mm_evk.h
> +++ b/include/configs/imx8mm_evk.h
> @@ -52,7 +52,7 @@
> "initrd_addr=0x43800000\0" \
> "bootm_size=0x10000000\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>
> /* Link Definitions */
>
> @@ -63,7 +63,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR \
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> #define CONFIG_SYS_SDRAM_BASE 0x40000000
> #define PHYS_SDRAM 0x40000000
> diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
> index f969314d6b2..86b75ab4625 100644
> --- a/include/configs/imx8mn_evk.h
> +++ b/include/configs/imx8mn_evk.h
> @@ -51,7 +51,7 @@
> "initrd_addr=0x43800000\0" \
> "bootm_size=0x10000000\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>
> /* Link Definitions */
>
> @@ -62,7 +62,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR \
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> #define CONFIG_SYS_SDRAM_BASE 0x40000000
> #define PHYS_SDRAM 0x40000000
> diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
> index 35fc27bb370..cc8d65cb54e 100644
> --- a/include/configs/imx8mp_evk.h
> +++ b/include/configs/imx8mp_evk.h
> @@ -61,7 +61,7 @@
> "initrd_addr=0x43800000\0" \
> "bootm_size=0x10000000\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>
> /* Link Definitions */
>
> @@ -72,7 +72,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR \
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> /* Totally 6GB DDR */
> #define CONFIG_SYS_SDRAM_BASE 0x40000000
> diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
> index 62e06d23034..b80a5f91525 100644
> --- a/include/configs/imx8mp_rsb3720.h
> +++ b/include/configs/imx8mp_rsb3720.h
> @@ -95,7 +95,7 @@
> "bootm_size=0x10000000\0" \
> "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs ${jh_clk} console=${console} root=${mmcroot}\0 " \
> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> @@ -146,7 +146,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR \
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> /* Totally 6GB or 4G DDR */
> #define CONFIG_SYS_SDRAM_BASE 0x40000000
> diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
> index a3bb3c9d291..989486aa6dc 100644
> --- a/include/configs/imx8mq_cm.h
> +++ b/include/configs/imx8mq_cm.h
> @@ -55,7 +55,7 @@
> "initrd_addr=0x43800000\0" \
> "bootm_size=0x10000000\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>
> /* Link Definitions */
>
> @@ -66,7 +66,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR \
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> #define CONFIG_SYS_SDRAM_BASE 0x40000000
> #define PHYS_SDRAM 0x40000000
> diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
> index 94886fa268c..f7929e5867e 100644
> --- a/include/configs/imx8mq_evk.h
> +++ b/include/configs/imx8mq_evk.h
> @@ -62,7 +62,7 @@
> "initrd_addr=0x43800000\0" \
> "bootm_size=0x10000000\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>
> /* Link Definitions */
>
> @@ -73,7 +73,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR \
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> #define CONFIG_SYS_SDRAM_BASE 0x40000000
> #define PHYS_SDRAM 0x40000000
> diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
> index ef5992d7c39..f6410114b76 100644
> --- a/include/configs/imx8mq_phanbell.h
> +++ b/include/configs/imx8mq_phanbell.h
> @@ -52,7 +52,7 @@
> "initrd_high=0xffffffffffffffff\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> @@ -101,7 +101,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR \
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> #define CONFIG_SYS_SDRAM_BASE 0x40000000
> #define PHYS_SDRAM 0x40000000
> diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
> index 8a269225778..9452ba56152 100644
> --- a/include/configs/imx8qm_mek.h
> +++ b/include/configs/imx8qm_mek.h
> @@ -50,7 +50,7 @@
> "initrd_high=0xffffffffffffffff\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> @@ -117,7 +117,6 @@
> /* Default environment is in SD */
>
> /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> #define CONFIG_SYS_SDRAM_BASE 0x80000000
> #define PHYS_SDRAM_1 0x80000000
> diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
> index 7532c6e7551..04a2216fcd8 100644
> --- a/include/configs/imx8qm_rom7720.h
> +++ b/include/configs/imx8qm_rom7720.h
> @@ -66,7 +66,7 @@
> "initrd_addr=0x83800000\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk2p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot} earlycon\0 " \
> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> @@ -114,7 +114,6 @@
> * USDHC3 is for SD on base board On DDR4 board, USDHC1 is mux for NAND,
> * USDHC2 is for SD, USDHC3 is for SD on base board
> */
> -#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */
> #define CONFIG_SYS_FSL_USDHC_NUM 3
>
> #define CONFIG_SYS_SDRAM_BASE 0x80000000
> diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
> index 01577932884..c290c19c347 100644
> --- a/include/configs/imx8qxp_mek.h
> +++ b/include/configs/imx8qxp_mek.h
> @@ -48,7 +48,7 @@
> "initrd_high=0xffffffffffffffff\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot}\0 " \
> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> @@ -115,7 +115,6 @@
> /* Default environment is in SD */
>
> /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> #define CONFIG_SYS_SDRAM_BASE 0x80000000
> #define PHYS_SDRAM_1 0x80000000
> diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
> index f078c37c2de..46cba330b23 100644
> --- a/include/configs/imx8ulp_evk.h
> +++ b/include/configs/imx8ulp_evk.h
> @@ -58,7 +58,7 @@
> "initrd_addr=0x83800000\0" \
> "bootm_size=0x10000000\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk2p2 rootwait rw\0" \
>
> /* Link Definitions */
>
> @@ -67,7 +67,6 @@
> #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
> #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk2p2"
>
> #define CONFIG_SYS_SDRAM_BASE 0x80000000
> #define PHYS_SDRAM 0x80000000
> diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
> index d0960bcaf9a..e8fd4e7a8e8 100644
> --- a/include/configs/liteboard.h
> +++ b/include/configs/liteboard.h
> @@ -35,7 +35,7 @@
> "ip_dyn=yes\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} " \
> "root=${mmcroot}\0" \
> @@ -100,7 +100,6 @@
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> /* FLASH and environment organization */
> -#define CONFIG_MMCROOT "/dev/mmcblk0p2"
>
> /* USB Configs */
> #ifdef CONFIG_CMD_USB
> diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
> index 0793028ba1f..1b32f58afca 100644
> --- a/include/configs/mx6sllevk.h
> +++ b/include/configs/mx6sllevk.h
> @@ -25,7 +25,7 @@
> "ip_dyn=yes\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} " \
> "root=${mmcroot}\0" \
> @@ -92,7 +92,6 @@
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> /* Environment organization */
> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
>
> /* MMC Configs */
> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
> diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
> index 17e7ae0b4cc..72554d18b0a 100644
> --- a/include/configs/mx6ul_14x14_evk.h
> +++ b/include/configs/mx6ul_14x14_evk.h
> @@ -47,7 +47,7 @@
> "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} " \
> "root=${mmcroot}\0" \
> @@ -121,7 +121,6 @@
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> /* environment organization */
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> /* USB Configs */
> #ifdef CONFIG_CMD_USB
> diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
> index dfcdc00c061..bc494b46b69 100644
> --- a/include/configs/mx6ullevk.h
> +++ b/include/configs/mx6ullevk.h
> @@ -43,7 +43,7 @@
> "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} " \
> "root=${mmcroot}\0" \
> @@ -118,7 +118,6 @@
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> /* environment organization */
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> #define CONFIG_IOMUX_LPSR
>
> diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
> index ce6afcde2a0..c790374d1a5 100644
> --- a/include/configs/mx7ulp_com.h
> +++ b/include/configs/mx7ulp_com.h
> @@ -17,7 +17,16 @@
>
> #define CONFIG_SYS_BOOTM_LEN 0x1000000
>
> -#define CONFIG_MMCROOT "/dev/mmcblk0p2"
> +/*
> + * Detect overlap between U-Boot image and environment area in build-time
> + *
> + * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot-dtb.imx offset
> + * CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408
> + *
> + * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so
> + * write the direct value here
> + */
> +#define CONFIG_BOARD_SIZE_LIMIT 785408
>
..how is it possible that CONFIG_BOARD_SIZE_LIMIT is added ?
This does not belong to the series, and it should not be here but in
configs/
Best regards,
Stefano
> /* Using ULP WDOG for reset */
> #define WDOG_BASE_ADDR WDG1_RBASE
> @@ -41,7 +50,7 @@
> "fdt_addr=0x63000000\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} " \
> "root=${mmcroot}\0" \
> "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
> diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
> index e80d748d991..7644274d84b 100644
> --- a/include/configs/mx7ulp_evk.h
> +++ b/include/configs/mx7ulp_evk.h
> @@ -13,7 +13,6 @@
>
> #define CONFIG_SYS_BOOTM_LEN 0x1000000
>
> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
>
> /* Using ULP WDOG for reset */
> #define WDOG_BASE_ADDR WDG1_RBASE
> @@ -47,7 +46,7 @@
> "ip_dyn=yes\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} " \
> "root=${mmcroot}\0" \
> diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
> index 528cda0dbe3..71f0c42ec0c 100644
> --- a/include/configs/phycore_imx8mm.h
> +++ b/include/configs/phycore_imx8mm.h
> @@ -77,7 +77,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR \
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */
>
> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>
> diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
> index db530965a2a..0c963b62b3b 100644
> --- a/include/configs/phycore_imx8mp.h
> +++ b/include/configs/phycore_imx8mp.h
> @@ -77,7 +77,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR \
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */
>
> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>
> diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
> index 495fddf248d..95845276e7b 100644
> --- a/include/configs/pico-imx8mq.h
> +++ b/include/configs/pico-imx8mq.h
> @@ -46,7 +46,7 @@
> "initrd_high=0xffffffffffffffff\0" \
> "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
> "loadbootscript=" \
> @@ -80,7 +80,6 @@
> #define CONFIG_SYS_INIT_SP_ADDR \
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>
> #define CONFIG_SYS_SDRAM_BASE 0x40000000
> #define PHYS_SDRAM 0x40000000
> diff --git a/include/configs/xpress.h b/include/configs/xpress.h
> index 13cfa2cd4bd..43b67a355b1 100644
> --- a/include/configs/xpress.h
> +++ b/include/configs/xpress.h
> @@ -34,7 +34,6 @@
> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>
> /* Environment is in stored in the eMMC boot partition */
> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC2 */
>
> /* USB Configs */
> #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
> @@ -61,7 +60,7 @@
> "ip_dyn=yes\0" \
> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
> "mmcautodetect=yes\0" \
> "mmcargs=setenv bootargs console=${console},${baudrate} " \
> "root=${mmcroot}\0" \
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH V2 10/12] configs: drop CONFIG_MMCROOT
2022-04-21 13:16 ` Stefano Babic
@ 2022-04-21 13:19 ` Stefano Babic
0 siblings, 0 replies; 27+ messages in thread
From: Stefano Babic @ 2022-04-21 13:19 UTC (permalink / raw)
To: Peng Fan (OSS),
festevam, Heiko Schocher, Anatolij Gustschin, Oliver Graute,
Uri Mashiach, Ying-Chun Liu (PaulLiu),
Peng Fan, Ilko Iliev, Marco Franchi, Alifer Moraes,
Marcin Niestroj, Teresa Remmet, Marek Vasut
Cc: u-boot, Fabio Estevam
On 21.04.22 15:16, Stefano Babic wrote:
> On 15.04.22 06:23, Peng Fan (OSS) wrote:
>> From: Peng Fan <peng.fan@nxp.com>
>>
>> CONFIG_MMCROOT is only used to set mmcroot, no need a dedicated macro.
>>
>> Script as below
>> "
>> for i in `ls include/configs/*.h`
>> do
>> mmcroot=`sed -n '/define.*MMCROOT/ p' $i | awk -F\" '{ print $2;}'`
>>
>> if [ ! -n "$mmcroot" ]; then
>> continue
>> fi
>>
>> sed -i '/define.*MMCROOT/ d' $i
>> sed -i 's,\" CONFIG_MMCROOT \",'$mmcroot',g' $i
>>
>> done
>> "
>
> ...but if this is generated by a script....
>
>>
>> Reviewed-by: Fabio Estevam <festevam@denx.de>
>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
>> ---
>> include/configs/aristainetos2.h | 3 +--
>> include/configs/capricorn-common.h | 1 -
>> include/configs/cgtqmx8.h | 3 +--
>> include/configs/cl-som-imx7.h | 1 -
>> include/configs/imx7-cm.h | 3 +--
>> include/configs/imx8mm-cl-iot-gate.h | 3 +--
>> include/configs/imx8mm_evk.h | 3 +--
>> include/configs/imx8mn_evk.h | 3 +--
>> include/configs/imx8mp_evk.h | 3 +--
>> include/configs/imx8mp_rsb3720.h | 3 +--
>> include/configs/imx8mq_cm.h | 3 +--
>> include/configs/imx8mq_evk.h | 3 +--
>> include/configs/imx8mq_phanbell.h | 3 +--
>> include/configs/imx8qm_mek.h | 3 +--
>> include/configs/imx8qm_rom7720.h | 3 +--
>> include/configs/imx8qxp_mek.h | 3 +--
>> include/configs/imx8ulp_evk.h | 3 +--
>> include/configs/liteboard.h | 3 +--
>> include/configs/mx6sllevk.h | 3 +--
>> include/configs/mx6ul_14x14_evk.h | 3 +--
>> include/configs/mx6ullevk.h | 3 +--
>> include/configs/mx7ulp_com.h | 13 +++++++++++--
>> include/configs/mx7ulp_evk.h | 3 +--
>> include/configs/phycore_imx8mm.h | 1 -
>> include/configs/phycore_imx8mp.h | 1 -
>> include/configs/pico-imx8mq.h | 3 +--
>> include/configs/xpress.h | 3 +--
>> 27 files changed, 33 insertions(+), 50 deletions(-)
>>
>> diff --git a/include/configs/aristainetos2.h
>> b/include/configs/aristainetos2.h
>> index 611b6d724e1..0dcd4cae2fa 100644
>> --- a/include/configs/aristainetos2.h
>> +++ b/include/configs/aristainetos2.h
>> @@ -26,7 +26,6 @@
>> #include "mx6_common.h"
>> -#define CONFIG_MMCROOT "/dev/mmcblk0p1"
>> /* MMC Configs */
>> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
>> @@ -183,7 +182,7 @@
>> "${pubkey}\0" \
>> "mainRargs=setenv bootargs console=${console},${baudrate} " \
>> "rescue_sysnum=${rescue_sysnum} root=${emmcroot}
>> rootfstype=ext4\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate} " \
>> "root=${mmcroot}\0" \
>> "mmcRargs=setenv bootargs console=${console},${baudrate} " \
>> diff --git a/include/configs/capricorn-common.h
>> b/include/configs/capricorn-common.h
>> index 58d7a3a8ce2..08534cd1a30 100644
>> --- a/include/configs/capricorn-common.h
>> +++ b/include/configs/capricorn-common.h
>> @@ -109,7 +109,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR 0x80200000
>> /* On CCP board, USDHC1 is for eMMC */
>> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* eMMC */
>> #define CONFIG_SYS_SDRAM_BASE 0x80000000
>> #define PHYS_SDRAM_1 0x80000000
>> diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
>> index bd5c072382a..4b4694ec071 100644
>> --- a/include/configs/cgtqmx8.h
>> +++ b/include/configs/cgtqmx8.h
>> @@ -78,7 +78,7 @@
>> "fdt_file=imx8qm-cgt-qmx8.dtb\0" \
>> "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate}
>> root=${mmcroot} earlycon\0 " \
>> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
>> ${script};\0" \
>> @@ -122,7 +122,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR 0x80200000
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> #define CONFIG_SYS_FSL_USDHC_NUM 3
>> #define CONFIG_SYS_SDRAM_BASE 0x80000000
>> diff --git a/include/configs/cl-som-imx7.h
>> b/include/configs/cl-som-imx7.h
>> index 8af80f58f8e..4b494d8aeef 100644
>> --- a/include/configs/cl-som-imx7.h
>> +++ b/include/configs/cl-som-imx7.h
>> @@ -104,7 +104,6 @@
>> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
>> #define CONFIG_SYS_FSL_USDHC_NUM 2
>> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
>> #endif
>> /* USB Configs */
>> diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
>> index 46ca1c58145..2d9f8bb510b 100644
>> --- a/include/configs/imx7-cm.h
>> +++ b/include/configs/imx7-cm.h
>> @@ -31,7 +31,7 @@
>> "fdt_addr=0x83000000\0" \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate} " \
>> "root=${mmcroot}\0" \
>> "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
>> ${image}\0" \
>> @@ -83,7 +83,6 @@
>> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
>> #define CONFIG_SYS_FSL_USDHC_NUM 2
>> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
>> /* USB Configs */
>> #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
>> diff --git a/include/configs/imx8mm-cl-iot-gate.h
>> b/include/configs/imx8mm-cl-iot-gate.h
>> index 14d3f3cac65..05fe2444f53 100644
>> --- a/include/configs/imx8mm-cl-iot-gate.h
>> +++ b/include/configs/imx8mm-cl-iot-gate.h
>> @@ -79,7 +79,7 @@
>> "bootm_size=0x10000000\0" \
>> "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
>> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
>> ${script};\0" \
>> @@ -131,7 +131,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR \
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>> #define PHYS_SDRAM 0x40000000
>> diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
>> index f4b6353ea85..42b78485cfc 100644
>> --- a/include/configs/imx8mm_evk.h
>> +++ b/include/configs/imx8mm_evk.h
>> @@ -52,7 +52,7 @@
>> "initrd_addr=0x43800000\0" \
>> "bootm_size=0x10000000\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> /* Link Definitions */
>> @@ -63,7 +63,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR \
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>> #define PHYS_SDRAM 0x40000000
>> diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
>> index f969314d6b2..86b75ab4625 100644
>> --- a/include/configs/imx8mn_evk.h
>> +++ b/include/configs/imx8mn_evk.h
>> @@ -51,7 +51,7 @@
>> "initrd_addr=0x43800000\0" \
>> "bootm_size=0x10000000\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> /* Link Definitions */
>> @@ -62,7 +62,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR \
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>> #define PHYS_SDRAM 0x40000000
>> diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
>> index 35fc27bb370..cc8d65cb54e 100644
>> --- a/include/configs/imx8mp_evk.h
>> +++ b/include/configs/imx8mp_evk.h
>> @@ -61,7 +61,7 @@
>> "initrd_addr=0x43800000\0" \
>> "bootm_size=0x10000000\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> /* Link Definitions */
>> @@ -72,7 +72,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR \
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> /* Totally 6GB DDR */
>> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>> diff --git a/include/configs/imx8mp_rsb3720.h
>> b/include/configs/imx8mp_rsb3720.h
>> index 62e06d23034..b80a5f91525 100644
>> --- a/include/configs/imx8mp_rsb3720.h
>> +++ b/include/configs/imx8mp_rsb3720.h
>> @@ -95,7 +95,7 @@
>> "bootm_size=0x10000000\0" \
>> "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs ${jh_clk} console=${console}
>> root=${mmcroot}\0 " \
>> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
>> ${script};\0" \
>> @@ -146,7 +146,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR \
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> /* Totally 6GB or 4G DDR */
>> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>> diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
>> index a3bb3c9d291..989486aa6dc 100644
>> --- a/include/configs/imx8mq_cm.h
>> +++ b/include/configs/imx8mq_cm.h
>> @@ -55,7 +55,7 @@
>> "initrd_addr=0x43800000\0" \
>> "bootm_size=0x10000000\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> /* Link Definitions */
>> @@ -66,7 +66,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR \
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>> #define PHYS_SDRAM 0x40000000
>> diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
>> index 94886fa268c..f7929e5867e 100644
>> --- a/include/configs/imx8mq_evk.h
>> +++ b/include/configs/imx8mq_evk.h
>> @@ -62,7 +62,7 @@
>> "initrd_addr=0x43800000\0" \
>> "bootm_size=0x10000000\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> /* Link Definitions */
>> @@ -73,7 +73,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR \
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>> #define PHYS_SDRAM 0x40000000
>> diff --git a/include/configs/imx8mq_phanbell.h
>> b/include/configs/imx8mq_phanbell.h
>> index ef5992d7c39..f6410114b76 100644
>> --- a/include/configs/imx8mq_phanbell.h
>> +++ b/include/configs/imx8mq_phanbell.h
>> @@ -52,7 +52,7 @@
>> "initrd_high=0xffffffffffffffff\0" \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
>> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
>> ${script};\0" \
>> @@ -101,7 +101,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR \
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>> #define PHYS_SDRAM 0x40000000
>> diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
>> index 8a269225778..9452ba56152 100644
>> --- a/include/configs/imx8qm_mek.h
>> +++ b/include/configs/imx8qm_mek.h
>> @@ -50,7 +50,7 @@
>> "initrd_high=0xffffffffffffffff\0" \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
>> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
>> ${script};\0" \
>> @@ -117,7 +117,6 @@
>> /* Default environment is in SD */
>> /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU
>> board */
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> #define CONFIG_SYS_SDRAM_BASE 0x80000000
>> #define PHYS_SDRAM_1 0x80000000
>> diff --git a/include/configs/imx8qm_rom7720.h
>> b/include/configs/imx8qm_rom7720.h
>> index 7532c6e7551..04a2216fcd8 100644
>> --- a/include/configs/imx8qm_rom7720.h
>> +++ b/include/configs/imx8qm_rom7720.h
>> @@ -66,7 +66,7 @@
>> "initrd_addr=0x83800000\0" \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk2p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate}
>> root=${mmcroot} earlycon\0 " \
>> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
>> ${script};\0" \
>> @@ -114,7 +114,6 @@
>> * USDHC3 is for SD on base board On DDR4 board, USDHC1 is mux for
>> NAND,
>> * USDHC2 is for SD, USDHC3 is for SD on base board
>> */
>> -#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */
>> #define CONFIG_SYS_FSL_USDHC_NUM 3
>> #define CONFIG_SYS_SDRAM_BASE 0x80000000
>> diff --git a/include/configs/imx8qxp_mek.h
>> b/include/configs/imx8qxp_mek.h
>> index 01577932884..c290c19c347 100644
>> --- a/include/configs/imx8qxp_mek.h
>> +++ b/include/configs/imx8qxp_mek.h
>> @@ -48,7 +48,7 @@
>> "initrd_high=0xffffffffffffffff\0" \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate}
>> root=${mmcroot}\0 " \
>> "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
>> ${script};\0" \
>> @@ -115,7 +115,6 @@
>> /* Default environment is in SD */
>> /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU
>> board */
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> #define CONFIG_SYS_SDRAM_BASE 0x80000000
>> #define PHYS_SDRAM_1 0x80000000
>> diff --git a/include/configs/imx8ulp_evk.h
>> b/include/configs/imx8ulp_evk.h
>> index f078c37c2de..46cba330b23 100644
>> --- a/include/configs/imx8ulp_evk.h
>> +++ b/include/configs/imx8ulp_evk.h
>> @@ -58,7 +58,7 @@
>> "initrd_addr=0x83800000\0" \
>> "bootm_size=0x10000000\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk2p2 rootwait rw\0" \
>> /* Link Definitions */
>> @@ -67,7 +67,6 @@
>> #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE -
>> GENERATED_GBL_DATA_SIZE)
>> #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR +
>> CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk2p2"
>> #define CONFIG_SYS_SDRAM_BASE 0x80000000
>> #define PHYS_SDRAM 0x80000000
>> diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
>> index d0960bcaf9a..e8fd4e7a8e8 100644
>> --- a/include/configs/liteboard.h
>> +++ b/include/configs/liteboard.h
>> @@ -35,7 +35,7 @@
>> "ip_dyn=yes\0" \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate} " \
>> "root=${mmcroot}\0" \
>> @@ -100,7 +100,6 @@
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> /* FLASH and environment organization */
>> -#define CONFIG_MMCROOT "/dev/mmcblk0p2"
>> /* USB Configs */
>> #ifdef CONFIG_CMD_USB
>> diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
>> index 0793028ba1f..1b32f58afca 100644
>> --- a/include/configs/mx6sllevk.h
>> +++ b/include/configs/mx6sllevk.h
>> @@ -25,7 +25,7 @@
>> "ip_dyn=yes\0" \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate} " \
>> "root=${mmcroot}\0" \
>> @@ -92,7 +92,6 @@
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> /* Environment organization */
>> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
>> /* MMC Configs */
>> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
>> diff --git a/include/configs/mx6ul_14x14_evk.h
>> b/include/configs/mx6ul_14x14_evk.h
>> index 17e7ae0b4cc..72554d18b0a 100644
>> --- a/include/configs/mx6ul_14x14_evk.h
>> +++ b/include/configs/mx6ul_14x14_evk.h
>> @@ -47,7 +47,7 @@
>>
>> "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0"
>> \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate} " \
>> "root=${mmcroot}\0" \
>> @@ -121,7 +121,6 @@
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> /* environment organization */
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> /* USB Configs */
>> #ifdef CONFIG_CMD_USB
>> diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
>> index dfcdc00c061..bc494b46b69 100644
>> --- a/include/configs/mx6ullevk.h
>> +++ b/include/configs/mx6ullevk.h
>> @@ -43,7 +43,7 @@
>>
>> "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0"
>> \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate} " \
>> "root=${mmcroot}\0" \
>> @@ -118,7 +118,6 @@
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> /* environment organization */
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> #define CONFIG_IOMUX_LPSR
>> diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
>> index ce6afcde2a0..c790374d1a5 100644
>> --- a/include/configs/mx7ulp_com.h
>> +++ b/include/configs/mx7ulp_com.h
>> @@ -17,7 +17,16 @@
>> #define CONFIG_SYS_BOOTM_LEN 0x1000000
>> -#define CONFIG_MMCROOT "/dev/mmcblk0p2"
>> +/*
>> + * Detect overlap between U-Boot image and environment area in
>> build-time
>> + *
>> + * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot-dtb.imx offset
>> + * CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408
>> + *
>> + * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so
>> + * write the direct value here
>> + */
>> +#define CONFIG_BOARD_SIZE_LIMIT 785408
>
> ..how is it possible that CONFIG_BOARD_SIZE_LIMIT is added ?
>
> This does not belong to the series, and it should not be here but in
> configs/
Anyway, just take care of CONFIG_BOARD_SIZE_LIMIT - I drop the line
above myself by applying this patch.
Best regards,
Stefano
>
>
>> /* Using ULP WDOG for reset */
>> #define WDOG_BASE_ADDR WDG1_RBASE
>> @@ -41,7 +50,7 @@
>> "fdt_addr=0x63000000\0" \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate} " \
>> "root=${mmcroot}\0" \
>> "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr}
>> ${image}\0" \
>> diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
>> index e80d748d991..7644274d84b 100644
>> --- a/include/configs/mx7ulp_evk.h
>> +++ b/include/configs/mx7ulp_evk.h
>> @@ -13,7 +13,6 @@
>> #define CONFIG_SYS_BOOTM_LEN 0x1000000
>> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
>> /* Using ULP WDOG for reset */
>> #define WDOG_BASE_ADDR WDG1_RBASE
>> @@ -47,7 +46,7 @@
>> "ip_dyn=yes\0" \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate} " \
>> "root=${mmcroot}\0" \
>> diff --git a/include/configs/phycore_imx8mm.h
>> b/include/configs/phycore_imx8mm.h
>> index 528cda0dbe3..71f0c42ec0c 100644
>> --- a/include/configs/phycore_imx8mm.h
>> +++ b/include/configs/phycore_imx8mm.h
>> @@ -77,7 +77,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR \
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */
>> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>> diff --git a/include/configs/phycore_imx8mp.h
>> b/include/configs/phycore_imx8mp.h
>> index db530965a2a..0c963b62b3b 100644
>> --- a/include/configs/phycore_imx8mp.h
>> +++ b/include/configs/phycore_imx8mp.h
>> @@ -77,7 +77,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR \
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */
>> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>> diff --git a/include/configs/pico-imx8mq.h
>> b/include/configs/pico-imx8mq.h
>> index 495fddf248d..95845276e7b 100644
>> --- a/include/configs/pico-imx8mq.h
>> +++ b/include/configs/pico-imx8mq.h
>> @@ -46,7 +46,7 @@
>> "initrd_high=0xffffffffffffffff\0" \
>> "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0
>> " \
>> "loadbootscript=" \
>> @@ -80,7 +80,6 @@
>> #define CONFIG_SYS_INIT_SP_ADDR \
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
>> #define CONFIG_SYS_SDRAM_BASE 0x40000000
>> #define PHYS_SDRAM 0x40000000
>> diff --git a/include/configs/xpress.h b/include/configs/xpress.h
>> index 13cfa2cd4bd..43b67a355b1 100644
>> --- a/include/configs/xpress.h
>> +++ b/include/configs/xpress.h
>> @@ -34,7 +34,6 @@
>> (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
>> /* Environment is in stored in the eMMC boot partition */
>> -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC2 */
>> /* USB Configs */
>> #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
>> @@ -61,7 +60,7 @@
>> "ip_dyn=yes\0" \
>> "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
>> "mmcpart=1\0" \
>> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
>> + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
>> "mmcautodetect=yes\0" \
>> "mmcargs=setenv bootargs console=${console},${baudrate} " \
>> "root=${mmcroot}\0" \
>
>
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 05/12] configs: mx7dsabresd: drop unused SDHC macro
2022-04-15 4:23 ` [PATCH V2 05/12] configs: mx7dsabresd: drop unused SDHC macro Peng Fan (OSS)
@ 2022-04-22 8:46 ` sbabic
0 siblings, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:46 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
> CONFIG_SYS_FSL_USDHC_NUM
> CONFIG_SYS_FSL_ESDHC_ADDR
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 02/12] configs: imx8mp_evk: drop unused SDHC macro
2022-04-15 4:23 ` [PATCH V2 02/12] configs: imx8mp_evk: " Peng Fan (OSS)
@ 2022-04-22 8:46 ` sbabic
0 siblings, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:46 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
> #define CONFIG_SYS_FSL_USDHC_NUM 2
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 03/12] configs: imx8mn_evk: drop unused SDHC macro
2022-04-15 4:23 ` [PATCH V2 03/12] configs: imx8mn_evk: " Peng Fan (OSS)
@ 2022-04-22 8:46 ` sbabic
0 siblings, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:46 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
> #define CONFIG_SYS_FSL_USDHC_NUM 2
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 04/12] configs: mx6sxsabresd: drop CONFIG_SYS_FSL_USDHC_NUM
2022-04-15 4:23 ` [PATCH V2 04/12] configs: mx6sxsabresd: drop CONFIG_SYS_FSL_USDHC_NUM Peng Fan (OSS)
@ 2022-04-22 8:46 ` sbabic
0 siblings, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:46 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> With DM_MMC, CONFIG_SYS_FSL_USDHC_NUM is not needed.
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 12/12] configs: imx: drop IMX_FEC_BASE
2022-04-15 4:23 ` [PATCH V2 12/12] configs: imx: drop IMX_FEC_BASE Peng Fan (OSS)
@ 2022-04-22 8:47 ` sbabic
0 siblings, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:47 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> IMX_FEC_BASE is not used in these boards, so drop it.
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 07/12] configs: verdin-imx8m: drop unused SDHC macro
2022-04-15 4:23 ` [PATCH V2 07/12] configs: verdin-imx8m: " Peng Fan (OSS)
@ 2022-04-22 8:47 ` sbabic
0 siblings, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:47 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
> CONFIG_SYS_FSL_USDHC_NUM
> CONFIG_SYS_FSL_ESDHC_ADDR
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 01/12] configs: imx8mm_evk: drop unused SDHC macro
2022-04-15 4:23 ` [PATCH V2 01/12] configs: imx8mm_evk: drop unused SDHC macro Peng Fan (OSS)
@ 2022-04-22 8:47 ` sbabic
0 siblings, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:47 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
> #define CONFIG_SYS_FSL_USDHC_NUM 2
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 11/12] scripts: config_whitelist: drop CONFIG_MMCROOT
2022-04-15 4:23 ` [PATCH V2 11/12] scripts: config_whitelist: " Peng Fan (OSS)
@ 2022-04-22 8:47 ` sbabic
0 siblings, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:47 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> Drop CONFIG_MMCROOT, no users now.
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 06/12] configs: imx8qm/qxp_evk: drop unused SDHC macro
2022-04-15 4:23 ` [PATCH V2 06/12] configs: imx8qm/qxp_evk: " Peng Fan (OSS)
@ 2022-04-22 8:47 ` sbabic
0 siblings, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:47 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
> CONFIG_SYS_FSL_USDHC_NUM
> CONFIG_SYS_FSL_ESDHC_ADDR
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 08/12] configs: imx8mm/n_venice: drop unused SDHC macro
2022-04-15 4:23 ` [PATCH V2 08/12] configs: imx8mm/n_venice: " Peng Fan (OSS)
@ 2022-04-22 8:47 ` sbabic
0 siblings, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:47 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
> CONFIG_SYS_FSL_USDHC_NUM
> CONFIG_SYS_FSL_ESDHC_ADDR
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Acked-By: Tim Harvey <tharvey@gateworks.com>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 10/12] configs: drop CONFIG_MMCROOT
2022-04-15 4:23 ` [PATCH V2 10/12] configs: drop CONFIG_MMCROOT Peng Fan (OSS)
2022-04-21 13:16 ` Stefano Babic
@ 2022-04-22 8:47 ` sbabic
1 sibling, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:47 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> CONFIG_MMCROOT is only used to set mmcroot, no need a dedicated macro.
> Script as below
> "
> for i in `ls include/configs/*.h`
> do
> mmcroot=`sed -n '/define.*MMCROOT/ p' $i | awk -F\" '{ print $2;}'`
> if [ ! -n "$mmcroot" ]; then
> continue
> fi
> sed -i '/define.*MMCROOT/ d' $i
> sed -i 's,\" CONFIG_MMCROOT \",'$mmcroot',g' $i
> done
> "
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH V2 09/12] configs: phycore_imx8mm/p: drop unused SDHC macro
2022-04-15 4:23 ` [PATCH V2 09/12] configs: phycore_imx8mm/p: " Peng Fan (OSS)
@ 2022-04-22 8:47 ` sbabic
0 siblings, 0 replies; 27+ messages in thread
From: sbabic @ 2022-04-22 8:47 UTC (permalink / raw)
To: Peng Fan (OSS), u-boot
> From: Peng Fan <peng.fan@nxp.com>
> With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
> CONFIG_SYS_FSL_USDHC_NUM
> CONFIG_SYS_FSL_ESDHC_ADDR
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> Acked-By: Teresa Remmet <t.remmet@phytec.de>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2022-04-22 8:50 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-15 4:23 [PATCH V2 00/12] configs: clean up SDHC marco and MMCROOT Peng Fan (OSS)
2022-04-15 4:23 ` [PATCH V2 01/12] configs: imx8mm_evk: drop unused SDHC macro Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 02/12] configs: imx8mp_evk: " Peng Fan (OSS)
2022-04-22 8:46 ` sbabic
2022-04-15 4:23 ` [PATCH V2 03/12] configs: imx8mn_evk: " Peng Fan (OSS)
2022-04-22 8:46 ` sbabic
2022-04-15 4:23 ` [PATCH V2 04/12] configs: mx6sxsabresd: drop CONFIG_SYS_FSL_USDHC_NUM Peng Fan (OSS)
2022-04-22 8:46 ` sbabic
2022-04-15 4:23 ` [PATCH V2 05/12] configs: mx7dsabresd: drop unused SDHC macro Peng Fan (OSS)
2022-04-22 8:46 ` sbabic
2022-04-15 4:23 ` [PATCH V2 06/12] configs: imx8qm/qxp_evk: " Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 07/12] configs: verdin-imx8m: " Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 08/12] configs: imx8mm/n_venice: " Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 09/12] configs: phycore_imx8mm/p: " Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 10/12] configs: drop CONFIG_MMCROOT Peng Fan (OSS)
2022-04-21 13:16 ` Stefano Babic
2022-04-21 13:19 ` Stefano Babic
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 11/12] scripts: config_whitelist: " Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
2022-04-15 4:23 ` [PATCH V2 12/12] configs: imx: drop IMX_FEC_BASE Peng Fan (OSS)
2022-04-22 8:47 ` sbabic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.