Remove CONFIG_SYS_MMC_IMG_LOAD_PART from CONFIG namespace

This option is used as part of configuring the default environment for a
number of platforms.  However, it is always set to 1 and the only time
it is part of Kconfig, it is used in a hard-coded manner.  Hard-code the
value in the environment instead.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/compulab/cl-som-imx7/Kconfig b/board/compulab/cl-som-imx7/Kconfig
index 6d69cf31f446a00de1b1ee872c88ac21da196ba2..ffd857ced11ac86d30044446b304fc1478b9d36b 100644 (file)
--- a/board/compulab/cl-som-imx7/Kconfig
+++ b/board/compulab/cl-som-imx7/Kconfig
@@ -17,10 +17,6 @@ config SYS_USB_DEV
        int
        default 0
 
-config SYS_MMC_IMG_LOAD_PART
-       int
-       default 1
-
 config SYS_USB_IMG_LOAD_PART
        int
        default 1

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 27007c57b3cd70b5ed913596be40a28b451684a4..c2b0d6ff3e6612c079e13a5ae804dde189585727 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -50,7 +50,7 @@
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
                "root=PARTUUID=${uuid} rootwait " \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "netargs=setenv bootargs console=${console},${baudrate} " \
                "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
                "\0" \
@@ -68,8 +68,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 /* On Apalis iMX8 USDHC1 is eMMC, USDHC2 is 8-bit and USDHC3 is 4-bit MMC/SD */
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 

diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h
index 50dae2d8e05ae85ceffac96e19b30dc9ce7d4fd7..402fed1bba347a26eb7643a9e4f713df2e2c8bd9 100644 (file)
--- a/include/configs/apalis-imx8x.h
+++ b/include/configs/apalis-imx8x.h
@@ -77,7 +77,7 @@
        "mmcargs=setenv bootargs ${consoleargs} " \
                "root=PARTUUID=${uuid} rootwait " \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "netargs=setenv bootargs ${consoleargs} " \
                "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp " \
                "${vidargs}\0" \
@@ -99,8 +99,6 @@
 
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 /* On Apalis iMX8X USDHC1 is eMMC, USDHC2 is 4-bit SD */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 

diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 729c6a2ea348ff5bba5f916381ac53a2460c47df..1cde5f77f221484bcf1bca85ada139fe87a11213 100644 (file)
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -116,7 +116,6 @@
 
 /* On CCP board, USDHC1 is for eMMC */
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"  /* eMMC */
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
 #define PHYS_SDRAM_1                   0x80000000

diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 36ca4715204407a3c443dc337588f994a76bf5e6..d5549f62cee3eaac6bf9700c5b52e7a8d2ca99a1 100644 (file)
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -79,7 +79,7 @@
        "boot_fdt=try\0" \
        "fdt_file=imx8qm-cgt-qmx8.dtb\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot} earlycon\0 " \
