configs: clean up SDHC marco and MMCROOT
v2 cover configs: clean up SDHC marco and MMCROOT
From: Peng Fan <[email protected]>
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(-)
Signature · 1 line
2.35.1
PATCH v2 1/12 configs: imx8mm_evk: drop unused SDHC macro
From: Peng Fan <[email protected]>
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
--- include/configs/imx8mm_evk.h | 5 ----- 1 file changed, 5 deletions(-)
include/configs/imx8mm_evk.h +0 -5
@@ -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
Signature · 1 line
2.35.1
PATCH v2 1/12 configs: imx8mm_evk: drop unused SDHC macro
Quoted 6 lines
From: Peng Fan <[email protected]>
WithSPL_DM_MMCandDM_MMC, the two macros not needed, drop it.
#defineCONFIG_SYS_FSL_USDHC_NUM2
#defineCONFIG_SYS_FSL_ESDHC_ADDR0Reviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 2/12 configs: imx8mp_evk: drop unused SDHC macro
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
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
--- include/configs/imx8mp_evk.h | 3 --- 1 file changed, 3 deletions(-)
include/configs/imx8mp_evk.h +0 -3
@@ -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
Signature · 1 line
2.35.1
PATCH v2 2/12 configs: imx8mp_evk: drop unused SDHC macro
Quoted 6 lines
From: Peng Fan <[email protected]>
WithSPL_DM_MMCandDM_MMC, the two macros not needed, drop it.
#defineCONFIG_SYS_FSL_USDHC_NUM2
#defineCONFIG_SYS_FSL_ESDHC_ADDR0Reviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 3/12 configs: imx8mn_evk: drop unused SDHC macro
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
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
--- include/configs/imx8mn_evk.h | 5 ----- 1 file changed, 5 deletions(-)
include/configs/imx8mn_evk.h +0 -5
@@ -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
Signature · 1 line
2.35.1
PATCH v2 3/12 configs: imx8mn_evk: drop unused SDHC macro
Quoted 6 lines
From: Peng Fan <[email protected]>
WithSPL_DM_MMCandDM_MMC, the two macros not needed, drop it.
#defineCONFIG_SYS_FSL_USDHC_NUM2
#defineCONFIG_SYS_FSL_ESDHC_ADDR0Reviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 4/12 configs: mx6sxsabresd: drop CONFIG_SYS_FSL_USDHC_NUM
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
With DM_MMC, CONFIG_SYS_FSL_USDHC_NUM is not needed.
--- include/configs/mx6sxsabresd.h | 2 -- 1 file changed, 2 deletions(-)
include/configs/mx6sxsabresd.h +0 -2
@@ -149,6 +149,4 @@#endif #endif -#define CONFIG_SYS_FSL_USDHC_NUM 3 -#endif /* __CONFIG_H */
Signature · 1 line
2.35.1
PATCH v2 4/12 configs: mx6sxsabresd: drop CONFIG_SYS_FSL_USDHC_NUM
Quoted 4 lines
From: Peng Fan <[email protected]>
WithDM_MMC,CONFIG_SYS_FSL_USDHC_NUMis not needed.Reviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 5/12 configs: mx7dsabresd: drop unused SDHC macro
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDR
--- include/configs/mx7dsabresd.h | 9 --------- 1 file changed, 9 deletions(-)
include/configs/mx7dsabresd.h +0 -9
@@ -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)
Signature · 1 line
2.35.1
PATCH v2 5/12 configs: mx7dsabresd: drop unused SDHC macro
Quoted 6 lines
From: Peng Fan <[email protected]>
WithSPL_DM_MMCandDM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDRReviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 6/12 configs: imx8qm/qxp_evk: drop unused SDHC macro
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDR
--- include/configs/imx8qm_mek.h | 5 ----- include/configs/imx8qxp_mek.h | 5 ----- 2 files changed, 10 deletions(-)
include/configs/imx8qm_mek.h +0 -5
@@ -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
include/configs/imx8qxp_mek.h +0 -5
@@ -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
Signature · 1 line
2.35.1
PATCH v2 6/12 configs: imx8qm/qxp_evk: drop unused SDHC macro
Quoted 6 lines
From: Peng Fan <[email protected]>
WithSPL_DM_MMCandDM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDRReviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 7/12 configs: verdin-imx8m: drop unused SDHC macro
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDR
--- include/configs/verdin-imx8mm.h | 3 --- include/configs/verdin-imx8mp.h | 4 ---- 2 files changed, 7 deletions(-)
include/configs/verdin-imx8mm.h +0 -3
@@ -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
include/configs/verdin-imx8mp.h +0 -4
@@ -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 */
Signature · 1 line
2.35.1
PATCH v2 7/12 configs: verdin-imx8m: drop unused SDHC macro
Quoted 6 lines
From: Peng Fan <[email protected]>
WithSPL_DM_MMCandDM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDRReviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 8/12 configs: imx8mm/n_venice: drop unused SDHC macro
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDR
--- include/configs/imx8mm_venice.h | 4 ---- include/configs/imx8mn_venice.h | 3 --- 2 files changed, 7 deletions(-)
include/configs/imx8mm_venice.h +0 -4
@@ -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
include/configs/imx8mn_venice.h +0 -3
@@ -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
Signature · 1 line
2.35.1
PATCH v2 8/12 configs: imx8mm/n_venice: drop unused SDHC macro
Quoted 7 lines
From: Peng Fan <[email protected]>
WithSPL_DM_MMCandDM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDRReviewed-by Fabio Estevam <[email protected]>Acked-by Tim Harvey <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 9/12 configs: phycore_imx8mm/p: drop unused SDHC macro
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
With SPL_DM_MMC and DM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDR
--- include/configs/phycore_imx8mm.h | 4 ---- include/configs/phycore_imx8mp.h | 4 ---- 2 files changed, 8 deletions(-)
include/configs/phycore_imx8mm.h +0 -4
@@ -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 */
include/configs/phycore_imx8mp.h +0 -4
@@ -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 */
Signature · 1 line
2.35.1
PATCH v2 9/12 configs: phycore_imx8mm/p: drop unused SDHC macro
Quoted 7 lines
From: Peng Fan <[email protected]>
WithSPL_DM_MMCandDM_MMC, the two macros not needed, drop it.
CONFIG_SYS_FSL_USDHC_NUM
CONFIG_SYS_FSL_ESDHC_ADDRReviewed-by Fabio Estevam <[email protected]>Acked-by Teresa Remmet <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 10/12 configs: drop CONFIG_MMCROOT
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
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
"
--- 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(-)
include/configs/aristainetos2.h +1 -2
@@ -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} " \
include/configs/capricorn-common.h +0 -1
@@ -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
include/configs/cgtqmx8.h +1 -2
@@ -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
include/configs/cl-som-imx7.h +0 -1
@@ -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 */
include/configs/imx7-cm.h +1 -2
@@ -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)
include/configs/imx8mm-cl-iot-gate.h +1 -2
@@ -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
include/configs/imx8mm_evk.h +1 -2
@@ -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
include/configs/imx8mn_evk.h +1 -2
@@ -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
include/configs/imx8mp_evk.h +1 -2
@@ -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
include/configs/imx8mp_rsb3720.h +1 -2
@@ -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
include/configs/imx8mq_cm.h +1 -2
@@ -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
include/configs/imx8mq_evk.h +1 -2
@@ -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
include/configs/imx8mq_phanbell.h +1 -2
@@ -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
include/configs/imx8qm_mek.h +1 -2
@@ -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
include/configs/imx8qm_rom7720.h +1 -2
@@ -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
include/configs/imx8qxp_mek.h +1 -2
@@ -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
include/configs/imx8ulp_evk.h +1 -2
@@ -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
include/configs/liteboard.h +1 -2
@@ -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
include/configs/mx6sllevk.h +1 -2
@@ -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
include/configs/mx6ul_14x14_evk.h +1 -2
@@ -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
include/configs/mx6ullevk.h +1 -2
@@ -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
include/configs/mx7ulp_com.h +11 -2
@@ -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" \
include/configs/mx7ulp_evk.h +1 -2
@@ -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" \
include/configs/phycore_imx8mm.h +0 -1
@@ -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
include/configs/phycore_imx8mp.h +0 -1
@@ -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
include/configs/pico-imx8mq.h +1 -2
@@ -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
include/configs/xpress.h +1 -2
@@ -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" \
Signature · 1 line
2.35.1
Re: [PATCH V2 10/12] configs: drop CONFIG_MMCROOT
Quoted 14 lines · Peng Fan (OSS)
From: Peng Fan <[email protected]>
CONFIG_MMCROOTis only used to set mmcroot, no need a dedicated macro.Script as below
"
for i inls include/configs/*.h
do
mmcroot=sed -n '/define.*MMCROOT/ p' $i | awk -F\" '{ print $2;}'if [ ! -n "$mmcroot" ]; then
continue
fi
Quoted 5 lines
sed -i '/define.*MMCROOT/ d' $i
sed -i 's,\"CONFIG_MMCROOT\",'$mmcroot',g' $idone
"
...but if this is generated by a script....
Quoted 466 lines
Reviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>--- 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(-)include/configs/aristainetos2.h +1
-2@@ -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} " \include/configs/capricorn-common.h +0
-1@@ -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 0x80000000include/configs/cgtqmx8.h +1
-2@@ -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 0x80000000include/configs/cl-som-imx7.h +0
-1@@ -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 */ include/configs/imx7-cm.h +1
-2@@ -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)include/configs/imx8mm-cl-iot-gate.h +1
-2@@ -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 0x40000000include/configs/imx8mm_evk.h +1
-2@@ -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 0x40000000include/configs/imx8mn_evk.h +1
-2@@ -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 0x40000000include/configs/imx8mp_evk.h +1
-2@@ -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 0x40000000include/configs/imx8mp_rsb3720.h +1
-2@@ -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 0x40000000include/configs/imx8mq_cm.h +1
-2@@ -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 0x40000000include/configs/imx8mq_evk.h +1
-2@@ -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 0x40000000include/configs/imx8mq_phanbell.h +1
-2@@ -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 0x40000000include/configs/imx8qm_mek.h +1
-2@@ -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 0x80000000include/configs/imx8qm_rom7720.h +1
-2@@ -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 0x80000000include/configs/imx8qxp_mek.h +1
-2@@ -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 0x80000000include/configs/imx8ulp_evk.h +1
-2@@ -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 0x80000000include/configs/liteboard.h +1
-2@@ -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 include/configs/mx6sllevk.h +1
-2@@ -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_ADDRinclude/configs/mx6ul_14x14_evk.h +1
-2@@ -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 include/configs/mx6ullevk.h +1
-2@@ -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 include/configs/mx7ulp_com.h +1
-1@@ -17,7 +17,16 @@#define CONFIG_SYS_BOOTM_LEN 0x1000000 -#define CONFIG_MMCROOT "/dev/mmcblk0p2" +/*
include/configs/mx7ulp_com.h line 30
Quoted 10 lines
include/configs/mx7ulp_com.h +9
-0+* 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
Quoted 98 lines
include/configs/mx7ulp_com.h +1
-1/* 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" \include/configs/mx7ulp_evk.h +1
-2@@ -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" \include/configs/phycore_imx8mm.h +0
-1@@ -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 0x40000000include/configs/phycore_imx8mp.h +0
-1@@ -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 0x40000000include/configs/pico-imx8mq.h +1
-2@@ -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 0x40000000include/configs/xpress.h +1
-2@@ -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" \
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
Re: [PATCH V2 10/12] configs: drop CONFIG_MMCROOT
Quoted 446 lines · Stefano Babic
Quoted 14 lines · Peng Fan (OSS)
From: Peng Fan <[email protected]>
CONFIG_MMCROOTis only used to set mmcroot, no need a dedicated macro.Script as below
"
for i inls include/configs/*.h
do
mmcroot=sed -n '/define.*MMCROOT/ p' $i | awk -F\" '{ print $2;}'if [ ! -n "$mmcroot" ]; then
continue
fiQuoted 5 lines
sed -i '/define.*MMCROOT/ d' $i
sed -i 's,\"CONFIG_MMCROOT\",'$mmcroot',g' $idone
"...but if this is generated by a script....
Quoted 412 lines
Reviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>---
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(-)include/configs/aristainetos2.h +1
-2@@ -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} " \include/configs/capricorn-common.h +0
-1@@ -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 0x80000000include/configs/cgtqmx8.h +1
-2@@ -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 0x80000000include/configs/cl-som-imx7.h +0
-1@@ -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 */include/configs/imx7-cm.h +1
-2@@ -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)include/configs/imx8mm-cl-iot-gate.h +1
-2@@ -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 0x40000000include/configs/imx8mm_evk.h +1
-2@@ -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 0x40000000include/configs/imx8mn_evk.h +1
-2@@ -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 0x40000000include/configs/imx8mp_evk.h +1
-2@@ -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 0x40000000include/configs/imx8mp_rsb3720.h +1
-2@@ -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 0x40000000include/configs/imx8mq_cm.h +1
-2@@ -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 0x40000000include/configs/imx8mq_evk.h +1
-2@@ -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 0x40000000include/configs/imx8mq_phanbell.h +1
-2@@ -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 0x40000000include/configs/imx8qm_mek.h +1
-2@@ -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 0x80000000include/configs/imx8qm_rom7720.h +1
-2@@ -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 0x80000000include/configs/imx8qxp_mek.h +1
-2@@ -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 0x80000000include/configs/imx8ulp_evk.h +1
-2@@ -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 0x80000000include/configs/liteboard.h +1
-2@@ -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_USBinclude/configs/mx6sllevk.h +1
-2@@ -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_ADDRinclude/configs/mx6ul_14x14_evk.h +1
-1@@ -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" \
include/configs/mx6ul_14x14_evk.h +0
-1@@ -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_USBinclude/configs/mx6ullevk.h +1
-1@@ -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" \
include/configs/mx6ullevk.h +0
-1@@ -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_LPSRinclude/configs/mx7ulp_com.h +2
-1@@ -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
Quoted 8 lines
+ *
+ *CONFIG_BOARD_SIZE_LIMIT=CONFIG_ENV_OFFSET- u-boot-dtb.imx offset
+ *CONFIG_BOARD_SIZE_LIMIT= 768k - 1k = 767k = 785408
+ *
+ * CurrentlyCONFIG_BOARD_SIZE_LIMITdoes not handle expressions, so
+ * write the direct value here
+ */
+#define CONFIG_BOARD_SIZE_LIMIT 785408..how is it possible that
CONFIG_BOARD_SIZE_LIMITis added ?
Quoted 1 line
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
Quoted 89 lines
Quoted 87 lines
/* Using ULP WDOG for reset */
#define WDOG_BASE_ADDRWDG1_RBASEinclude/configs/mx7ulp_com.h +1
-1@@ -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" \include/configs/mx7ulp_evk.h +1
-2@@ -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" \include/configs/phycore_imx8mm.h +0
-1@@ -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 0x40000000include/configs/phycore_imx8mp.h +0
-1@@ -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 0x40000000include/configs/pico-imx8mq.h +1
-2@@ -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 0x40000000include/configs/xpress.h +1
-2@@ -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" \
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 10/12 configs: drop CONFIG_MMCROOT
In reply to Peng Fan (OSS)Quoted 14 lines
From: Peng Fan <[email protected]>
CONFIG_MMCROOTis only used to set mmcroot, no need a dedicated macro. Script as below
"
for i inls 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
"
Quoted 2 lines
Reviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 11/12 scripts: config_whitelist: drop CONFIG_MMCROOT
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Drop CONFIG_MMCROOT, no users now.
--- scripts/config_whitelist.txt | 1 - 1 file changed, 1 deletion(-)
scripts/config_whitelist.txt +0 -1
@@ -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
Signature · 1 line
2.35.1
PATCH v2 11/12 scripts: config_whitelist: drop CONFIG_MMCROOT
Quoted 4 lines
From: Peng Fan <[email protected]>
DropCONFIG_MMCROOT, no users now.Reviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================
PATCH v2 12/12 configs: imx: drop IMX_FEC_BASE
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
IMX_FEC_BASE is not used in these boards, so drop it.
--- 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(-)
include/configs/apalis-imx8x.h +0 -1
@@ -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
include/configs/aristainetos2.h +0 -1
@@ -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
include/configs/cm_fx6.h +0 -1
@@ -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)
include/configs/colibri-imx6ull.h +0 -1
@@ -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
include/configs/dh_imx6.h +0 -1
@@ -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 */
include/configs/liteboard.h +0 -1
@@ -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
include/configs/m53menlo.h +0 -1
@@ -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
include/configs/mccmon6.h +0 -1
@@ -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 \
include/configs/mx6sxsabresd.h +0 -1
@@ -126,7 +126,6 @@/* Network */ -#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1#ifdef CONFIG_CMD_USB
include/configs/mx6ul_14x14_evk.h +0 -2
@@ -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
include/configs/npi_imx6ull.h +0 -1
@@ -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
include/configs/pico-imx6.h +0 -1
@@ -117,7 +117,6 @@/* Environment organization */ /* Ethernet Configuration */ -#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 1/* Framebuffer */
include/configs/pico-imx6ul.h +0 -1
@@ -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
include/configs/somlabs_visionsom_6ull.h +0 -1
@@ -78,7 +78,6 @@#endif #ifdef CONFIG_CMD_NET -#define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x1#endif
include/configs/tqma6.h +0 -1
@@ -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 )
include/configs/vf610twr.h +0 -1
@@ -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 */
include/configs/vining_2000.h +0 -1
@@ -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
include/configs/xpress.h +0 -1
@@ -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
Signature · 1 line
2.35.1
PATCH v2 12/12 configs: imx: drop IMX_FEC_BASE
Quoted 4 lines
From: Peng Fan <[email protected]>
IMX_FEC_BASEis not used in these boards, so drop it.Reviewed-by Fabio Estevam <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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: [email protected] =====================================================================