@@ -124,8 +124,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"  /* USDHC2 */
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 92770e89090e0b5ba2cae0bc509b98eded61befd..a5bf6ccbf4005db5b9de7d6c4b7206a14043e095 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -49,7 +49,7 @@
        "fdtaddr=0x83000000\0" \
        "mmcdev_def="__stringify(CONFIG_SYS_MMC_DEV)"\0" \
        "usbdev_def="__stringify(CONFIG_SYS_USB_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "usbpart=" __stringify(CONFIG_SYS_USB_IMG_LOAD_PART) "\0" \
        "doboot=bootz ${loadaddr} - ${fdtaddr}\0" \
        "mmc_config=mmc dev ${mmcdev}; mmc rescan\0" \

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 82926afbdf60192cabc6540f7430bbdfa923c466..01182505cc8bab05c76ddaeae6f44cbd1698c8c1 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -80,7 +80,7 @@
        "mmcargs=setenv bootargs ${consoleargs} " \
                "root=PARTUUID=${uuid} rootwait " \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "netargs=setenv bootargs ${consoleargs} " \
                "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp " \
                "${vidargs}\0" \
@@ -102,8 +102,6 @@
 
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 /* On Colibri iMX8X USDHC1 is eMMC, USDHC2 is 4-bit SD */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 

diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 4a0050b45aa8ed28afe512feec53503e37219536..261ed900fee9ba3992a456abd064a2a739d5ba0b 100644 (file)
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -32,7 +32,7 @@
        "fdt_file=imx7-cm.dtb\0" \
        "fdt_addr=0x83000000\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
                "root=${mmcroot}\0" \
@@ -85,7 +85,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC1_BASE_ADDR
 #define CONFIG_SYS_FSL_USDHC_NUM               2
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 #define CONFIG_MMCROOT                                 "/dev/mmcblk0p2"  /* USDHC1 */
 
 /* USB Configs */

diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 36e0a423fe7577d91f72d04ca89e963de51c9929..991839c0bcd4672d1ff7d85c34b447b01ccc6073 100644 (file)
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -79,7 +79,7 @@
        "initrd_addr=0x43800000\0"              \
        "bootm_size=0x10000000\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
@@ -152,8 +152,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #define CONFIG_ETHPRIME                        "FEC"
 
 #define CONFIG_FEC_XCV_TYPE            RGMII

diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 519353bd47ccc900b912ec34a91601f6dfdad922..1040a6897b794101ce672ad058a5512b6afff3bb 100644 (file)
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -38,7 +38,7 @@
        "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "initrd_addr=0x43800000\0"              \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate}" \
@@ -106,7 +106,6 @@
 /* USDHC */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 /* FEC*/
 #define CONFIG_ETHPRIME                 "FEC"

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index dcb627c4b95bf19adfa58bb96340ded4d70db97f..c7022ef0f7fb1a1876c6493da4844cadd9692871 100644 (file)
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -51,7 +51,7 @@
        "fdtfile=imx8mm-evk.dtb\0" \
        "initrd_addr=0x43800000\0"              \
        "bootm_size=0x10000000\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */
@@ -83,8 +83,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #define CONFIG_ETHPRIME                 "FEC"
 
 #define CONFIG_FEC_XCV_TYPE             RGMII

diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
index 4c9550a1f5a18e15bd43110d6166aa9434f61096..fe997f9d1851fa37b546d0f5c50d36cc3a2a40d4 100644 (file)
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -86,6 +86,5 @@
 /* USDHC */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 #endif /* __IMX8MM_ICORE_MX8MM_H */

diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index 28d2b7193350cad062dd15fdfd745e3efbcf73f4..7ab11cc8fb19e44b85e0a828de873e85f41247c1 100644 (file)
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -103,7 +103,6 @@
 /* USDHC */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 /* FEC */
 #define CONFIG_ETHPRIME                 "eth0"

diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index 63e8f5e23a889919e8a49834588b3d83a5af0921..2843535973986a5ba5b9b2d4b5af81753b202282 100644 (file)
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -43,7 +43,7 @@
        "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "initrd_addr=0x43800000\0"              \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console} " \
@@ -121,7 +121,6 @@
 /* USDHC */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 /* ENET Config */
 #if defined(CONFIG_FEC_MXC)

diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index da66ab4dbf8832acfcb9fe0883e7917b07fd1af4..142fc3e4fff93eb83b9daae1f2c40860603bd27a 100644 (file)
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -50,7 +50,7 @@
        "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "initrd_addr=0x43800000\0"              \
        "bootm_size=0x10000000\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */
@@ -82,6 +82,4 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #endif

diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 267a40bf81d1a0b1b382d2d4ed2b368f5a340f0a..b810a558adf182d4cd98b740bf29c9570a2c8817 100644 (file)
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -65,7 +65,7 @@
        "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "initrd_addr=0x43800000\0"              \
        "bootm_size=0x10000000\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */
@@ -98,6 +98,4 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #endif

diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index 938b13c845b346aa54dce2db04805861fa4a10be..b099004937df792cba60bd1f65fbf426338bd30d 100644 (file)
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -59,7 +59,7 @@
        "fdt_file=imx8mq-cm.dtb\0" \
        "initrd_addr=0x43800000\0"              \
        "bootm_size=0x10000000\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */
@@ -89,6 +89,4 @@
 #define CONFIG_SYS_FSL_USDHC_NUM               2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #endif

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 8242fdb37a6979b15825f142ba57602ed1bc76c6..6e1d387e2b1e7df364358b1548e8342683aa77cd 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -70,7 +70,7 @@
        "fdt_file=imx8mq-evk.dtb\0" \
        "initrd_addr=0x43800000\0"              \
        "bootm_size=0x10000000\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */
@@ -100,6 +100,4 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #endif

diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 54922b8b1c2cc16a9789e28fecf24f4690b123ab..7afdfd6efe88b6c6476e932efa0ad7cc60ab081a 100644 (file)
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -60,7 +60,7 @@
        "initrd_addr=0x43800000\0"              \
        "initrd_high=0xffffffffffffffff\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
@@ -132,6 +132,4 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #endif

diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 7f21e074ee8baee2dcc000b7e1059ba29862a565..884d741789f309b8924290c3bab8c72bc09d3eae 100644 (file)
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -55,7 +55,7 @@
        "initrd_addr=0x83800000\0"              \
        "initrd_high=0xffffffffffffffff\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
@@ -122,8 +122,6 @@
 
 /* Default environment is in SD */
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 /* 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

diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index bd2387ab80c30bc0aa42e51549c40250eaa345a6..1a553510f6df1ad1fa396d7d2f744bd108f48707 100644 (file)
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -64,7 +64,7 @@
        "fdt_file=imx8qm-rom7720-a1.dtb\0" \
        "initrd_addr=0x83800000\0"              \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot} earlycon\0 " \
@@ -109,8 +109,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board,
  * 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

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index f93dbdfcead104ec6966146d944b89d74afd92de..3900ef1b500e4b7da039c6dda6c1427644f98173 100644 (file)
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -53,7 +53,7 @@
        "initrd_addr=0x83800000\0"              \
        "initrd_high=0xffffffffffffffff\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot}\0 " \
@@ -120,8 +120,6 @@
 
 /* Default environment is in SD */
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 /* 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

diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index 2a02815620df7967adcc13caf9187677eaaeb18e..6b25b485dec72a030bb62d1db87c8523715ea61c 100644 (file)
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -61,7 +61,7 @@
        "fdtfile=imx8ulp-evk.dtb\0" \
        "initrd_addr=0x83800000\0"              \
        "bootm_size=0x10000000\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
 
 /* Link Definitions */

diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 34304f9102851dd085ecb142da35863e7e9a25ad..2bac0008e25253d729cd4f6b4c68e3954d548934 100644 (file)
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -59,7 +59,6 @@
 #ifdef CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
 #define CONFIG_SYS_FSL_USDHC_NUM       2
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 #endif
 
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 2d051e5944785cae71d3810c7b006fbf9df2e15e..3a8dd475b26bb4b07be384dcdb17d4a10b785bff 100644 (file)
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -23,8 +23,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
 #endif
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
@@ -36,7 +34,7 @@
        "boot_fdt=try\0" \
        "ip_dyn=yes\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 5d74964124ddbcc044a9f1d627705729f87462df..90b053bc205c53860bbdb82af2c148c563307882 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -33,8 +33,6 @@
 
 #endif
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
@@ -48,7 +46,7 @@
        "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "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=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \

diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index e3f665fb81c39b0b0702fa06dd1be26610e4ce19..6bcca11c4c2f91e7eed78cd7477911fcca25adcf 100644 (file)
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -30,8 +30,6 @@
 #endif
 #endif
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
@@ -44,7 +42,7 @@
        "ip_dyn=yes\0" \
        "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=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index f11e2e3f807f16537611e8f307fa70894cdb6a35..a853e2b880f09b7d9731b9a2251187915dcee2fe 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -17,8 +17,6 @@
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #ifdef CONFIG_IMX_BOOTAUX
 /* Set to QSPI1 A flash at default */
 #define CONFIG_SYS_AUXCORE_BOOTDATA 0x60000000

diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
index 58d48edac4326acb1ea9b589f719d9754e45a066..8c4d94215b905130b2e1a33589844fc6cc026e39 100644 (file)
--- a/include/configs/mx7ulp_com.h
+++ b/include/configs/mx7ulp_com.h
@@ -25,7 +25,6 @@
  */
 #define CONFIG_BOARD_SIZE_LIMIT                785408
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 /* Using ULP WDOG for reset */
 #define WDOG_BASE_ADDR                 WDG1_RBASE
@@ -48,7 +47,7 @@
        "fdt_file=imx7ulp-com.dtb\0" \
        "fdt_addr=0x63000000\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
                "root=${mmcroot}\0" \

diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 7540a7732be0607674b2cc30e896a1027e05150f..8f2cbc643eeca5dfe1f1ce448cd21abcdda052db 100644 (file)
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -15,7 +15,6 @@
 #define CONFIG_SYS_BOOTM_LEN           0x1000000
 
 #define CONFIG_MMCROOT                  "/dev/mmcblk0p2"  /* USDHC1 */
-#define CONFIG_SYS_MMC_IMG_LOAD_PART    1
 
 /* Using ULP WDOG for reset */
 #define WDOG_BASE_ADDR                 WDG1_RBASE
@@ -48,7 +47,7 @@
        "earlycon=lpuart32,0x402D0010\0" \
        "ip_dyn=yes\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \

diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index d1d3d458ce90d249818f3c81513a52b15966be69..7438d0a4647d94755804322e332312044ef31cab 100644 (file)
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -37,7 +37,7 @@
        "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "ip_dyn=yes\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=2\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console} " \
@@ -95,6 +95,5 @@
 /* USDHC */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 #endif /* __PHYCORE_IMX8MM_H */

diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index 7a15edd10fbf3c9a4322cdcaf1ec0c8697d72df7..8c5ffeef544eca662db8681bbc098251e6a11627 100644 (file)
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -37,7 +37,7 @@
        "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "ip_dyn=yes\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=2\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console} " \
@@ -95,6 +95,5 @@
 /* USDHC */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 #endif /* __PHYCORE_IMX8MP_H */

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 3fe178316f7bec45a357d71fb55ff55d49cc486f..6e1c3826488784b9e9766931dab4332b80ad5434 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -64,8 +64,6 @@
        "bootmenu_2=Boot using PICO-Pi baseboard=" \
                "setenv fdtfile imx6ul-pico-pi.dtb\0" \
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index cbac950549231fce6717d0e82525e98e23e41a98..6137f21bba96a7acd25af3e75fa49bc6cc409131 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -65,9 +65,6 @@
        BOOTENV
 #endif
 
-
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "image=zImage\0" \
        "splashpos=m,m\0" \

diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index cd0116d28f87f01cc80a6204fd1f2a59ede3c13a..716f1327c321ae6a884a2caa5c3d83c1995c392e 100644 (file)
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -54,7 +54,7 @@
        "initrd_addr=0x43800000\0"                                      \
        "initrd_high=0xffffffffffffffff\0"                              \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0"              \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0"       \
+       "mmcpart=1\0"   \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0"                      \
        "mmcautodetect=yes\0"                                           \
        "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \
@@ -111,8 +111,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #define CONFIG_SYS_BOOTM_LEN           SZ_128M
 
 #endif

diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h
index 47d4f6877811793de3424f3eef15640535ebfb4e..a7f775660421ae8bf096b9db35ee7f538d80e418 100644 (file)
--- a/include/configs/smegw01.h
+++ b/include/configs/smegw01.h
@@ -16,7 +16,6 @@
 
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "image=zImage\0" \

diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 36bbf704cdb3ec0d419d16280cb8ac7bc73fbcfd..17583c0a6af623f3335bfc05d41591e5f8690616 100644 (file)
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -101,7 +101,6 @@
 /* USDHC */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 /* ENET */
 #define CONFIG_ETHPRIME                 "FEC"

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 33eef9016bb77e57c6cbad496c54f34641767014..da7c753ddd73e6c1999ebe8227977dcbd76a2a7d 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -16,7 +16,6 @@
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 #define CONFIG_DFU_ENV_SETTINGS \
        "dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \
@@ -45,7 +44,7 @@
        "boot_fdt=try\0" \
        "ip_dyn=yes\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "rootpart=" __stringify(CONFIG_WARP7_ROOT_PART) "\0" \
        "finduuid=part uuid mmc 0:${rootpart} uuid\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index f6645a72940bb1041e27b21dd2e3f6ff3a88331c..6d621f24bdd6dd6bc9fbb2997943102314fdea15 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -48,8 +48,6 @@
 #define CONFIG_FEC_XCV_TYPE             RMII
 #define CONFIG_ETHPRIME                        "FEC"
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 #define CONFIG_UBOOT_SECTOR_START      0x2
 #define CONFIG_UBOOT_SECTOR_COUNT      0x3fe
 
@@ -64,7 +62,7 @@
        "boot_fdt=try\0" \
        "ip_dyn=yes\0" \
        "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
+       "mmcpart=1\0" \
        "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \