Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_MMC_ENV_DEV
   CONFIG_SYS_MMC_ENV_PART

Note that with this conversion we now have consistent behavior with
respect to ensuring that we have always selected the correct MMC
device and hardware partition.

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

diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 0d52be8dbf7d94b982abbb78c0ee5a3bb4c1993b..4c58fd3c2e25171f8f99e9e513f595f98f0b05b8 100644 (file)
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -27,10 +27,6 @@
 #include <u-boot/sha1.h>
 #include <u-boot/sha256.h>
 
-#ifndef CONFIG_SYS_MMC_ENV_DEV
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
-
 #if defined(CONFIG_ARMADA_8K)
 #define MAIN_HDR_MAGIC         0xB105B002
 

diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index e78bde30e138c9d0e63bfab10d7e0b6060a560a3..27dab8b21b1728f273fa310b59662a240d8b1221 100644 (file)
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -36,6 +36,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 # CONFIG_SPL_BLK is not set

diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig
index 038e0325a695203d5bdf7560358a0e4aaa33c5d9..d82bca757d6369f31b4ec1c8eb96f67f9b501e17 100644 (file)
--- a/configs/am335x_shc_defconfig
+++ b/configs/am335x_shc_defconfig
@@ -48,6 +48,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_DM_MMC=y

diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig
index a4b8b1150078e27b1c2e01fead59d78876d9f8e6..ad1ff7e9a3fcd000591de517acf934fa56b5c95d 100644 (file)
--- a/configs/am335x_shc_ict_defconfig
+++ b/configs/am335x_shc_ict_defconfig
@@ -49,6 +49,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_DM_MMC=y

diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig
index 66541c07bdb81520f05b4ba9b1c97b16a1907220..1f0b05b565e38cb431f21f1d4136298965b5630d 100644 (file)
--- a/configs/am335x_sl50_defconfig
+++ b/configs/am335x_sl50_defconfig
@@ -52,6 +52,8 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index 721114664407641c1904fa7c1341e4553d4a930b..92918c392257373dbaa143f421540e48eb667db8 100644 (file)
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -54,6 +54,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_DM=y

diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
index cfec32e81b1215dc01864f378146089445136942..6866440509df0167d3575d44536f4f77e3c78872 100644 (file)
--- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig
@@ -56,6 +56,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_DM=y

diff --git a/configs/am57xx_hs_evm_usb_defconfig b/configs/am57xx_hs_evm_usb_defconfig
index 64935b7749be3be5b3af175a4ddde485274d10f9..ff3d083a310c1f5a2493bb8d8b0c02009c04fb42 100644 (file)
--- a/configs/am57xx_hs_evm_usb_defconfig
+++ b/configs/am57xx_hs_evm_usb_defconfig
@@ -62,6 +62,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_DM=y

diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
index 86bd940e2e8e5dd3abed8491547935597c75143c..05a7de87a1b3606a7743f38e078df0b2096e4b65 100644 (file)
--- a/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@ -68,6 +68,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y

diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig
index 459fa6de0aa46acbea8a921b77c9e64a152da453..9403f379ece85b2bcd1e47fb8abc75f33955428f 100644 (file)
--- a/configs/am65x_hs_evm_a53_defconfig
+++ b/configs/am65x_hs_evm_a53_defconfig
@@ -71,6 +71,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y

diff --git a/configs/apalis-imx8qm_defconfig b/configs/apalis-imx8qm_defconfig
index 9b9736e9b68920626c2c11dffec33f17a25cc626..be70c7c234001a22d14123c5f714909c4044cc68 100644 (file)
--- a/configs/apalis-imx8qm_defconfig
+++ b/configs/apalis-imx8qm_defconfig
@@ -34,6 +34,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=4096
 CONFIG_CLK_IMX8=y

diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 13885602d90fde61da8caf61fb2a8e8a27b954c9..e21a8c24777b40de4ca94715cd7a823937801bd5 100644 (file)
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -35,6 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_SPL_DM=y

diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index 43f83e7c835980ee258c6d6aa20347e176a2f715..cf6051c4ffa7ab99cebcdc2bd45c164b13cc90e5 100644 (file)
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -61,6 +61,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=4096

diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index bb3138f3555fd73f1217a5018258f91797fa3969..1e130507402a184c2b5f106e3db3a3f12608ff06 100644 (file)
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -30,6 +30,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_SPL_DM=y

diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig
index 8510cc272f96b569f6dd6ca3000c06833ae43820..f04fcf59d5f763c042dd6b2a4fa0704e801945ad 100644 (file)
--- a/configs/bcm11130_defconfig
+++ b/configs/bcm11130_defconfig
@@ -4,7 +4,6 @@ CONFIG_SYS_TEXT_BASE=0xae000000
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x2340000
 CONFIG_NR_DRAM_BANKS=1
-CONFIG_SYS_EXTRA_OPTIONS="SYS_MMC_ENV_DEV=0"
 CONFIG_MISC_INIT_R=y
 CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_CPUINFO is not set

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 5f5bf1e6c27c5c7fd15e96b6f1b7bbe91e2c119b..ca3bb056851a011f5d29fa927fafdf009e03c63e 100644 (file)
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index 40eeaa7defd24b488c5e33b8bc20adeb81d74b5d..fd9d18879eb76408d4ff36a14eb7a65f125d03ca 100644 (file)
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -71,6 +71,8 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_SYS_MMC_ENV_DEV=1
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y

diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index d7b1765f2a11ab46a315a0c8bcb36ba7a31b3222..29156f0b9ffaf5d05f840cabc644d696af9e0f89 100644 (file)
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -70,6 +70,8 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_SYS_MMC_ENV_DEV=1
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y

diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index dfd75ed8b739f6bb14329143f674bb37feef824c..99f4d6d4f89beca8bdeafc6249e57806b7a94ace 100644 (file)
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SPL_DM=y
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_SF_DEFAULT_MODE=0

diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
index 436d026451752323142ab63879bede5a6be3faea..a508bbdc2c47202431f5e44418fb41aec76e1294 100644 (file)
--- a/configs/cei-tk1-som_defconfig
+++ b/configs/cei-tk1-som_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8qxp_defconfig
index e729628e27704b7d238894fe5b78dcaa8d74358f..bad38b1afce259b3b13c13530cc38459a8678f94 100644 (file)
--- a/configs/colibri-imx8qxp_defconfig
+++ b/configs/colibri-imx8qxp_defconfig
@@ -32,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=4096
 CONFIG_CLK_IMX8=y

diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 800663ed91cc9d6aaea7a67ff986381ca79e393d..ac0091590588a76a4259d9ab0b30fea9fc41440e 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -61,6 +61,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352

diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index 8355fef4192d6fc7d1e7ae226053d5144dafae8b..7c3eab82b12ecf9c9f7a80202d8357e3cae319d3 100644 (file)
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -46,6 +46,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352

diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index b516d5f509e0655e1fe2e505e62de1093f71c6e7..14028c02c382e7e588a30f7f9f18e783a05b7763 100644 (file)
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_SPL_DM=y

diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index c6c1981c6706b6b5b70e8d432748aae0a122a3ae..aac7186bb05565374bd6a0ceccf8d99a0f2967d0 100644 (file)
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig
index bc4ad785bf539d113e46cfab288e465ec0bf97be..2fd5a2e2e58c7ff392373aa5c155988d28a3449b 100644 (file)
--- a/configs/deneb_defconfig
+++ b/configs/deneb_defconfig
@@ -61,6 +61,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y

diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 86eb6f85ddf7b073c21dd674b696b96a2d920e35..56d3da0e0237ea592422624f9732d8a545fc3d9d 100644 (file)
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -59,6 +59,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_DM=y

diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
index 6079920ff9d6b09dcd1628fe7d84658a7cb58d2e..772238b5aed8ca42c7910fe3ae85fd8720ca32f6 100644 (file)
--- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig
@@ -62,6 +62,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_DM=y

diff --git a/configs/dra7xx_hs_evm_usb_defconfig b/configs/dra7xx_hs_evm_usb_defconfig
index e6b9682792cfcdcbd8d04381673e8da0642a34ab..624c50d2c6195ce8d45acb366fa70dbaf1f4e80f 100644 (file)
--- a/configs/dra7xx_hs_evm_usb_defconfig
+++ b/configs/dra7xx_hs_evm_usb_defconfig
@@ -58,6 +58,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_DM=y

diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig
index 3121bc3a2fd087d4bc21d38dadfe397459a4a92d..987b0a7c9f49211b7e07bb291a04723e317100e5 100644 (file)
--- a/configs/dragonboard410c_defconfig
+++ b/configs/dragonboard410c_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIMER=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_CLK=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x91000000

diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
index d071e6b227da6cde25e290814010117569650b46..883e43763be7d50d18f4e941a43dd3ff084c3f78 100644 (file)
--- a/configs/e2220-1170_defconfig
+++ b/configs/e2220-1170_defconfig
@@ -24,6 +24,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
index c0ee67ee8460a485a00bec1020b725eab58b0c37..edd6ee1b5e79feccf74e06851a19a2cb2b13e8fd 100644 (file)
--- a/configs/evb-rk3328_defconfig
+++ b/configs/evb-rk3328_defconfig
@@ -41,6 +41,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent
 CONFIG_TPL_OF_PLATDATA=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_TPL_DM=y
 CONFIG_REGMAP=y

diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig
index df1b212976a16b976cf8b435c8ffebb707d0b8f2..c20b564d434a8ea964f7b61de91b930f182b93cb 100644 (file)
--- a/configs/ficus-rk3399_defconfig
+++ b/configs/ficus-rk3399_defconfig
@@ -24,6 +24,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y

diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig
index ce7449ac99b931bb83739a67e02eedec0453f521..5696497efd95faafbcceda877335f9399d2eaa93 100644 (file)
--- a/configs/giedi_defconfig
+++ b/configs/giedi_defconfig
@@ -61,6 +61,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y

diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index df7f34ae97152c342e6b4049900d3cb763faaef5..5d83affceeecbf60be87b04b462f78fc323f9fae 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -66,6 +66,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y

diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 536b9554fd7249e13f9d9f66ba9a3783fb1e88f2..f319f2a0b845816afa020264948f428d3db0ce64 100644 (file)
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -66,6 +66,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y

diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig
index 8b115ea70ad4562f8814fc3972fd67852135e832..a4304b29dacf156a72775c049ed4e5f15bab1bb1 100644 (file)
--- a/configs/hikey_defconfig
+++ b/configs/hikey_defconfig
@@ -20,6 +20,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_K3=y

diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig
index 52c26aa59e4855e2dce0e657594e01df3654a99e..31a4e57f5106ca91f08046ed2080a3162d10c48b 100644 (file)
--- a/configs/imx6dl_mamoj_defconfig
+++ b/configs/imx6dl_mamoj_defconfig
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=2
 CONFIG_DFU_MMC=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000

diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig
index 9e140d14a58c6bfa2a3a028a9854d9e2f5ae7d18..c5d331f617a20936fc240a6f33c3a0c5b6f35405 100644 (file)
--- a/configs/imx8mm_beacon_defconfig
+++ b/configs/imx8mm_beacon_defconfig
@@ -56,6 +56,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y

diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig
index 7919d0aeff8bb37b7f59496cd6e98f76bb6a9136..91d3bc3ac94e2871194906f56ede6a52e50333a0 100644 (file)
--- a/configs/imx8mm_evk_defconfig
+++ b/configs/imx8mm_evk_defconfig
@@ -54,6 +54,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_CLK_COMPOSITE_CCF=y

diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig
index 2a6bfdc62f6748dbc74ba1e6092cc3abe9bd3577..4ed02846f593756448ab2df62297a7eaae0696bb 100644 (file)
--- a/configs/imx8mp_evk_defconfig
+++ b/configs/imx8mp_evk_defconfig
@@ -56,6 +56,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SPL_DM=y
 CONFIG_CLK_COMPOSITE_CCF=y

diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig
index 1b22456a3fa619be7e6e437bdbda59be7370e1be..c755e74494ceb42b679a13b2a1f37aaae49c3ae0 100644 (file)
--- a/configs/imx8mq_evk_defconfig
+++ b/configs/imx8mq_evk_defconfig
@@ -40,6 +40,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y

diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig
index 2744140d5c301c9cc925f30454a39dfb51b70331..5fa89e9963f741104adfd93ff5eaade840fa6889 100644 (file)
--- a/configs/imx8mq_phanbell_defconfig
+++ b/configs/imx8mq_phanbell_defconfig
@@ -41,6 +41,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y

diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig
index 106f8437cef19e67720412ed8bf265ccbea03d0f..601ac0f65608a0dc0789075199ddc78c5effd02e 100644 (file)
--- a/configs/imx8qm_mek_defconfig
+++ b/configs/imx8qm_mek_defconfig
@@ -49,6 +49,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_SPL_DM=y
 CONFIG_SPL_CLK=y
 CONFIG_CLK_IMX8=y

diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig
index 33dc4b00f8d05ebf25e6d36d49f740b3ad2d2bb6..b2b85d7150ebc2d9137f6a198f04ad12263873a8 100644 (file)
--- a/configs/imx8qm_rom7720_a1_4G_defconfig
+++ b/configs/imx8qm_rom7720_a1_4G_defconfig
@@ -45,6 +45,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=2
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_CLK=y

diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig
index 118d8e86594203f1202b2247f03b6575a2ce4869..1ca5ab96cc1bdb0a2f35764dbf1992a891d1b310 100644 (file)
--- a/configs/imx8qxp_mek_defconfig
+++ b/configs/imx8qxp_mek_defconfig
@@ -49,6 +49,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_CLK=y

diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
index c8f5f5b0dae243c6b8f31b4e4ff7f7f15319421f..a8d3992bdc91c7cfbbb492d9c1c749e772092ff8 100644 (file)
--- a/configs/j721e_evm_a72_defconfig
+++ b/configs/j721e_evm_a72_defconfig
@@ -80,6 +80,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y

diff --git a/configs/j721e_hs_evm_a72_defconfig b/configs/j721e_hs_evm_a72_defconfig
index a7daa6556e620e1c40cd9dd0f5218b6ef2c84225..55860a79fa757a7a06ccdd2ceba70d1d88ae33ce 100644 (file)
--- a/configs/j721e_hs_evm_a72_defconfig
+++ b/configs/j721e_hs_evm_a72_defconfig
@@ -73,6 +73,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y

diff --git a/configs/j721e_hs_evm_r5_defconfig b/configs/j721e_hs_evm_r5_defconfig
index 62c3bc506b18371ebb065c4f3137d905ec9d594d..f4faa7406861d38ac02277730615c82180afdd70 100644 (file)
--- a/configs/j721e_hs_evm_r5_defconfig
+++ b/configs/j721e_hs_evm_r5_defconfig
@@ -62,6 +62,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y

diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index b8b14646612b9b4e59d6481118a7c216c1c101ae..9b50a4c7fecfca72e99b7c9f69b74befb76bbad5 100644 (file)
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig
index 676c5c30b039971f45a04e97ecfe34b53bc90693..21bdeefc6efcfba977808059e3bc862d5d2d79fc 100644 (file)
--- a/configs/kp_imx6q_tpc_defconfig
+++ b/configs/kp_imx6q_tpc_defconfig
@@ -49,6 +49,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 # CONFIG_BLOCK_CACHE is not set
 CONFIG_SPL_CLK_IMX6Q=y
 CONFIG_CLK_IMX6Q=y

diff --git a/configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig b/configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig
index a2b64c52a3a2bb2d3f6883861c772bc2c509ccff..39495de80112bd23e67e942762645b8d16ee3ef1 100644 (file)
--- a/configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig
@@ -42,6 +42,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
+CONFIG_FMAN_ENET=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y

diff --git a/configs/ls1046afrwy_tfa_defconfig b/configs/ls1046afrwy_tfa_defconfig
index 4251a7cb8166673b2982a2597a585c845000276f..74863af4af10957fdf3d1b1ef40c3ddacc386f95 100644 (file)
--- a/configs/ls1046afrwy_tfa_defconfig
+++ b/configs/ls1046afrwy_tfa_defconfig
@@ -48,6 +48,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_VITESSE=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
+CONFIG_FMAN_ENET=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y

diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig
index 4d5a0bd2307a13d8217fef8c79aff4935d57f721..8d99ae947189b8ec4aee0a6ad6aa93bdf30ee9fa 100644 (file)
--- a/configs/mx6dlarm2_defconfig
+++ b/configs/mx6dlarm2_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_FSL_USDHC=y
 CONFIG_MII=y
 CONFIG_MXC_UART=y

diff --git a/configs/mx6dlarm2_lpddr2_defconfig b/configs/mx6dlarm2_lpddr2_defconfig
index a9a7c69b1813cc2ae1128a402baaccbc16701a52..50f5f9589b268ace27bde2b8ed75fd1df0f6d46c 100644 (file)
--- a/configs/mx6dlarm2_lpddr2_defconfig
+++ b/configs/mx6dlarm2_lpddr2_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_FSL_USDHC=y
 CONFIG_MII=y
 CONFIG_MXC_UART=y

diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig
index 5d115e096dc13ddb8eb2ddb757c4ad44c8ae4cf9..134988e6ac79a54340a1360a86f4f94b6b0391d9 100644 (file)
--- a/configs/mx6qarm2_defconfig
+++ b/configs/mx6qarm2_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_FSL_USDHC=y
 CONFIG_MII=y
 CONFIG_MXC_UART=y

diff --git a/configs/mx6qarm2_lpddr2_defconfig b/configs/mx6qarm2_lpddr2_defconfig
index bd3ba1649d2f51b929e72b380ecf713a23b20f53..a38c56e47ebd3850ac0878b0534874ff14c4d5a5 100644 (file)
--- a/configs/mx6qarm2_lpddr2_defconfig
+++ b/configs/mx6qarm2_lpddr2_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_FSL_USDHC=y
 CONFIG_MII=y
 CONFIG_MXC_UART=y

diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
index df7f443e7001d05eed8765312a3774f0e95c7adb..f1027d42869d7536598a873e6afb3009066884a4 100644 (file)
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -68,6 +68,7 @@ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000

diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig
index cd2fecca0cff117e9b501ece475418f8c9b6e72f..b2773c38dc7da053a76418da0fd650fb0023572b 100644 (file)
--- a/configs/mx6slevk_defconfig
+++ b/configs/mx6slevk_defconfig
@@ -34,6 +34,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_DM=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y

diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig
index d547945ae671f1160328ed6fcb2605f8388d25c9..f8c38310c160d5eac2128344e42fdb7093ba09cb 100644 (file)
--- a/configs/mx6slevk_spl_defconfig
+++ b/configs/mx6slevk_spl_defconfig
@@ -43,6 +43,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_DM=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y

diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index 9ff5b8aff149cb36887e78f6b4799834fda12ee8..16f27956d27334dc1f51614e876e3bda5bccb982 100644 (file)
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y

diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig
index cdb297d8d04d0e2524ceb3f5f588075d2fa7ea91..5a991954c724ceec4a70e718308795c01ef5ea1b 100644 (file)
--- a/configs/mx6ul_14x14_evk_defconfig
+++ b/configs/mx6ul_14x14_evk_defconfig
@@ -51,6 +51,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_DM_74X164=y

diff --git a/configs/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig
index 080eb14747b62d46bdb86225cc5d2444555d09cb..8680983d5cbe3d97ca6fa804c9705a7332a9d35b 100644 (file)
--- a/configs/mx6ul_9x9_evk_defconfig
+++ b/configs/mx6ul_9x9_evk_defconfig
@@ -46,6 +46,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y

diff --git a/configs/mx6ull_14x14_evk_defconfig b/configs/mx6ull_14x14_evk_defconfig
index 5131213475bd31da0e1c8fdea709b83cb3c65472..e0440aaee0fdfa3a8383e8d77d4917c6f7269ff3 100644 (file)
--- a/configs/mx6ull_14x14_evk_defconfig
+++ b/configs/mx6ull_14x14_evk_defconfig
@@ -31,6 +31,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y

diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig b/configs/mx6ull_14x14_evk_plugin_defconfig
index 4a469ad2867a98907950bf0c907ba747ba502621..ebd74c17ddb53e0961e51baf8c04cb4b93cadd8f 100644 (file)
--- a/configs/mx6ull_14x14_evk_plugin_defconfig
+++ b/configs/mx6ull_14x14_evk_plugin_defconfig
@@ -32,6 +32,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y

diff --git a/configs/mx6ulz_14x14_evk_defconfig b/configs/mx6ulz_14x14_evk_defconfig
index e06d55f7a97c1df464930ed1c9b3e3dad358c36d..80bb1a236e07e5c652191cd1f6b1133021fd5939 100644 (file)
--- a/configs/mx6ulz_14x14_evk_defconfig
+++ b/configs/mx6ulz_14x14_evk_defconfig
@@ -29,6 +29,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 # CONFIG_NET is not set
 CONFIG_DM_74X164=y

diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index c79b93c4fdfc11b5bda27e3084897562d7611870..45a06a11dac656a8f9f70cd313e7d7fac553442f 100644 (file)
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -46,6 +46,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig
index 512021dd37ad6276f82a15b1f955388e0caa1235..2e0ebc416be115c115ceadf0ddad40bfb45f3293 100644 (file)
--- a/configs/omap4_sdp4430_defconfig
+++ b/configs/omap4_sdp4430_defconfig
@@ -31,6 +31,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_DM=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y

diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index 0361bff03ad2a6f1a6a06cad6b905eb1901cfd37..f8b57cfcc681e63e572f86d3debe6d456eb48a78 100644 (file)
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -32,6 +32,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
 CONFIG_SCSI_AHCI=y

diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig
index 9ae06ecf6987f2572466f8eb49cd0a3c3e220cb1..a4916fbf2c29203e8702cd698c832178ac028bcf 100644 (file)
--- a/configs/opos6uldev_defconfig
+++ b/configs/opos6uldev_defconfig
@@ -67,6 +67,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y

diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index 74310849a935711a128a4ead4241750ecacc4e7e..7090aae8662f6dce35129b22f9f97e7dd22d0768 100644 (file)
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -25,6 +25,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 77bbdcca19db17a05be30322ca8cd26e12e146db..83eb44f3fd460cb069f15f90aba22b8fd32518ce 100644 (file)
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_LIVE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index 608300a8831fb7ae00dc690fc3bc8a3d3704f110..f1a650d1563f474e6a37ab0a8dc129a2e6d29a5c 100644 (file)
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -25,6 +25,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y

diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig
index e1f665faa193974ec1174a11d406ebfb3942aeaa..7858fd6b4afb9f9238d348e09d6f1cb61dbef99a 100644 (file)
--- a/configs/p2771-0000-000_defconfig
+++ b/configs/p2771-0000-000_defconfig
@@ -24,6 +24,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_TEGRA186_BPMP_I2C=y
 CONFIG_DWC_ETH_QOS=y

diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig
index d6a6db687565aa948da1c1e8394887d22a87bb01..33c4c70148f3c5a98d3749341fc0f871a5f25843 100644 (file)
--- a/configs/p2771-0000-500_defconfig
+++ b/configs/p2771-0000-500_defconfig
@@ -24,6 +24,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_TEGRA186_BPMP_I2C=y
 CONFIG_DWC_ETH_QOS=y

diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 435779b4d28cf1e188addf968f19589b4ce4dce0..d95d659159016f861cdbfbcdb16459318b880284 100644 (file)
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SPL_DM=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y

diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig
index 9619aa6a71c43860a9a7628e96a3b0f9ef82750f..a754d24a0bea4aa69214afd518db646c2d7b8950 100644 (file)
--- a/configs/phycore-rk3288_defconfig
+++ b/configs/phycore-rk3288_defconfig
@@ -39,6 +39,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SYSCON=y

diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig
index 78178e2152ad4a00263cf250c0a5233e214a8b30..3ab1d66b60da68ec0b0975fed8681680bfbaa286 100644 (file)
--- a/configs/pico-imx8mq_defconfig
+++ b/configs/pico-imx8mq_defconfig
@@ -39,6 +39,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y

diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
index 0fed34db937bc2221c40545569b76967351a6822..3b8f1faaeceeb5fba5767806042b686c9be346cd 100644 (file)
--- a/configs/puma-rk3399_defconfig
+++ b/configs/puma-rk3399_defconfig
@@ -43,6 +43,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent assigned-cl
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MISC=y

diff --git a/configs/r8a774a1_beacon_defconfig b/configs/r8a774a1_beacon_defconfig
index 80fa7acd27e53bc41808cc70ef00ab06c95bc90f..25b72117ea7337b338e27fd8d922a8a6f9dffdd7 100644 (file)
--- a/configs/r8a774a1_beacon_defconfig
+++ b/configs/r8a774a1_beacon_defconfig
@@ -32,6 +32,8 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_MMC_ENV_DEV=1
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y

diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig
index d003ec680236393a8b75396b08c24a13c7a0d456..efdb8e6eb7e2d9752937b6d206eb7ee828719120 100644 (file)
--- a/configs/r8a77990_ebisu_defconfig
+++ b/configs/r8a77990_ebisu_defconfig
@@ -35,6 +35,8 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=2
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y

diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig
index 5051984739a0f3abd6afaa32f213b0b16fddf933..b4962300bca30731ab0d1c1b542fc701f465ec25 100644 (file)
--- a/configs/r8a77995_draak_defconfig
+++ b/configs/r8a77995_draak_defconfig
@@ -35,6 +35,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y

diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig
index d2b17237591973b199e8d7c796f3578854947928..0fbd1e0c82677b233481c99c37bee9c3774ffe4e 100644 (file)
--- a/configs/rcar3_salvator-x_defconfig
+++ b/configs/rcar3_salvator-x_defconfig
@@ -38,6 +38,8 @@ CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y

diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig
index f9ed9fa1df2395121bf6b3103de5dbd1a3e7eca5..710b2f4a4aa4972aa719dcedfcc44950ec8c093b 100644 (file)
--- a/configs/rcar3_ulcb_defconfig
+++ b/configs/rcar3_ulcb_defconfig
@@ -38,6 +38,8 @@ CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y

diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index c33ea6e426786441cd85843210851b1de0de1ea2..1aeeb08ac35d79539d165c5128a5d4158edc3a51 100644 (file)
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=2
 CONFIG_DM=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y

diff --git a/configs/riotboard_spl_defconfig b/configs/riotboard_spl_defconfig
index 1bc1c54026dd2a85705cadc5e0063b150e98ab6a..c56702c33cddc6805d4cb256c83706f67c970efa 100644 (file)
--- a/configs/riotboard_spl_defconfig
+++ b/configs/riotboard_spl_defconfig
@@ -33,6 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=2
 CONFIG_DM=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y

diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig
index 40e60707a2192f44fbccdfa01fa2bb5f7987a206..624f71df581e95a5ef1e10466275e16733fe3a0b 100644 (file)
--- a/configs/roc-cc-rk3328_defconfig
+++ b/configs/roc-cc-rk3328_defconfig
@@ -43,6 +43,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne
 CONFIG_TPL_OF_PLATDATA=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_TPL_DM=y
 CONFIG_REGMAP=y

diff --git a/configs/rock-pi-e-rk3328_defconfig b/configs/rock-pi-e-rk3328_defconfig
index ad4bb6e36892fb7c03db7f99c32f6b8a76ecc4b9..5f8ad1c19098295a8e4f8e967033cc90b5626c6f 100644 (file)
--- a/configs/rock-pi-e-rk3328_defconfig
+++ b/configs/rock-pi-e-rk3328_defconfig
@@ -45,6 +45,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne
 CONFIG_TPL_OF_PLATDATA=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_TPL_DM=y
 CONFIG_REGMAP=y

diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig
index a7f8823c6c9245289f003c987f15a341026cb17b..e6922e286aeb57e18412447d79007a66885a9492 100644 (file)
--- a/configs/rock64-rk3328_defconfig
+++ b/configs/rock64-rk3328_defconfig
@@ -43,6 +43,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigne
 CONFIG_TPL_OF_PLATDATA=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_TPL_DM=y
 CONFIG_REGMAP=y

diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
index aa0988cefa228b83964c014439c04acdbcc5b39a..1d997847c25f00819b57cf8fb0524cf2893f90d2 100644 (file)
--- a/configs/rock960-rk3399_defconfig
+++ b/configs/rock960-rk3399_defconfig
@@ -30,6 +30,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MMC_DW=y

diff --git a/configs/s5p4418_nanopi2_defconfig b/configs/s5p4418_nanopi2_defconfig
index c1cd08abf652077af9ed54d43b7a8ecabb3d7272..048af7b88c1e5fd32cd32d2affcb73b9caafee6d 100644 (file)
--- a/configs/s5p4418_nanopi2_defconfig
+++ b/configs/s5p4418_nanopi2_defconfig
@@ -92,6 +92,8 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_OFFSET=0x2E0200
 CONFIG_ENV_SIZE=0x4000
 CONFIG_CMD_SAVEENV=y
+CONFIG_ENV_OVERWRITE=y
+CONFIG_SYS_MMC_ENV_DEV=2
 
 ## Etc Command definition
 # image info

diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index e4404580af540493bf385bab4610733b19bd7b7f..0b6dd521bd66f5e2323fb4a8420349e5e82a549e 100644 (file)
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SPL_DM=y
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_TEGRA_KEYBOARD=y

diff --git a/configs/sei510_defconfig b/configs/sei510_defconfig
index b74c7387bb606c01862eade4035c4118cd3e9e66..fc846fa8ce38f043e64c71a1b40c5eb7f83034c4 100644 (file)
--- a/configs/sei510_defconfig
+++ b/configs/sei510_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=2
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x6000000

diff --git a/configs/sei610_defconfig b/configs/sei610_defconfig
index 3c8b6fcbaacaef437190776ec73ff4f01de801bd..16c0d82850392e1c9acc54cf28551b0333c3759d 100644 (file)
--- a/configs/sei610_defconfig
+++ b/configs/sei610_defconfig
@@ -34,6 +34,8 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=2
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x6000000

diff --git a/configs/somlabs_visionsom_6ull_defconfig b/configs/somlabs_visionsom_6ull_defconfig
index 7c9f237da8f99af007b98145cc72c24302a5c468..74f9a8a533d126de488d92ab5d6b3965ef00b443 100644 (file)
--- a/configs/somlabs_visionsom_6ull_defconfig
+++ b/configs/somlabs_visionsom_6ull_defconfig
@@ -34,6 +34,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_FSL_USDHC=y

diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index f50a9952f491c5734521e08d8f45e5cdadf67764..510d090f32a46e78f5c4285f82cd4692ae259095 100644 (file)
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -61,6 +61,8 @@ CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-ex
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=2
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_DM_I2C=y

diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index d2413bffc8ae19794d2d6766b79e215982882a7f..fc6bd5e9b2042794029285e7beb45c7c98d9f4a8 100644 (file)
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SPL_DM=y
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_SF_DEFAULT_MODE=0

diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
index 2c3b2d4213d79cd8b5b5b92f3067fb9ed0ae4f59..44f2a70c86c7cfd5bd1a693f6bdfa6edb2183e84 100644 (file)
--- a/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
@@ -40,6 +40,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SYSCON=y

diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig
index faa73d6bf8c2b3f2bd6cff888be35d13c8dc5d86..e6d30353b6d3ec7856776833bbff55216fb894be 100644 (file)
--- a/configs/tinker-s-rk3288_defconfig
+++ b/configs/tinker-s-rk3288_defconfig
@@ -41,6 +41,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SYSCON=y

diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index d9eedc2b8703580a1fabc210853441468bc4d6a9..c422e5b3c59ea2383bec29668f0899a0179b987b 100644 (file)
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index b51254abf82ec727665423edcc6c58dc6db2c43d..7bd60601c8276ffb3e57ab4d2aaa12f448d9ad9f 100644 (file)
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_SPL_DM=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y

diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig
index 937094ca9e9432dbcca03f59f395e9b9dd04ecb2..1f7fb5b9576a6ab1c5bd997a3083ba93b1242e9e 100644 (file)
--- a/configs/verdin-imx8mm_defconfig
+++ b/configs/verdin-imx8mm_defconfig
@@ -63,6 +63,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=4096

diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig
index 145b7fb1daf30b7d02a7ba11eb968de556434093..a4c40c07ca379ceef02758bc40fe82383ec13817 100644 (file)
--- a/configs/vining_2000_defconfig
+++ b/configs/vining_2000_defconfig
@@ -58,6 +58,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM_MMC=y
 CONFIG_SUPPORT_EMMC_RPMB=y

diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig
index e8211b6a9cfded8ddfd63b512ee629a6147972b1..a93b960fc2c916eb6d43f2e836fc407b07b2f7b8 100644 (file)
--- a/configs/vyasa-rk3288_defconfig
+++ b/configs/vyasa-rk3288_defconfig
@@ -37,6 +37,7 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SYSCON=y

diff --git a/configs/xpress_defconfig b/configs/xpress_defconfig
index 2e0260836d5fe7a16720ecef37fcdacb042195c8..d1e0786bb043f670691105c5bad8b908f180e327 100644 (file)
--- a/configs/xpress_defconfig
+++ b/configs/xpress_defconfig
@@ -31,6 +31,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y

diff --git a/configs/xpress_spl_defconfig b/configs/xpress_spl_defconfig
index 536efa95d8ec6752ca4e95ee95573be4301a7ada..10ce66b3e7aba8cdf893f6cd91a34ed9dd1c5d70 100644 (file)
--- a/configs/xpress_spl_defconfig
+++ b/configs/xpress_spl_defconfig
@@ -42,6 +42,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y

diff --git a/configs/zc5202_defconfig b/configs/zc5202_defconfig
index 23f1dc73825cf1b9885c36195a9eba3a0ea82bcd..72bf825ec77c0b7c669fdea203186178741c51c6 100644 (file)
--- a/configs/zc5202_defconfig
+++ b/configs/zc5202_defconfig
@@ -40,6 +40,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y

diff --git a/configs/zc5601_defconfig b/configs/zc5601_defconfig
index ba39357935281c243ad31a9ea28e259c8d440f86..62cb213b1117ef63439d7cab15620ff402727eb3 100644 (file)
--- a/configs/zc5601_defconfig
+++ b/configs/zc5601_defconfig
@@ -39,6 +39,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
+CONFIG_SYS_MMC_ENV_PART=2
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y

diff --git a/env/Kconfig b/env/Kconfig
index 5d0a8ecea06e14b4a518eed32445d5588f0c385e..af4d9cbaa4d8315859c50c628ee0eef05f555fec 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -577,6 +577,25 @@ config SYS_RELOC_GD_ENV_ADDR
          Relocate the early env_addr pointer so we know it is not inside
          the binary. Some systems need this and for the rest, it doesn't hurt.
 
+config SYS_MMC_ENV_DEV
+       int "mmc device number"
+       depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || SYS_LS_PPA_FW_IN_MMC || \
+               CMD_MVEBU_BUBT || FMAN_ENET || QE
+       default 0
+       help
+         MMC device number on the platform where the environment is stored.
+
+config SYS_MMC_ENV_PART
+       int "mmc partition number"
+       depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT
+       default 0
+       help
+         MMC hardware partition device number on the platform where the
+         environment is stored.  Note that this is not related to any software
+         defined partition table but instead if we are in the user area, which is
+         partition 0 or the first boot partition, which is 1 or some other defined
+         partition.
+
 config USE_DEFAULT_ENV_FILE
        bool "Create default environment from file"
        help

diff --git a/env/mmc.c b/env/mmc.c
index af7e5fbac3a010523b775732fee293d06d6c3466..ba872701b0d5bd9210eeb4329ee1060218d35154 100644 (file)
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -24,10 +24,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if !defined(CONFIG_SYS_MMC_ENV_DEV)
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
-
 __weak int mmc_get_env_dev(void)
 {
        return CONFIG_SYS_MMC_ENV_DEV;

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index d7dabf88210cac84ce59eb601af0f96aafd67fbc..806d1543281e946e36813b0bfae36c2fecbd0c6b 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -636,7 +636,6 @@ extern unsigned long get_sdram_size(void);
  */
 #if defined(CONFIG_SDCARD)
 #define CONFIG_FSL_FIXED_MMC_LOCATION
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_TPL_BUILD
 #define SPL_ENV_ADDR           (CONFIG_SYS_INIT_L2_ADDR + (160 << 10))

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 4542dafacb37f747e0ddc3105338e99e6233acb7..65d3dfa0f0da9a5453205a97a8906a5cfe3204ce 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -49,7 +49,6 @@
 #if defined(CONFIG_SPIFLASH)
 #elif defined(CONFIG_SDCARD)
        #define CONFIG_FSL_FIXED_MMC_LOCATION
-       #define CONFIG_SYS_MMC_ENV_DEV          0
 #endif
 
 #ifndef __ASSEMBLY__

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index f5c1ec0647b22786b46a23357e816f393f26341d..201da871bdb320bf891ea8547a28b4050b38c695 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -132,11 +132,6 @@
 #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
-#if defined(CONFIG_SPIFLASH)
-#elif defined(CONFIG_SDCARD)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 #ifndef __ASSEMBLY__
 unsigned long get_board_sys_clk(void);
 unsigned long get_board_ddr_clk(void);

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index a616871917e1cc7a3e98f0cc9d1898e608f6d541..aee00a86cfed4b5667dccc785e8a8523506e77b1 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -157,8 +157,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #define CONFIG_SYS_PCI_64BIT           /* enable 64-bit PCI resources */
 
 #if defined(CONFIG_SPIFLASH)
-#elif defined(CONFIG_SDCARD)
-#define CONFIG_SYS_MMC_ENV_DEV          0
 #elif defined(CONFIG_MTD_RAW_NAND)
 #ifdef CONFIG_NXP_ESBC
 #define CONFIG_RAMBOOT_NAND

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 25309b23193509f44b6232723c8f944d206c5422..1735b170fd26ef5c6bc4e9ecf6fea8144caa75d6 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -114,11 +114,6 @@
 #define CONFIG_MEM_INIT_VALUE          0xdeadbeef
 #endif
 
-#if defined(CONFIG_SPIFLASH)
-#elif defined(CONFIG_SDCARD)
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
-
 #ifndef __ASSEMBLY__
 unsigned long get_board_sys_clk(void);
 unsigned long get_board_ddr_clk(void);

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 104a5fd05d6cef036f3cbba421f0d7819a799700..30e38444c0dbae3fcd3d27ab4d66a50544c9040c 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -96,11 +96,6 @@
 #define CONFIG_MEM_INIT_VALUE          0xdeadbeef
 #endif
 
-#if defined(CONFIG_SPIFLASH)
-#elif defined(CONFIG_SDCARD)
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
-
 #ifndef __ASSEMBLY__
 unsigned long get_board_sys_clk(void);
 unsigned long get_board_ddr_clk(void);

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 86dc3ed9198d4940bd515ffe94a845f43cb3dfa4..7f831fb8bca5d37689b2febf10c27c0c549f3421 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -274,11 +274,6 @@
        "setenv bootargs config-addr=0x60000000; "      \
        "bootm 0x01000000 - 0x00f00000"
 
-#if defined(CONFIG_SPIFLASH)
-#elif defined(CONFIG_SDCARD)
-#define CONFIG_SYS_MMC_ENV_DEV          0
-#endif
-
 #define CONFIG_SYS_CLK_FREQ    66666666
 #define CONFIG_DDR_CLK_FREQ    133333333
 

diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index c5daaadce7833e526341bcf267ab9829e3e89c3e..c3cc72e13f7f6e871746195c721c0bdfce432507 100644 (file)
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -32,9 +32,6 @@
 #define FWENV_TYPE     FWENV_NOR_FLASH
 
 #if (FWENV_TYPE == FWENV_MMC)
-#ifndef CONFIG_SYS_MMC_ENV_DEV
-#define CONFIG_SYS_MMC_ENV_DEV 1
-#endif
 #define FWENV_ADDR1 -1
 #define FWENV_ADDR2 -1
 #define FWENV_ADDR3 -1
@@ -367,7 +364,6 @@
  */
 #if !defined(CONFIG_ENV_FIT_UCBOOT) && defined(CONFIG_RAMBOOT_SDCARD)
 #define CONFIG_FSL_FIXED_MMC_LOCATION
-#define CONFIG_SYS_MMC_ENV_DEV 0
 #endif
 
 #define CONFIG_LOADS_ECHO              /* echo on for serial download */

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 6de463efa1ee7ce6cadeeda80527fcae4ecea021..9c4ef369c5cf37eafbc1e4622c34c13e4ce25fea 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -275,8 +275,6 @@
 #if defined(CONFIG_SPI_BOOT)
 /* SPL related */
 #elif defined(CONFIG_EMMC_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV         1
-#define CONFIG_SYS_MMC_ENV_PART                0
 #define CONFIG_SYS_MMC_MAX_DEVICE      2
 #elif defined(CONFIG_ENV_IS_IN_NAND)
 #define CONFIG_SYS_ENV_SECT_SIZE       CONFIG_SYS_NAND_BLOCK_SIZE

diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 7240ff690149b703e40dd8f44b13b99a3a8b106e..387d50d51199bb4daa465266f76634b44c92e890 100644 (file)
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -26,23 +26,6 @@
 #define V_OSCK                         24000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)
 
-/*
- * in case of SD Card or Network boot we want to have a possibility to
- * debrick the shc, therefore do not read environment from eMMC
- */
-#if defined(CONFIG_SHC_SDBOOT) || defined(CONFIG_SHC_NETBOOT)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#else
-#define CONFIG_SYS_MMC_ENV_DEV         1
-#endif
-
-/*
- * Info when using boot partitions: As environment resides within first
- * 128 kB, MLO must start at 128 kB == 0x20000
- * ENV at MMC Boot0 Partition - 0/Undefined=user, 1=boot0, 2=boot1,
- * 4..7=general0..3
- */
-
 #define CONFIG_HSMMC2_8BIT
 
 #ifndef CONFIG_SHC_ICT

diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 9087e04165f7bebf4131dc8baa886387f7fe3780..16849d8701149468858c4354258a557eb059e5df 100644 (file)
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -75,11 +75,6 @@
 /* disable EFI partitions and partition UUID support */
 #endif
 
-#if defined(CONFIG_EMMC_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV         1
-#define CONFIG_SYS_MMC_ENV_PART                2
-#endif
-
 /* Network. */
 
 #endif /* ! __CONFIG_AM335X_SL50_H */

diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index 7d986cf8a1c4a25985c818ada7780d2c243621d8..c47ffccff1597cbebaad8494cd29ad2bf458336b 100644 (file)
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -16,10 +16,6 @@
 
 #define CONFIG_IODELAY_RECALIBRATION
 
-/* MMC ENV related defines */
-#define CONFIG_SYS_MMC_ENV_DEV         1               /* eMMC */
-#define CONFIG_SYS_MMC_ENV_PART                0
-
 #define CONFIG_SYS_BOOTM_LEN           SZ_64M
 
 #define CONFIG_SYS_NS16550_COM1                UART1_BASE      /* Base EVM has UART0 */

diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 19d861d40288ee73682dda488391dd3a6a5d2fc4..4de0dacee3c3a710deef9d8816dc0fa3c5d9c505 100644 (file)
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -140,12 +140,6 @@
        EXTRA_ENV_RPROC_SETTINGS                                        \
        EXTRA_ENV_DFUARGS
 
-/* MMC ENV related defines */
-#ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART        1
-#endif
-
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>
 

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index b43e14012f3516f0954fed4910de32ab591df15b..db4e9011c0b80ad0edcd1b8c832c761738e477e8 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -81,10 +81,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 
-/* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* USDHC1 eMMC */
-#define CONFIG_SYS_MMC_ENV_PART                1
-
 #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 */

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 519b3b78238c9f5964a3976de0aac05d48f43784..981f856efaab5ceb38d37fc0fbb266f71074d243 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -19,10 +19,6 @@
 #define FDT_MODULE                     "apalis-v1.2"
 #define FDT_MODULE_V1_0                        "apalis"
 
-/* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                1
-
 /* PCI host support */
 #undef CONFIG_PCI_SCAN_SHOW
 

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 8f526daee0ed4694f46cf195b2a698f52c2c5df9..f3156b02c9caac016635cff51a3c7f97f9d83d70 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -191,12 +191,4 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* environment organization */
-
-#if defined(CONFIG_ENV_IS_IN_MMC)
-/* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                1
-#endif
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 701b34aa8463039d33e71ee2f643b3e60fb9fe81..bf0aefda2adb957ce951f152fb0479e26d7d610b 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -18,10 +18,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_APALIS_T30
 
-/* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                1
-
 /* PCI networking support */
 #define CONFIG_E1000_NO_NVM
 

diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index 83f283593bac0c1cb1c84db78689483e25aa810c..bcd55bb8689e7802d1a945ec6540493685a42978 100644 (file)
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -21,13 +21,6 @@
 #define PHYS_SDRAM_1_SIZE              0x20000000      /* Max 512 MB RAM */
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 
-/* Environment */
-
-/* Environment is in MMC */
-#if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 /* Environment is in NAND */
 #if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND)
 #define CONFIG_ENV_RANGE               (384 * 1024)

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 53629743d9d4308f8b66dada3f968f396107e531..ba21149e43ca2c563fb4af39b1b0ee45d92959ce 100644 (file)
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -25,11 +25,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 
 #ifdef CONFIG_SD_BOOT
-
-#ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 #define CONFIG_BOOTCOMMAND     "if test ! -n ${dtb_name}; then "       \
                                    "setenv dtb_name at91-${board_name}.dtb; " \
                                "fi; "                                  \

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index e27c276a460c9fd37e917c40af9a264ac668bd9d..780bf0cce7a32bb6d60fc906f600ec44b0360457 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -129,7 +129,6 @@
 #else  /* CONFIG_SYS_USE_MMC */
 /* bootstrap + u-boot + env + linux in mmc */
 /* For FAT system, most cases it should be in the reserved sector */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 #define CONFIG_BOOTCOMMAND                                             \
        "fatload mmc 0:1 0x22000000 uImage; bootm"

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 2ee07bafdddad8bbcbcb4e180099cd391f8df9c6..fe99253e5a1ac16debd802c0a6b6cd63a65c3906 100644 (file)
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -94,15 +94,6 @@
 
 #else /* CONFIG_SD_BOOT */
 
-/* bootstrap + u-boot + env + linux in mmc */
-
-#ifdef CONFIG_ENV_IS_IN_MMC
-/* Use raw reserved sectors to save environment */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#else
-/* Use file in FAT file to save environment */
-#endif
-
 #define CONFIG_BOOTCOMMAND                                             \
        "setenv bootargs ${console} ${mtdparts} ${bootargs_mmc};"       \
        "fatload mmc 0:1 0x21000000 dtb;"                               \

diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h
index e771548aa6708de9864016d3dff4a139fe3e840c..05ada258eacf88e9743e2a278e8f2593c3ea8da3 100644 (file)
--- a/include/configs/bcm23550_w1d.h
+++ b/include/configs/bcm23550_w1d.h
@@ -76,7 +76,6 @@
 #define CONFIG_SYS_NS16550_COM1                0x3e000000
 
 /* must fit into GPT:u-boot-env partition */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 /* console configuration */
 #define CONFIG_SYS_CBSIZE              1024    /* Console buffer size */

diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index d807997277ae88639baa7f4c918a9df8fb1607d2..c84a5ca2e5e6c4d3e8b02cf77be66ed075fe13f8 100644 (file)
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -75,7 +75,6 @@
 #define CONFIG_SYS_NS16550_COM1                0x3e000000
 
 /* must fit into GPT:u-boot-env partition */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 /* console configuration */
 #define CONFIG_SYS_CBSIZE              1024    /* Console buffer size */

diff --git a/include/configs/bcm7260.h b/include/configs/bcm7260.h
index 31fd6ec08bbab920d6006db47cb7f84f0f68d4cd..f72d62ec354139b5c51734307eba2f8b1448698d 100644 (file)
--- a/include/configs/bcm7260.h
+++ b/include/configs/bcm7260.h
@@ -30,7 +30,5 @@
 /*
  * Environment configuration for eMMC.
  */
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#define CONFIG_SYS_MMC_ENV_PART        0
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h
index 039f4d6759ce201090d3586eea2f7238b858ee56..14275abdc47a32a94281d1670b09fb84e65a4f12 100644 (file)
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -43,10 +43,6 @@
  */
 #define CONFIG_SYS_BOOTM_LEN           0x01800000
 
-/* Env configuration */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                0
-
 /* Access eMMC Boot_1 and Boot_2 partitions */
 #define CONFIG_SUPPORT_EMMC_BOOT
 

diff --git a/include/configs/beacon-rzg2m.h b/include/configs/beacon-rzg2m.h
index 0e48fbd46eebb9d5e14c7c7903156ae5a07d587c..18d442e06a61295abec1e0ba634725d3b48e0352 100644 (file)
--- a/include/configs/beacon-rzg2m.h
+++ b/include/configs/beacon-rzg2m.h
@@ -11,11 +11,6 @@
 /* Ethernet RAVB */
 #define CONFIG_BITBANGMII_MULTI
 
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-/* #define CONFIG_ENV_OFFSET           (-CONFIG_ENV_SIZE) */
-#define CONFIG_SYS_MMC_ENV_DEV         1
-#define CONFIG_SYS_MMC_ENV_PART                2
-
 #undef CONFIG_EXTRA_ENV_SETTINGS
 
 #define CONFIG_EXTRA_ENV_SETTINGS              \

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 1b6ba8c85d241a595d1676b451b54d86335fc377..0daa20ed5ce06c3559919f2b4d3b9ae64bca1d2e 100644 (file)
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -22,10 +22,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_BEAVER
 
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
-
 /* SPI */
 #define CONFIG_TEGRA_SLINK_CTRLS       6
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 729d4d9799baa5c26d48dd6cae0620414c5b7081..f9a0632e543de52c9d07297ed893da5bb51ee935 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -177,18 +177,8 @@ NANDTGTS \
 #define CONFIG_NAND_OMAP_GPMC_WSCFG    1
 #endif /* CONFIG_MTD_RAW_NAND */
 
-#if defined(CONFIG_SPI)
-/* SPI Flash */
-/* Environment */
-#elif defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         1
-#define CONFIG_SYS_MMC_ENV_PART                2
-
-#elif defined(CONFIG_ENV_IS_IN_NAND)
-/* No NAND env support in SPL */
+#if defined(CONFIG_ENV_IS_IN_NAND)
 #define CONFIG_SYS_ENV_SECT_SIZE       CONFIG_ENV_SIZE
-#else
-#error "no storage for Environment defined!"
 #endif
 
 #endif /* ! __CONFIG_BRPPT1_H__ */

diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index 3a18aec5d3320924c68131c49ed222cc5adcb356..d6a7af1a152616e540b9bd21b70cf1ad4c487ed9 100644 (file)
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -64,7 +64,5 @@ BUR_COMMON_ENV \
 #define CONFIG_INITRD_TAG
 
 /* Environment */
-#define CONFIG_SYS_MMC_ENV_DEV         1
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 #endif /* __CONFIG_BRXRE1_H__ */

diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index cd5538df7c6cb4809876823892dcc117822d3d8d..7c168f17d5b07f1a0db93b223ec51479ce281cad 100644 (file)
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -133,10 +133,6 @@
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 
-/* Environment organisation */
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* USDHC1, eMMC */
-#define CONFIG_SYS_MMC_ENV_PART                2       /* 2nd boot partition */
-
 /* On CCP board, USDHC1 is for eMMC */
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"  /* eMMC */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1

diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 7eeadfc9c3d2ff0b65585841af00286c7e2649eb..8e8b1067b1dab868ae98480163d3f42910cbe273 100644 (file)
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -26,10 +26,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_CARDHU
 
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
-
 /* SPI */
 #define CONFIG_TEGRA_SLINK_CTRLS       6
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index dbebef34e386461ca7cbf1d925b97122ab423f21..dd3bdacc2c4c2ae9b2c7457ebfa82c7ed015ff75 100644 (file)
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -22,10 +22,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
-
 /* SPI */
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)
 

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index a2cc4f9fa83887c04642611fb77bb906320cfbb8..d2a0f95c0f8d145fbade1feb6fd47e9fb096081f 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -86,7 +86,6 @@
 #define CONFIG_MXC_UART_BASE   UART2_BASE
 #define CONSOLE_DEV    "ttymxc1"
 #define CONFIG_MMCROOT         "/dev/mmcblk0p2"
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
@@ -200,9 +199,4 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* Environment organization */
-#if defined (CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 #endif                        /* __CONFIG_CGTQMX6EVAL_H */

diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index a2d198c5197bc772b1b55951037b53957c942ef0..86cac236f96b23e727ef3fb74f6a473e663e0d6b 100644 (file)
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -161,8 +161,6 @@
 
 #if defined(CONFIG_ENV_IS_IN_NAND)
 #define CONFIG_SYS_ENV_SECT_SIZE       CONFIG_SYS_NAND_BLOCK_SIZE
-#else
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #endif
 
 /* Network. */

diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index c574337e84fdc2edfdb2275b2e1b31150e019194..6e46d29c855221f6e7bec6deefa72ed1f4559550 100644 (file)
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -38,9 +38,6 @@
 #define DM9000_IO                      CONFIG_DM9000_BASE
 #define DM9000_DATA                    (CONFIG_DM9000_BASE + 2)
 
-/* Environment */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 #define CONFIG_SYS_CBSIZE      1024            /* Console I/O buffer size */
 #define CONFIG_SYS_MAXARGS     32              /* Max number of command args */
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE

diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 74be2f137851e331d7e1e3b99f7a41cdc8a4eb71..5441da8c9cdc934b21612df1c2f5ff02acef866a 100644 (file)
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -30,7 +30,6 @@
 #define CONFIG_ENV_MIN_ENTRIES         128
 
 /* Environment in MMC */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 /*
  * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC
  * boot image starts @ LBA-0.

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index a94d2bbeacd742c7c2f92154be4403fa8db9dcf7..29a37ed44fdd408db1631d7c7cd235a8455c29b0 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -114,8 +114,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR                0x80200000
 
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* USDHC1 eMMC */
-#define CONFIG_SYS_MMC_ENV_PART                1
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 79003e325106d46d8bc5f053bfff46ec39b8dd19..7091766fef29817ce517186f4d3e32b3f2809d27 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -170,12 +170,4 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* environment organization */
-
-#if defined(CONFIG_ENV_IS_IN_MMC)
-/* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                1
-#endif
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 1afa9373a16b55f51d54ead5ef77ddadf0a00427..8fff2e15b7820d5860fcea20109a3ad9f4023e88 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -193,14 +193,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* environment organization */
-
-#if defined(CONFIG_ENV_IS_IN_MMC)
-/* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                1
-#endif
-
 #ifdef CONFIG_TARGET_COLIBRI_IMX7_NAND
 /* NAND stuff */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1

diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 4e5e89b547d9eb21153617ebf2808574a9c40fae..fa0fa93b03029861d180af2da3867271ea9c77a8 100644 (file)
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -20,10 +20,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_COLIBRI_T30
 
-/* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                1
-
 /* General networking support */
 #define CONFIG_TFTP_TSIZE
 

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 512d8e16eee5413fb1fbe5b73c182d43194cfa12..8ab8bb9f33c7c13aa3db491b3bae2f0ed03e794f 100644 (file)
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -268,7 +268,6 @@
 #if defined(CONFIG_TRAILBLAZER)
 #elif defined(CONFIG_RAMBOOT_SDCARD)
 #define CONFIG_FSL_FIXED_MMC_LOCATION
-#define CONFIG_SYS_MMC_ENV_DEV 0
 #endif
 
 #define CONFIG_SYS_LOAD_ADDR   0x2000000       /* default load address */

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index dafef2fe9c96ac41243146f01b1bb66f85be4d7a..731f884f405893015cefbe93cd1ccab048fc6136 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -62,7 +62,6 @@
 #if defined(CONFIG_SPIFLASH)
 #elif defined(CONFIG_SDCARD)
 #define CONFIG_FSL_FIXED_MMC_LOCATION
-#define CONFIG_SYS_MMC_ENV_DEV          0
 #endif
 
 #define CONFIG_SYS_CLK_FREQ    get_board_sys_clk() /* sysclk for MPC85xx */

diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 82e8e72a0b8f7f5e25ceb4851eb75a6411839f1a..9a8735f85006284b3bdcd1c90a1e8a5d488b83c8 100644 (file)
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -50,7 +50,6 @@
 
 #if defined(CONFIG_SDCARD)
 #define CONFIG_FSL_FIXED_MMC_LOCATION
-#define CONFIG_SYS_MMC_ENV_DEV          0
 #endif
 
 /*

diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 0cfc197142e5c2f3490c74fe29e7ddc5ca43cc08..18d9ba1784d926c8475a029f586ee67bc6d03c71 100644 (file)
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -20,8 +20,6 @@
 #define CONFIG_MACH_TYPE               MACH_TYPE_DALMORE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 /* SPI */
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index d933f79e34e3f2c36f4b1e9b1843f6df082403c3..b27f715798302503e41f5b4b033a51923e8d1993 100644 (file)
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -42,8 +42,6 @@
 /* Environment settings */
 
 /* Environment in SD */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                0
 #define MMC_ROOTFS_DEV                 0
 #define MMC_ROOTFS_PART                        2
 

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 637716b5487004da171d433a73c74304306d874d..008a70a7c2e913e9f181ca67a5fd0207f4fb571c 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -48,7 +48,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       3
-#define CONFIG_SYS_MMC_ENV_DEV         2 /* 1 = SDHC3, 2 = SDHC4 (eMMC) */
 
 /* SATA Configs */
 #define CONFIG_LBA48

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 3ceb73385d897a4aaa5773ca7d95c0e8a6f861a9..cc18bcece4d9e17dd865ce8c8cff1fe4990bbe38 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -20,7 +20,6 @@
 
 #ifndef CONFIG_QSPI_BOOT
 /* MMC ENV related defines */
-#define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
 #endif
 
 #if (CONFIG_CONS_INDEX == 1)

diff --git a/include/configs/draak.h b/include/configs/draak.h
index 3248320b9d64a7527fc683bbdd944649298a264f..d28cc9d336e341ae14441d48333ca89439ff9d9f 100644 (file)
--- a/include/configs/draak.h
+++ b/include/configs/draak.h
@@ -18,8 +18,6 @@
 #define COUNTER_FREQUENCY      0xFE502A        /* 16.66MHz from CPclk */
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
 #define CONFIG_FLASH_SHOW_PROGRESS     45

diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index 9362e9322cdb165d2138ed8f1cc642e52a06f192..65537e477824f8baaefd219565244f531c009b79 100644 (file)
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -79,9 +79,6 @@ REFLASH(dragonboard/u-boot.img, 8)\
        "pxefile_addr_r=0x90100000\0"\
        BOOTENV
 
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* mmc0 = emmc, mmc1 = sd */
-#define CONFIG_SYS_MMC_ENV_PART 2 /* Set env partition to BOOT2 partition */
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + SZ_8M)
 

diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h
index c4349bda45926a7b80e540dfee5fccebc24a833b..5ed62678ce7b9d298c89220a0a08f354aa0726cc 100644 (file)
--- a/include/configs/e2220-1170.h
+++ b/include/configs/e2220-1170.h
@@ -18,8 +18,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 /* SPI */
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h
index 521a348435af75c5b7efd502cff3f1d03e8473d7..06cbb03dc6ae628b48a2fe166bafd6eac08cf7d6 100644 (file)
--- a/include/configs/ebisu.h
+++ b/include/configs/ebisu.h
@@ -21,7 +21,5 @@
 #define COUNTER_FREQUENCY      0xFE502A        /* 16.66MHz from CPclk */
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         2
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 #endif /* __EBISU_H */

diff --git a/include/configs/edison.h b/include/configs/edison.h
index 3918a9fc1c371e93c176f78ca39e563ddce51fdf..606c656a727246f77a6c9adb039df7c5a1c19681 100644 (file)
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -26,8 +26,6 @@
 #define CONFIG_SYS_MALLOC_LEN                  (128 * 1024 * 1024)
 
 /* Environment */
-#define CONFIG_SYS_MMC_ENV_DEV                 0
-#define CONFIG_SYS_MMC_ENV_PART                        0
 
 /* RTC */
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index d18342ade5a3c1425e57e27dc059371b493506e1..bd61f20a7a624940ff15e634dfcff107170269f0 100644 (file)
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -86,9 +86,4 @@
 
 /* environment organization */
 
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         1
-#define CONFIG_SYS_MMC_ENV_PART                2
-#endif
-
 #endif                         /* __EL6Q_COMMON_CONFIG_H */

diff --git a/include/configs/elgin_rv1108.h b/include/configs/elgin_rv1108.h
index aa6c4b09e27edccff5e2ed6f120b4b672278b71c..df04892e5fa25ee865e9ee0084569de04a042e5a 100644 (file)
--- a/include/configs/elgin_rv1108.h
+++ b/include/configs/elgin_rv1108.h
@@ -8,6 +8,4 @@
 
 #include <configs/rv1108_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 565cc8818e7bfdbbf2f9ddbb6b40288d649b3d29..8148453d931d2e9a67093bcb50b7fbf69e4508cc 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -65,7 +65,6 @@
 /* RiOTboard */
 #define CONFIG_FDTFILE "imx6dl-riotboard.dtb"
 #define CONFIG_SYS_FSL_USDHC_NUM       3
-#define CONFIG_SYS_MMC_ENV_DEV         2       /* SDHC4 */
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 /* MarSBoard */
 #define CONFIG_FDTFILE "imx6q-marsboard.dtb"

diff --git a/include/configs/evb_px30.h b/include/configs/evb_px30.h
index e761c7c519602fd89ca3c82305d74c786e966c80..27201fcfd7cb1cf8e4d5fb6c9fb9a9980fe67229 100644 (file)
--- a/include/configs/evb_px30.h
+++ b/include/configs/evb_px30.h
@@ -8,8 +8,6 @@
 
 #include <configs/px30_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #define ROCKCHIP_DEVICE_SETTINGS \
                "stdout=serial,vidconsole\0" \
                "stderr=serial,vidconsole\0"

diff --git a/include/configs/evb_px5.h b/include/configs/evb_px5.h
index ed801dd84556d2195ff9287cb08117cae873a4b6..13ddc18b347dc1e1c491af58f5f6b6803696dc71 100644 (file)
--- a/include/configs/evb_px5.h
+++ b/include/configs/evb_px5.h
@@ -8,6 +8,4 @@
 
 #include <configs/rk3368_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/evb_rk3128.h b/include/configs/evb_rk3128.h
index bf6c7eaf4c1998551c1f438d140375fc3ab94a4f..768004a43c87d0408195e4894ab45a76f0164cb8 100644 (file)
--- a/include/configs/evb_rk3128.h
+++ b/include/configs/evb_rk3128.h
@@ -8,6 +8,4 @@
 
 #include <configs/rk3128_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/evb_rk3229.h b/include/configs/evb_rk3229.h
index 6a91a82ceb46224f026c7842fd1c3487ae5c628d..77d99d0a42ba6fe5e14c5a6b0113c6838e8badaf 100644 (file)
--- a/include/configs/evb_rk3229.h
+++ b/include/configs/evb_rk3229.h
@@ -8,6 +8,4 @@
 
 #include <configs/rk322x_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h
index e19fa90212839f96809f34f47c0edd7ebcf0db34..053c9032e2da0f7cf4c87b4586ed75e24c09e205 100644 (file)
--- a/include/configs/evb_rk3288.h
+++ b/include/configs/evb_rk3288.h
@@ -13,6 +13,4 @@
 
 #include <configs/rk3288_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/evb_rk3308.h b/include/configs/evb_rk3308.h
index 0d2cb21ac67928efc6af083c41d32c926b726f1e..e8893eb7de85c6ee0171d57a8eef91922243fc5e 100644 (file)
--- a/include/configs/evb_rk3308.h
+++ b/include/configs/evb_rk3308.h
@@ -9,7 +9,6 @@
 #include <configs/rk3308_common.h>
 
 #define CONFIG_SUPPORT_EMMC_RPMB
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
 #define ROCKCHIP_DEVICE_SETTINGS \
                        "stdout=serial,vidconsole\0" \

diff --git a/include/configs/evb_rk3328.h b/include/configs/evb_rk3328.h
index 26687e63861610da3e2dd65adaca2aa2cdb3881d..cac613d021a8ebb8de961eaf957065a7e3a4fc61 100644 (file)
--- a/include/configs/evb_rk3328.h
+++ b/include/configs/evb_rk3328.h
@@ -8,8 +8,6 @@
 
 #include <configs/rk3328_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 1
-
 #define SDRAM_BANK_SIZE                        (2UL << 30)
 
 #endif

diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
index 2d3db22877daf8955a8886a2bd2c44f645959ff3..b7e850370b3193ef35a2026884506bad5ad00d5c 100644 (file)
--- a/include/configs/evb_rk3399.h
+++ b/include/configs/evb_rk3399.h
@@ -13,10 +13,6 @@
 
 #include <configs/rk3399_common.h>
 
-#if defined(CONFIG_ENV_IS_IN_MMC)
-# define CONFIG_SYS_MMC_ENV_DEV                0
-#endif
-
 #define SDRAM_BANK_SIZE                        (2UL << 30)
 
 #endif

diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index dff6a26f3b95f16a0c145972d652319a0c4b89f1..9297fbdc08176445baf2c00797edd7f3de0c7438 100644 (file)
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -72,8 +72,6 @@
 
 #define CONFIG_SYS_MONITOR_BASE        0x00000000
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 #define CONFIG_SECURE_BL1_ONLY
 
 /* Secure FW size configuration */

diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h
index 9e4a66902b50f9a28ccabce9e79b211511adbb7c..df96c32952f3b6523b5724350bcf425a2a07fbcd 100644 (file)
--- a/include/configs/firefly-rk3288.h
+++ b/include/configs/firefly-rk3288.h
@@ -13,6 +13,4 @@
 
 #include <configs/rk3288_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/firefly_rk3308.h b/include/configs/firefly_rk3308.h
index 7b8b62fbcb1595d4628b38e7b0339fbc80bc4e03..3af24930431e82277af2e3dc4de1d6cd45a43927 100644 (file)
--- a/include/configs/firefly_rk3308.h
+++ b/include/configs/firefly_rk3308.h
@@ -9,7 +9,6 @@
 #include <configs/rk3308_common.h>
 
 #define CONFIG_SUPPORT_EMMC_RPMB
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
 #define ROCKCHIP_DEVICE_SETTINGS \
                        "stdout=serial,vidconsole\0" \

diff --git a/include/configs/gru.h b/include/configs/gru.h
index a0d27b6d51a586ac87495fe71b5de78851989955..be2dc79968c042bf085da782e39cb8c51417dfc3 100644 (file)
--- a/include/configs/gru.h
+++ b/include/configs/gru.h
@@ -13,6 +13,4 @@
 
 #include <configs/rk3399_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 38e8e8e13114e3526e807425f62d26f7eb10203e..a666d420e4b61d5762191f58d63e0ba27d6c3672 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -146,10 +146,6 @@
  */
 
 /* Persistent Environment Config */
-#if defined(CONFIG_ENV_IS_IN_MMC)
-  #define CONFIG_SYS_MMC_ENV_DEV         0
-  #define CONFIG_SYS_MMC_ENV_PART        1
-#endif
 
 /* Environment */
 #define CONFIG_IPADDR             192.168.1.1

diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index 2f4b67025ceb91aac70b705defab083209d3aece..396870a67f2bc965ed82e9ffb81499a4d53b1a4b 100644 (file)
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -30,7 +30,6 @@
 #define CONFIG_ENV_MIN_ENTRIES         128
 
 /* Environment in MMC */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 /*
  * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC
  * boot image starts @ LBA-0.

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 70cd682ca957f44ffeef69bd8b8325c24602524d..a323a0bf69b0a3ec6ac3969ffdd6c25cec6d3e9f 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -80,8 +80,6 @@
                                BOOTENV
 
 /* Preserve environment on eMMC */
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* Use eMMC */
-#define CONFIG_SYS_MMC_ENV_PART                2       /* Use Boot1 partition */
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */

diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index c169347a75917605bb478d05aae3ee041ee1c63b..9bd81e28d674f2976f4c9cb8617df6d6c8ec324a 100644 (file)
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -136,9 +136,6 @@
 #endif
 
 /* MMC */
-#ifdef CONFIG_FSL_USDHC
-# define CONFIG_SYS_MMC_ENV_DEV                0
-#endif
 
 /* NAND */
 #ifdef CONFIG_NAND_MXS

diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index fd35bf598fd04d64bdce07441b2576010374de8e..4027f329d30bbafebe87014f19c09f66dc2c853e 100644 (file)
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -43,7 +43,6 @@
 #define CONFIG_MXC_UART_BASE           UART3_BASE
 
 /* MMC */
-#define CONFIG_SYS_MMC_ENV_DEV         2
 
 /* Ethernet */
 #define CONFIG_FEC_MXC_PHYADDR         1

diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 9aef3d743eb304eee5f362d2239cd0d15f3d29ff..3c9541187f8348a79da2641689ded8faa665d1f5 100644 (file)
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -106,8 +106,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_SYS_MMC_ENV_DEV 1   /* USDHC2 */
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          SZ_32M
 

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index b37788ed1efa7a2e3dd05162c8b81c6a2e0341cc..57971ca71428399d3eec5b84158b8e14b748686f 100644 (file)
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -109,7 +109,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_SYS_MMC_ENV_DEV         1   /* USDHC2 */
 #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"  /* USDHC2 */
 
 /* Size of malloc() pool */

diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index 21eb134e7b16d926feb8379f924d9f9fae4355d5..d819266f99e70e58d6f0fb2d71e5e5018cfc129e 100644 (file)
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -113,7 +113,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_SYS_MMC_ENV_DEV         0   /* USDHC2 */
 #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"  /* USDHC2 */
 
 /* Size of malloc() pool */

diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 009bcdcc835a29fa325a2a1df766657c262eeeaf..ded0717ddb7be6e5cfe335788822ba2ba011a5a7 100644 (file)
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -121,7 +121,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_SYS_MMC_ENV_DEV         1   /* USDHC2 */
 #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"  /* USDHC2 */
 
 /* Size of malloc() pool */

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 1a50559b486dc6124b6a6468d9a01be8a785e386..d98f9263ca9afb01a6064982aaee13fcd2c0489f 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -163,7 +163,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_SYS_MMC_ENV_DEV         1   /* USDHC2 */
 #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"  /* USDHC2 */
 
 /* Size of malloc() pool */

diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index ee024bca5c5ff93c85a64df56bb726621aefdec6..e8b65a4ba5c76078f67d9d904ed924d5627838c4 100644 (file)
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -153,7 +153,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_SYS_MMC_ENV_DEV         1   /* USDHC2 */
 #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"  /* USDHC2 */
 
 /* Size of malloc() pool */

diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 5fcc9be0a126373f5cf97a03a8cbc52fd5ccb7e0..ff281d3800da28273cf8632b9e92784491e32a76 100644 (file)
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -152,12 +152,10 @@
 #define CONFIG_SYS_INIT_SP_ADDR         0x80200000
 
 /* Default environment is in SD */
-#define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */
-#define CONFIG_SYS_MMC_ENV_DEV         1   /* USDHC2 */
 #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 0976b73ebb2325729f7d1b3108dcdb232275ba40..e5989ebafbc6452368cdf6f290f2efd96b807ba3 100644 (file)
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -135,8 +135,6 @@
 #define CONFIG_ENV_SPI_CS      CONFIG_SF_DEFAULT_CS
 #define CONFIG_ENV_SPI_MODE    CONFIG_SF_DEFAULT_MODE
 #define CONFIG_ENV_SPI_MAX_HZ  CONFIG_SF_DEFAULT_SPEED
-#else
-#define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
 #endif
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
@@ -145,7 +143,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_SYS_MMC_ENV_DEV         2   /* USDHC3 */
 #define CONFIG_MMCROOT                 "/dev/mmcblk2p2"  /* USDHC3 */
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 67df1998cbdc5fdf405f109186f9ec556d348f73..51a8eb67605d48001a9b759a92528dc7d8397b58 100644 (file)
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -151,12 +151,10 @@
 #define CONFIG_SYS_INIT_SP_ADDR         0x80200000
 
 /* Default environment is in SD */
-#define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */
-#define CONFIG_SYS_MMC_ENV_DEV         1   /* USDHC2 */
 #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"  /* USDHC2 */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 

diff --git a/include/configs/imxrt1020-evk.h b/include/configs/imxrt1020-evk.h
index 8e54565f1af8430bd6a969c2db781aae209cf96b..4fb44774b0c1685ddda9a6371d5fa51f0e41a5e7 100644 (file)
--- a/include/configs/imxrt1020-evk.h
+++ b/include/configs/imxrt1020-evk.h
@@ -28,8 +28,6 @@
 #define DMAMEM_BASE                    (PHYS_SDRAM + PHYS_SDRAM_SIZE - \
                                         DMAMEM_SZ_ALL)
 
-#define CONFIG_SYS_MMC_ENV_DEV         0   /* USDHC1 */
-
 /*
  * Configuration of the external SDRAM memory
  */

diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h
index 3a6b972d9ac12b95a2b3bbe8c51538314089e9b2..4fbcda9581c2c9890aa593f08eac16783db34118 100644 (file)
--- a/include/configs/imxrt1050-evk.h
+++ b/include/configs/imxrt1050-evk.h
@@ -28,8 +28,6 @@
 #define DMAMEM_BASE                    (PHYS_SDRAM + PHYS_SDRAM_SIZE - \
                                         DMAMEM_SZ_ALL)
 
-#define CONFIG_SYS_MMC_ENV_DEV         0   /* USDHC1 */
-
 #ifdef CONFIG_DM_VIDEO
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index 7b917c224776a5e397998c48fee3e5a5597fa56b..e1681af3f6946303b64012b3e0a3cef569ab0a73 100644 (file)
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -150,9 +150,5 @@
 #include <configs/ti_armv7_common.h>
 
 /* MMC ENV related defines */
-#ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART        1
-#endif
 
 #endif /* __CONFIG_J721E_EVM_H */

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 98248876e8eb7f37ec0af603d8be0e64c06fccd3..a3c385b6e22ae1372f7c661c3f6534a1b1a4f875 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -19,8 +19,6 @@
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 /* SPI */
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index cb24a896a14f5d0f98e06955d28437cde2c2e29f..c94882846efa4c581e01c6c1b07e4dd460a24c82 100644 (file)
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -94,6 +94,5 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
 #endif                         /* __CONFIG_H_ */

diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 6c9a326b2594df81e14d820e7a5fc6d63c5ed339..749e880f36ff8aafac9ab43362c2e11b5a5d5a62 100644 (file)
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -27,8 +27,6 @@
 /* FEC ethernet */
 #define CONFIG_ARP_TIMEOUT             200UL
 
-#define CONFIG_SYS_MMC_ENV_DEV         1 /* 0 = SDHC2, 1 = SDHC4 (eMMC) */
-
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h
index 1ef7633633fe399e7a94fcb21fc6a3b337ead3b4..75fc03f147234805ff676d8c9eb26d2fa98695fd 100644 (file)
--- a/include/configs/kylin_rk3036.h
+++ b/include/configs/kylin_rk3036.h
@@ -12,8 +12,6 @@
 #ifndef CONFIG_SPL_BUILD
 
 /* Store env in emmc */
-#define CONFIG_SYS_MMC_ENV_DEV         0 /* emmc */
-#define CONFIG_SYS_MMC_ENV_PART                0 /* user area */
 
 #endif
 

diff --git a/include/configs/lion_rk3368.h b/include/configs/lion_rk3368.h
index cae0f1ed29da76d708bd7f3036b03926f319a94d..c5b78f9c896ff05096ed9aa6b1d4de0547af53eb 100644 (file)
--- a/include/configs/lion_rk3368.h
+++ b/include/configs/lion_rk3368.h
@@ -8,7 +8,6 @@
 
 #include <configs/rk3368_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #define KERNEL_LOAD_ADDR               0x280000
 #define DTB_LOAD_ADDR                  0x5600000
 #define INITRD_LOAD_ADDR               0x5bf0000

diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 2dcd4db28cb079f52fcf38ae3388d9385a098235..db5e6fc133b38717822200d547b09466656c3dce 100644 (file)
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -121,8 +121,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                0
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"
 
 /* USB Configs */

diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 70bca320fbd51d6ef016faadf48283bda7731b93..cf4d60ad60327c6fef8de2e27850eaeb33e39be1 100644 (file)
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -214,14 +214,6 @@
 
 #define CONFIG_SYS_QE_FW_ADDR  0x67f40000
 
-/*
- * Environment
- */
-
-#if defined(CONFIG_SD_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
-
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_OF_STDOUT_VIA_ALIAS
 

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 84b7f0e13dadffc1bfa6f065d687fa82d2e1d17a..eb6f1c1e5be6cb2a9c6fd5118a11ef804b51e6d5 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -473,10 +473,6 @@ unsigned long get_board_ddr_clk(void);
  * Environment
  */
 
-#if defined(CONFIG_SD_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 #include <asm/fsl_secure_boot.h>
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20) /* Increase max gunzip size */
 

diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index e095e9ad100b06b4d921c428c5d829d67a876c2f..996c970ec840bcedcc2c82011dbd21f3d1918742 100644 (file)
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -237,10 +237,6 @@
 
 /* Environment */
 
-#if defined(CONFIG_SD_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 #define CONFIG_SYS_BOOTM_LEN           0x8000000 /* 128 MB */
 
 #endif

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 914d059a563b3e870279f4f0139bac985e9712ca..3e85bb3850b757f6f20b34138373ad28b3e10072 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -446,10 +446,6 @@
  * Environment
  */
 
-#if defined(CONFIG_SD_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 #include <asm/fsl_secure_boot.h>
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20) /* Increase max gunzip size */
 

diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h
index c2071e70b446dc9af7fdcd12690601ba4ccaeac9..8345cd7acfcec80b10953b760593028e00a530d8 100644 (file)
--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -91,7 +91,6 @@
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #endif
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #define OCRAM_NONSECURE_SIZE           0x00010000
 #define CONFIG_SYS_FSL_QSPI_BASE       0x20000000
 

diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 6ff7f0183449ca5da8bd60d8694cc0d7f27444cf..1636f0bb8ff0f7f8d5fb4e1dad55609a12764b61 100644 (file)
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -395,15 +395,6 @@ unsigned long get_board_ddr_clk(void);
  * Environment
  */
 
-#ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#else
-#ifdef CONFIG_NAND_BOOT
-#elif defined(CONFIG_SD_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-#endif
-
 #define CONFIG_CMDLINE_TAG
 
 #include <asm/fsl_secure_boot.h>

diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index a3f47c37ac115fa0ba9930523221fbdb2b9f8c8e..84b83e6259563aef0dd58d6cf18f3e6941ee1b51 100644 (file)
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -241,15 +241,6 @@
  * Environment
  */
 
-#ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#else
-#if defined(CONFIG_NAND_BOOT)
-#elif defined(CONFIG_SD_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-#endif
-
 /* FMan */
 #ifndef SPL_NO_FMAN
 #define AQR105_IRQ_MASK                        0x40000000

diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h
index 44e7fc3a72c340ea2af1956b5d33493577645fbc..fade815f26088ba1b13be78466eb52fefffca48c 100644 (file)
--- a/include/configs/ls1046afrwy.h
+++ b/include/configs/ls1046afrwy.h
@@ -96,7 +96,6 @@
 /*
  * Environment
  */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_SYS_FSL_QSPI_BASE       0x40000000
 
 #ifndef CONFIG_SPL_BUILD
@@ -109,7 +108,6 @@
 
 /* FMan */
 #ifdef CONFIG_SYS_DPAA_FMAN
-#define CONFIG_FMAN_ENET
 
 #define QSGMII_PORT1_PHY_ADDR          0x1c
 #define QSGMII_PORT2_PHY_ADDR          0x1d

diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 969d2c540bafccdbc6ae2ea0924b2918e08126b0..9102c812b5bc887bf7a40cefff4d38e21e573005 100644 (file)
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -409,7 +409,6 @@ unsigned long get_board_ddr_clk(void);
 /*
  * Environment
  */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 #define CONFIG_CMDLINE_TAG
 

diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index fe8108dae037c935c14d3790a0d6e4cb1637ee70..dddaa25417180bfe68d5c02ac4833ccd1615edfa 100644 (file)
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -153,7 +153,6 @@
 /*
  * Environment
  */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_SYS_FSL_QSPI_BASE        0x40000000
 
 #define AQR105_IRQ_MASK                        0x80000000

diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 1e9e6a8f96ea43d0218230fb00541d52cad5bf96..b92ec14c691732b773bf973afc7f37ee460d66c9 100644 (file)
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -15,14 +15,7 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 #ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 #define CONFIG_MISC_INIT_R
-#else
-#if defined(CONFIG_QSPI_BOOT)
-#elif defined(CONFIG_SD_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
 #endif
 
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 28a458772d7bfa73bfba861f109f2784403597c8..f59a9f5574eecaf8b52ccdb169ef12166420bae9 100644 (file)
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -8,8 +8,6 @@
 
 #include "ls1088a_common.h"
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 #if defined(CONFIG_TFABOOT) || \
        defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
 #ifndef CONFIG_SPL_BUILD

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 751325ad6998f9a2df0e69f5197cc8d2d669a111..9e174afb92ed32d4aa94ace496c6d1a77fa26bd5 100644 (file)
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -56,10 +56,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_SCSI_MAX_DEVICE             (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
                                                CONFIG_SYS_SCSI_MAX_LUN)
 
-#ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 #define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
 #define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128*1024*1024)
 #define CONFIG_SYS_NOR_AMASK_EARLY     IFC_AMASK(64*1024*1024)
@@ -227,8 +223,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SPL_PAD_TO              0x20000
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    (256 * 1024)
 #define CONFIG_SYS_NAND_U_BOOT_SIZE    (640 * 1024)
-#elif defined(CONFIG_SD_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #endif
 #else
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 006a4c97fb1b4de4321accb901c719e2b5a38033..b7a7dc0a64a7386d0bfd0eb59b8e8cce8b04d56b 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -70,9 +70,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_SYS_SCSI_MAX_LUN                        1
 #define CONFIG_SYS_SCSI_MAX_DEVICE             (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
                                                CONFIG_SYS_SCSI_MAX_LUN)
-#ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
 
 #if !defined(CONFIG_FSL_QSPI) || defined(CONFIG_TFABOOT)
 

diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index d3b5c58742d357e772636e78ff3b29d89f1c9781..0017ac5773476485ed4b8f484472f43e85bb3564 100644 (file)
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -170,8 +170,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE           128
 
-#define CONFIG_SYS_MMC_ENV_DEV          0
-
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \

diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h
index 33172a6b97a941dc4df39a6f77fd3b3bda846849..f43a8415e1aa854c603574e5e9930378722f75b9 100644 (file)
--- a/include/configs/meerkat96.h
+++ b/include/configs/meerkat96.h
@@ -33,8 +33,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment configs */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                0
 
 /* USB configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
index a4d9779667f43df93ca90cc84a4881161a4d6c6e..8fff915b50a406e9cdadfd25c3e43e08454f2034 100644 (file)
--- a/include/configs/meson64_android.h
+++ b/include/configs/meson64_android.h
@@ -9,9 +9,6 @@
 #ifndef __MESON64_ANDROID_CONFIG_H
 #define __MESON64_ANDROID_CONFIG_H
 
-#define CONFIG_SYS_MMC_ENV_DEV 2
-#define CONFIG_SYS_MMC_ENV_PART        1
-
 
 #define BOOTENV_DEV_FASTBOOT(devtypeu, devtypel, instance) \
        "bootcmd_fastboot=" \

diff --git a/include/configs/miqi_rk3288.h b/include/configs/miqi_rk3288.h
index e19fa90212839f96809f34f47c0edd7ebcf0db34..053c9032e2da0f7cf4c87b4586ed75e24c09e205 100644 (file)
--- a/include/configs/miqi_rk3288.h
+++ b/include/configs/miqi_rk3288.h
@@ -13,6 +13,4 @@
 
 #include <configs/rk3288_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h
index 0d3e708683275edc22fb819debd07ad4fcea27de..f015d10d9bdb094cc567cb06185ccebc060726d1 100644 (file)
--- a/include/configs/mt7622.h
+++ b/include/configs/mt7622.h
@@ -20,8 +20,6 @@
 #define CONFIG_SYS_MALLOC_LEN          SZ_4M
 #define CONFIG_SYS_NONCACHED_MEMORY    SZ_1M
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 /* Uboot definition */
 #define CONFIG_SYS_UBOOT_BASE                   CONFIG_SYS_TEXT_BASE
 

diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index b7e9aff21c3acea42982e10bdaf54996dd101b44..9895279749db978dfb20dae0f75824ed9900e7c0 100644 (file)
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -55,8 +55,6 @@
 #define CONFIG_IPADDR                  192.168.1.1
 #define CONFIG_SERVERIP                        192.168.1.2
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 #ifdef CONFIG_DISTRO_DEFAULTS
 
 #define BOOT_TARGET_DEVICES(func)      \

diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h
index 4feff271396a01f34d2ea089fc4f90d267e57962..7cd388fa10115d0d9e2405a5d6cedb1d618abae6 100644 (file)
--- a/include/configs/mt8512.h
+++ b/include/configs/mt8512.h
@@ -29,16 +29,10 @@
                                                SZ_2M - \
                                                GENERATED_GBL_DATA_SIZE)
 
-/* ENV Setting */
-#if defined(CONFIG_MMC_MTK)
-#define CONFIG_SYS_MMC_ENV_DEV                 0
-
-/* MMC offset in block unit,and block size is 0x200 */
 #define ENV_BOOT_READ_IMAGE \
        "boot_rd_img=mmc dev 0" \
        ";mmc read ${loadaddr} 0x27000 0x8000" \
        ";iminfo ${loadaddr}\0"
-#endif
 
 /* Console configuration */
 #define ENV_DEVICE_SETTINGS \

diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h
index 0d48211ce84e2a26d1b55213a5b73f20565fa309..4e32442bb5a5ba64efe84db9f3ceaedcbeec97c6 100644 (file)
--- a/include/configs/mt8518.h
+++ b/include/configs/mt8518.h
@@ -32,16 +32,10 @@
                                                SZ_2M - \
                                                GENERATED_GBL_DATA_SIZE)
 
-/* ENV Setting */
-#if defined(CONFIG_MMC_MTK)
-#define CONFIG_SYS_MMC_ENV_DEV                 0
-
-/* MMC offset in block unit,and block size is 0x200 */
 #define ENV_BOOT_READ_IMAGE \
        "boot_rd_img=mmc dev 0" \
        ";mmc read ${loadaddr} 0x27400 0x4000" \
        ";iminfo ${loadaddr}\0"
-#endif
 
 /* Console configuration */
 #define ENV_DEVICE_SETTINGS \

diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 21a2ad4acbbfea0ace17cbc1cd320d1b5608d0b4..38f50468c543c64a475842cd2dafe8aac3941c18 100644 (file)
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -46,7 +46,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_TEXT_BASE + 0xFF0000)
 
 /* When runtime detection fails this is the default */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_MAX_CHIPS      1

diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index ad95b8876ec1a3fb8d3f0f8533b216d8da507ff2..2ee41aeff1b7039ec394de2126232d8a3edddbbb 100644 (file)
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -15,13 +15,6 @@
 #define PHYS_SDRAM_1_SIZE              0x08000000      /* Max 128 MB RAM */
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 
-/* Environment */
-
-/* Environment is in MMC */
-#if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
-
 /* Status LED */
 
 /* USB */

diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index 560ec96c0170b8893e4ca18a1651e6fc84f2f299..cc634d004221b16908569037cc16e32259a2d43c 100644 (file)
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -21,9 +21,6 @@
 /* Environment */
 
 /* Environment is in MMC */
-#if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
 
 /* USB */
 #ifdef CONFIG_CMD_USB

diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 12bd75fe025a1cbcceb36b7f0e0c6b18493b62c4..27d0c25ac7338db5cc7a213a86a3c2ef52549b59 100644 (file)
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -46,7 +46,6 @@
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 
 /* No NOR flash present */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 /* U-Boot general configuration */
 #define CONFIG_SYS_CBSIZE      1024    /* Console I/O Buffer Size  */

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 8ed139037e20548f2bf99c7e8e1e4575aa913bbf..1a9e6a457afa33b7d4b044fe4759fa103b97a355 100644 (file)
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -21,9 +21,6 @@
 /* Environment */
 
 /* Environment is in MMC */
-#if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
 
 /* Environment is in NAND */
 #if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND)

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index dda21198d61a699f65c57d985f87823cf2e029c8..bf4661b453907d843ca537ae306cac9c561291a8 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -188,6 +188,5 @@
  * write the direct value here
  */
 #define CONFIG_BOARD_SIZE_LIMIT                785408
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
 #endif

diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index c20ca19557ea6b38e997684f8e87126a08cad225..b613e9816dace483468b0afa4e7c3c96492bef2c 100644 (file)
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -161,7 +161,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
 #define MX53ARD_CS1GCR1                (CSEN | DSZ(2))
 #define MX53ARD_CS1RCR1                (RCSN(2) | OEN (1) | RWSC(22))

diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 13135f0d8bce235bac55c01c654b155d369eedf9..93158fb464696623fbdf110d39a329c0ffd8a60b 100644 (file)
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -91,7 +91,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
 /* Framebuffer and LCD */
 #define CONFIG_IMX_VIDEO_SKIP

diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 1bb189f6db72b3efaee501f90b5ac152dd9a8bb3..91a56dda28923584fec5920f3d9b6d4685547672 100644 (file)
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -112,6 +112,5 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
 #endif                         /* __CONFIG_H */

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 24c27505aee748dc25f1b93c32603405f93d0f63..97adcd5265b494b6d5df2474a148dc671d18521a 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -167,7 +167,6 @@
  * write the direct value here
  */
 #define CONFIG_BOARD_SIZE_LIMIT                785408
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
 #ifdef CONFIG_CMD_SATA
        #define CONFIG_SYS_SATA_MAX_DEVICE      1

diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index a6905ec4bdf1efe4ae0a50d49cd2b805f20ed90d..d3133293c69d55865d0f465e367092fa4e989cab 100644 (file)
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -137,7 +137,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
 #define CONFIG_FSL_IIM
 

diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index c19f5b6383299daebe23be440247acfe1056748f..79c86725a270d0fb4479b4c90e3b82df01ce368f 100644 (file)
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -107,6 +107,5 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
 #endif                         /* __CONFIG_H */

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 57efe1bab6efb46bcffa5c0ce234d0f60a8535e9..b03129bfc6ad311b74f637c28caeef72d7555922 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -45,7 +45,6 @@
 
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 #define CONSOLE_DEV    "ttymxc0"
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* SDHC2 */
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index cdc108a735650c414b926e3fbc689867113c302b..83c09ead27104bc651a7b1a2e0f96fec926576e9 100644 (file)
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -115,7 +115,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV         1
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB

diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index e444930dc87baa2a3d05aabcfd8aa6334a2b1b55..11896777182ddaf722347f43c062932a2070ed6f 100644 (file)
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -49,9 +49,6 @@
 #endif
 
 #define CONFIG_SYS_FSL_USDHC_NUM       2
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
 
 /* I2C Configs */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index ec1537541aeadf5a95b4a6cc8511fb7f3944ce25..e8f52cee202eb48c036ca3b2c0b360fe5bcd5d98 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -29,9 +29,6 @@
 #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1000  /* 2MB */
 
 #define CONFIG_SYS_FSL_USDHC_NUM       3
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         1       /* SDHC3 */
-#endif
 
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI_SCAN_SHOW

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 3ee9cdd52d8493eca2d10711bb4a9f052f009e3f..44dadd681c0c8482f4e79f31e97681390eb4e7ee 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -131,9 +131,6 @@
 #endif
 
 #define CONFIG_SYS_FSL_USDHC_NUM       3
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         1       /* SDHC2*/
-#endif
 
 #define CONFIG_IMX_THERMAL
 

diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index f13429d6ea51628a63822967e8cb529fe5063b97..9533d3074286c7dd75f8fc327c5cc6a3d146cdb7 100644 (file)
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -117,13 +117,11 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment organization */
-#define CONFIG_SYS_MMC_ENV_PART                0   /* user partition */
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"  /* USDHC1 */
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
 #define CONFIG_SYS_FSL_USDHC_NUM       3
-#define CONFIG_SYS_MMC_ENV_DEV         0   /* USDHC1 */
 
 #define CONFIG_IMX_THERMAL
 

diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 070216338bcf2cdc08c64527114d2b00cf8c565b..9ad29341c14bb64b52665d587e487a3387833453 100644 (file)
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -141,8 +141,5 @@
 #define CONFIG_IMX_THERMAL
 
 #define CONFIG_SYS_FSL_USDHC_NUM       2
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0  /*USDHC3*/
-#endif
 
 #endif                         /* __CONFIG_H */

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index b30f9e51fbd5fd9d7599800a8306e93d4c10bfd0..4a521ec80d91ded34d90bdd71006b002a9fad774 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -186,8 +186,5 @@
 #endif
 
 #define CONFIG_SYS_FSL_USDHC_NUM       3
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         2  /*USDHC4*/
-#endif
 
 #endif                         /* __CONFIG_H */

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index f83ad914dbac77aa3674b5d918ce5a01ea956127..6f1e0d878da40583ddc2df1da1d78af17ba8e253 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -151,8 +151,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV         1   /* USDHC2 */
-#define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
 #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"  /* USDHC2 */
 
 /* USB Configs */

diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index e37559d9030b44fcd3a080e83445fbff3c1c724a..ca2f2bd975d24a1b58c233c678e4b3564cb559b9 100644 (file)
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -148,8 +148,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV         1       /* USDHC2 */
-#define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
 #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"  /* USDHC2 */
 
 #define CONFIG_IMX_THERMAL

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 7e1e8b02cb7d59c6bdf44098c15b8847d32cae25..98fab6b83de590828642f788ff626805f6538b6d 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -131,9 +131,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #endif
 
-#define CONFIG_SYS_MMC_ENV_DEV         0   /* USDHC1 */
-#define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
-
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 

diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
index 29d17bab7404f670eaa6137f03f63454ca67c70b..28672c4f94c493d5bf2b96ce848205382833df0a 100644 (file)
--- a/include/configs/mx7ulp_com.h
+++ b/include/configs/mx7ulp_com.h
@@ -24,7 +24,6 @@
  * write the direct value here
  */
 #define CONFIG_BOARD_SIZE_LIMIT                785408
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 

diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 65dc8c8d58a2e350d7199ef795c9e8e7e492198e..0c3103082cc8e830337f0893bcba1c3098558239 100644 (file)
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -14,8 +14,6 @@
 #define CONFIG_BOARD_POSTCLK_INIT
 #define CONFIG_SYS_BOOTM_LEN           0x1000000
 
-#define CONFIG_SYS_MMC_ENV_DEV          0      /* USDHC1 */
-#define CONFIG_SYS_MMC_ENV_PART         0      /* user area */
 #define CONFIG_MMCROOT                  "/dev/mmcblk0p2"  /* USDHC1 */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART    1
 

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 0f7d8e7cb512804aeaed68457a5d93c589f571fb..0598224f667886abd98f02e2aa70d2ba2f5985d0 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -145,10 +145,6 @@
 
 /* Environment organization */
 
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 /*
  * PCI express
  */

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 14581e0be021d9cb0d64fa714a5c2b713f4df1ab..62faef0703e4d9c7e5c543b93d934d8ed50b1639 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -24,9 +24,6 @@
  * as recommended by GNU/fdisk. See below for details:
  * http://homepage.ntlworld.com./jonathan.deboynepollard/FGA/disc-partition-alignment.html
  */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
 
 /* Booting Linux */
 #define CONFIG_BOOTFILE                        "fitImage"

diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 97dd168b0180de8a2da1f7787bbacf27c154ad16..394fb15f3136693781c97da3f6bf4557e9bcc730 100644 (file)
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -19,8 +19,6 @@
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 /* Align LCD to 1MB boundary */
 #define CONFIG_LCD_ALIGNMENT   MMU_SECTION_SIZE

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 5cbee0109246de641a146b9cb1654570d7b2235f..befb9f9aa1514a940a6deb191c7b684c8d0c15e0 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -45,8 +45,6 @@
 
 #define CONFIG_SYS_MONITOR_BASE        0x00000000
 
-#define CONFIG_SYS_MMC_ENV_DEV         CONFIG_MMC_DEFAULT_DEV
-
 /* Partitions name */
 #define PARTS_BOOT             "boot"
 #define PARTS_ROOT             "platform"

diff --git a/include/configs/odroid_go2.h b/include/configs/odroid_go2.h
index 00eac2d2a8e2fb7ac769cc3104cb9779418ce20f..53781ba7ae8a98f6c52042b02426c63216807fc9 100644 (file)
--- a/include/configs/odroid_go2.h
+++ b/include/configs/odroid_go2.h
@@ -8,8 +8,6 @@
 
 #include <configs/px30_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #define ROCKCHIP_DEVICE_SETTINGS \
                "stdout=serial,vidconsole\0" \
                "stderr=serial,vidconsole\0"

diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
index 884f45df22566d49a5b2c73ce94d6db92c695f32..462aa4a5b902bc76c607182297145060279cebf0 100644 (file)
--- a/include/configs/omap4_sdp4430.h
+++ b/include/configs/omap4_sdp4430.h
@@ -20,6 +20,5 @@
 #include <configs/ti_omap4_common.h>
 
 /* ENV related config options */
-#define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
 
 #endif /* __CONFIG_SDP4430_H */

diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 53589c03ead87345490ae9fb20324e02fec8fcef..a1f1dafad79ba76c6ca3b4c1e2ddc8fe44d41675 100644 (file)
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -31,7 +31,6 @@
 #define CONFIG_SYS_NS16550_COM3                UART3_BASE
 
 /* MMC ENV related defines */
-#define CONFIG_SYS_MMC_ENV_DEV         1       /* SLOT2: eMMC(1) */
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT

diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 3ef5ebbac793117cb799adeee340d2e078836265..69f5e9f96ab5e4f7217c25947580299a1898b7cd 100644 (file)
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -59,8 +59,6 @@
 #endif
 
 /* Environment is stored in the eMMC boot partition */
-#define CONFIG_SYS_MMC_ENV_DEV          0
-#define CONFIG_SYS_MMC_ENV_PART         1
 
 #define CONFIG_ENV_VERSION     100
 #define CONFIG_BOARD_NAME      opos6ul

diff --git a/include/configs/origen.h b/include/configs/origen.h
index 3bedc4784b7cc23771e7623f90666f9593c5d25f..24b0338deb3f2ca7ce7229f51a3caa692e3d66f7 100644 (file)
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -77,7 +77,6 @@
 /* MIU (Memory Interleaving Unit) */
 #define CONFIG_MIU_2BIT_21_7_INTERLEAVED
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #define RESERVE_BLOCK_SIZE             (512)
 #define BL1_SIZE                       (16 << 10) /*16 K reserved for BL1*/
 

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index e686edcaef60bff953ad2b46353bff10c9fca648..1b74177b2f2002339a62b7e466e212af9a1778c9 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -695,7 +695,6 @@
  */
 #if defined(CONFIG_SDCARD)
 #define CONFIG_FSL_FIXED_MMC_LOCATION
-#define CONFIG_SYS_MMC_ENV_DEV 0
 #elif defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_ENV_RANGE       (3 * CONFIG_ENV_SIZE)
 #ifdef CONFIG_TPL_BUILD

diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index 8e3e1a77f5ae6ff7805bcf60d44dfa9a7ffdfb48..5cebafc7c7c657359c4c7c23a6cf162f14da25e9 100644 (file)
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -18,8 +18,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 /* SPI */
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 7998eabd30cb4c18f6ffc6d522cb0de41b6c3f20..5e1d50b254663a602b8cc28c7178c31f6067128d 100644 (file)
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -18,8 +18,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 /* SPI */
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index e7b860a30ec40f24d3396d1bda9346e95354ea85..0b3183a67ddbdc068626ba6f70cf6de0f0bdbc6f 100644 (file)
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -19,8 +19,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 /* SPI */
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index 7c6d68a4f11a44120ad4fbe4c938dbb3b1aae33f..4c3da224c66d38f94eea856b11f4aad1879f2b88 100644 (file)
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -14,8 +14,6 @@
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA P2771-0000"
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 #define BOARD_EXTRA_ENV_SETTINGS \
        "calculated_vars=kernel_addr_r fdt_addr_r scriptaddr pxefile_addr_r " \

diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index ae8e0dee2cd1b693067229daf9bc02f31cf48dae..7a09ac0dee738afca0d30ddcec126e9ff502ea98 100644 (file)
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -22,8 +22,6 @@
 #define CONFIG_MACH_TYPE               MACH_TYPE_PAZ00
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#define CONFIG_SYS_MMC_ENV_PART 2
 
 #include "tegra-common-post.h"
 

diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index 4ae955d9cac639ec8cd1c09aaaffa4c23cd894a8..d7c6f8808e0d652e4f70efd062ceb0fe823bb352 100644 (file)
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -24,8 +24,6 @@
 /* Environment settings */
 
 /* Environment in SD */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                0
 #define MMC_ROOTFS_DEV         0
 #define MMC_ROOTFS_PART                2
 

diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index df5a2a1329b8da148f7d63357c217157056882be..960ff982d8b7d9d99cd93fd36eccf13447e9a942 100644 (file)
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -155,8 +155,5 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
-#ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
 
 #endif

diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h
index 4c02d8d375a8200f325aad14ed5211e8a093c58d..4a347fe154fadad0779a6a94827f4ffa9db8ba33 100644 (file)
--- a/include/configs/phycore_am335x_r2.h
+++ b/include/configs/phycore_am335x_r2.h
@@ -15,7 +15,6 @@
 #include <configs/ti_am335x_common.h>
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_SBC_PHYCORE_AM335X
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 #ifdef CONFIG_MTD_RAW_NAND
 #define NANDARGS \

diff --git a/include/configs/phycore_rk3288.h b/include/configs/phycore_rk3288.h
index 9135aa6b7a815b52322228185b4ffc18adfdff19..2b7a0670c02af9784823e19a94f4b856e7f5ffad 100644 (file)
--- a/include/configs/phycore_rk3288.h
+++ b/include/configs/phycore_rk3288.h
@@ -16,6 +16,4 @@
        func(MMC, mmc, 0) \
        func(MMC, mmc, 1)
 
-#define CONFIG_SYS_MMC_ENV_DEV 1
-
 #endif

diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 814e4b027f91bd437e209afec7a54634a8af82ea..7403c544a49085bd45690bb42753cd8d9c2e8f2a 100644 (file)
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -133,7 +133,6 @@
  * write the direct value here
  */
 #define CONFIG_BOARD_SIZE_LIMIT                715776
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 /* Ethernet Configuration */
 #define CONFIG_FEC_MXC

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index d7942afb679c2fa1eac5941e4638a6c36a46775c..d712b638b4cddab0096ea197d7330f56f2f5c77f 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -144,10 +144,6 @@
  */
 #define CONFIG_BOARD_SIZE_LIMIT                715776
 
-
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                0
-
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 3ca3ec61126d651dadd86454a341ea2faad1294d..f1b2ad4480c8bd54b394a34d7fd3cbfd84adb880 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -166,9 +166,6 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM               2
 
-#define CONFIG_SYS_MMC_ENV_DEV                 0
-#define CONFIG_SYS_MMC_ENV_PART                0
-
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC                  (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 85807ff3b69c88c2643954d2a4ddeefa603f0f23..7a5891652fecb2c720c680c73c4b6c658059bdcd 100644 (file)
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -132,7 +132,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR                \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_SYS_MMC_ENV_DEV         1       /* USDHC2 */
 #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"        /* USDHC2 */
 
 /* Size of malloc() pool */

diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 77169f38bbec8ca3b7c7ff649d43a4814c58a4d4..325a28001e5b59a9709561f1a779079b99f0301c 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -77,7 +77,6 @@
 #else /* CONFIG_CMD_NAND */
 
 /* Environment in MMC */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 #endif /* CONFIG_CMD_NAND */
 

diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index 2c7dc8bab61897c6a64c8e0d826c56c5164fe905..9763218ecbb3011addd1611209da9b99b7b183cb 100644 (file)
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -51,9 +51,6 @@
                        "ramdisk_addr_r=0x32400000\0"                   \
                        BOOTENV
 
-
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512
 #define CONFIG_SYS_MAXARGS             64

diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h
index ddd7012c8f396e1ae98d23286aeeee389ee09ee8..222e5aae7436f78cf0a1612defbac24bfedff46f 100644 (file)
--- a/include/configs/popmetal_rk3288.h
+++ b/include/configs/popmetal_rk3288.h
@@ -9,6 +9,4 @@
 #define ROCKCHIP_DEVICE_SETTINGS
 #include <configs/rk3288_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h
index 63f58bdbfecf40ff8491e93c204daf7640cc2145..5714437a0017084a43d12dc2f92f6091ecd77b8a 100644 (file)
--- a/include/configs/puma_rk3399.h
+++ b/include/configs/puma_rk3399.h
@@ -8,10 +8,6 @@
 
 #include <configs/rk3399_common.h>
 
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV 1
-#endif
-
 #define SDRAM_BANK_SIZE                        (2UL << 30)
 
 #define CONFIG_SERIAL_TAG

diff --git a/include/configs/rock.h b/include/configs/rock.h
index d9177576add963e527b21f875e0c9dcc811818f5..96aefc194789625ec63624bc6682b24315631d7b 100644 (file)
--- a/include/configs/rock.h
+++ b/include/configs/rock.h
@@ -9,6 +9,4 @@
 #define ROCKCHIP_DEVICE_SETTINGS
 #include <configs/rk3188_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/rock2.h b/include/configs/rock2.h
index 9e4a66902b50f9a28ccabce9e79b211511adbb7c..df96c32952f3b6523b5724350bcf425a2a07fbcd 100644 (file)
--- a/include/configs/rock2.h
+++ b/include/configs/rock2.h
@@ -13,6 +13,4 @@
 
 #include <configs/rk3288_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h
index 304ad2b7aae9c8d55157b564c781f30734ea46a0..c6f9122154a865dbfc998faa7f19e0b6ca71b0fd 100644 (file)
--- a/include/configs/rock960_rk3399.h
+++ b/include/configs/rock960_rk3399.h
@@ -13,8 +13,6 @@
 
 #include <configs/rk3399_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV         1
-
 #define SDRAM_BANK_SIZE                        (2UL << 30)
 
 #endif

diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 020d1e01fac991790ab69b3198b6ef471ec8a1cd..275d92eff783f36c0b332a9cae43e019674a44be 100644 (file)
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -161,8 +161,6 @@
 
 /* environment organization */
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 
 #define CONFIG_BOOTP_BOOTFILESIZE
 

diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index da5b29a46ef7755849d36685777120b77a621964..b54d2da9b46f03d8025b3891d5b7a4e71bc7068e 100644 (file)
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -102,11 +102,6 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-/*-----------------------------------------------------------------------
- * allow to overwrite serial and ethaddr
- */
-#define CONFIG_ENV_OVERWRITE
-
 #ifdef CONFIG_HUSH_PARSER
 #define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #endif
@@ -151,26 +146,6 @@
 #endif
 #endif
 
-/*-----------------------------------------------------------------------
- * SD/MMC
- */
-#if defined(CONFIG_MMC)
-/* eMMC = 0, SD-card = 2 */
-#define CONFIG_SYS_MMC_DEV             2
-#define CONFIG_SYS_MMC_ENV_DEV         CONFIG_SYS_MMC_DEV
-#endif
-
-/*-----------------------------------------------------------------------
- * Default environment organization
- */
-#if !defined(CONFIG_ENV_IS_IN_MMC) && !defined(CONFIG_ENV_IS_IN_NAND) && \
-       !defined(CONFIG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_EEPROM)
-       /* default: CONFIG_ENV_IS_NOWHERE */
-       #define CONFIG_ENV_IS_NOWHERE
-       #define CONFIG_ENV_OFFSET       1024
-       #define CONFIG_ENV_SIZE         (4 * 1024)      /* env size */
-#endif
-
 /*-----------------------------------------------------------------------
  * VIDEO
  */

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index be8865b9c069a814caad8f9804d713609fab1bef..d6d07a95b680a5fea992c0a0922bb18d8340fec2 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -161,7 +161,6 @@
 
 /* FLASH and environment organization */
 #define CONFIG_MMC_DEFAULT_DEV 0
-#define CONFIG_SYS_MMC_ENV_DEV         CONFIG_MMC_DEFAULT_DEV
 
 #define CONFIG_USE_ONENAND_BOARD_INIT
 #define CONFIG_SAMSUNG_ONENAND         1

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 5a80958739df1ddbcaf2c91b7f99c9b98a26d44e..da6ed975c3672fec349e6e5545f3c00d2b2a61f0 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -53,8 +53,6 @@
 #define CONFIG_BOOTBLOCK       "10"
 #define CONFIG_UBIBLOCK                "9"
 
-#define CONFIG_SYS_MMC_ENV_DEV         CONFIG_MMC_DEFAULT_DEV
-
 #define CONFIG_ENV_UBIFS_OPTION        " rootflags=bulk_read,no_chk_data_crc "
 #define CONFIG_ENV_FLASHBOOT   CONFIG_ENV_UBI_MTD CONFIG_ENV_UBIFS_OPTION \
                                "${mtdparts}"

diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 84c6ca95eafe0a719a03a178446d9514f38263e2..240df9c63b9939e9b46606c93be63c58e07a0d45 100644 (file)
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -18,7 +18,5 @@
 #define COUNTER_FREQUENCY      0xFE502A        /* 16.66MHz from CPclk */
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         1
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 #endif /* __SALVATOR_X_H */

diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h
index 3484bfebf2ec67b48c565e4780fa81e722819a2b..6011fb7d522dfc484f9a15bc4e6e19a1058f5433 100644 (file)
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@ -21,9 +21,6 @@
 /* Environment */
 
 /* Environment is in MMC */
-#if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
 
 /* FEC Ethernet on SoC */
 #ifdef CONFIG_CMD_NET

diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 857e2e349e2bb64503af13852b9233b05dbeabd9..5b5aa1b2f2050101e46d535bd810d4b43c1d1b35 100644 (file)
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -27,8 +27,6 @@
 #define CONFIG_MACH_TYPE               MACH_TYPE_SEABOARD
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#define CONFIG_SYS_MMC_ENV_PART 2
 
 /* NAND support */
 #define CONFIG_TEGRA_NAND

diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index 45acf95a5b8ff4f5a1db237784616e920f0b3378..bd3c3402c4859a1835814e48ba94e996744d39f1 100644 (file)
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -75,7 +75,6 @@
 /* Environment organization */
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
-       #define CONFIG_SYS_MMC_ENV_DEV          0
        #define CONFIG_DYNAMIC_MMC_DEVNO
 #endif
 

diff --git a/include/configs/sheep_rk3368.h b/include/configs/sheep_rk3368.h
index 550597c957d0bcd2112e449cbc1b213c0be388c5..08cc4bf356d97f848a15dfda9e0aaca381f43fea 100644 (file)
--- a/include/configs/sheep_rk3368.h
+++ b/include/configs/sheep_rk3368.h
@@ -8,7 +8,6 @@
 
 #include <configs/rk3368_common.h>
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #define KERNEL_LOAD_ADDR               0x280000
 #define DTB_LOAD_ADDR                  0x5600000
 #define INITRD_LOAD_ADDR               0x5bf0000

diff --git a/include/configs/sksimx6.h b/include/configs/sksimx6.h
index 33ec049cf22302a9c51965f90b56f3aa836ab4b3..511b1a440e80aa3ee171f34776f381edb8423121 100644 (file)
--- a/include/configs/sksimx6.h
+++ b/include/configs/sksimx6.h
@@ -52,7 +52,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       1
 
 /* Environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 /* Default environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 0df5ef9628f33267b34e88b21637019e7d77770d..b970e4bc80ec71d3a38070b76ca17e0544da85c2 100644 (file)
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -59,7 +59,6 @@
 /* MIU (Memory Interleaving Unit) */
 #define CONFIG_MIU_2BIT_INTERLEAVED
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #define RESERVE_BLOCK_SIZE             (512)
 #define BL1_SIZE                       (16 << 10) /*16 K reserved for BL1*/
 

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index fe68e4392e27fdb201a41e3ea3fc609fd7a4ae80..3d71759da4b4d879bc4964325a6005f584701a37 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -159,9 +159,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  */
 
 /* Environment for SDMMC boot */
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0 /* device 0 */
-#endif
 
 /* Environment for QSPI boot */
 

diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 3e6c726710802b899ac39c2526bb2ccf2cf31a07..fb5e2e8aafae202b8ebcb28f79527a29a55e3bd8 100644 (file)
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -49,7 +49,6 @@
 /*
  * U-Boot environment configurations
  */
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* device 0 */
 
 /*
  * QSPI support

diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index 099c069a9f6fdb7b976d1547e7ca9e84832c134d..204818b8eb7f2365375c4bab9308fbd121dc76c2 100644 (file)
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -87,8 +87,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV         1       /* USDHC2 */
-#define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 5d7544b5cd4ef0d662d556cf8aca28de03755717..a6a4879523a3894e26e494214f46cace7ccb2688 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -136,10 +136,8 @@
 
 #if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1
 /* If we have two devices (most likely eMMC + MMC), favour the eMMC */
-#define CONFIG_SYS_MMC_ENV_DEV         1
 #else
 /* Otherwise, use the only device we have */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 #endif
 #define CONFIG_SYS_MMC_MAX_DEVICE      4
 #endif

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index f4c6bdd146277ec37aa8ea19788906d96a595e34..8092b9edfbc0b22e31fb776337d1249af238a896 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -65,10 +65,6 @@
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
 #endif /* CONFIG_CMD_USB      */
 
-/* Environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV         2 /* overwritten on SD boot */
-#define CONFIG_SYS_MMC_ENV_PART                1 /* overwritten on SD boot */
-
 #define CONFIG_BOARD_SIZE_LIMIT                392192 /* (CONFIG_ENV_OFFSET - 1024) */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 1047372105e243db7a4a839538cdbe20f621e952..2bc531c463ef4506a56521e76dcffad03c2e002d 100644 (file)
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -17,8 +17,6 @@
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 /* SPI */
 #define CONFIG_TEGRA_SLINK_CTRLS       6

diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h
index d239e3beb1cfa6aefbf1b0bb889b4b194f2f5998..269ec529a3409479847c94263f6528eed5a57b7f 100644 (file)
--- a/include/configs/tinker_rk3288.h
+++ b/include/configs/tinker_rk3288.h
@@ -22,6 +22,4 @@
        func(PXE, pxe, na) \
        func(DHCP, dchp, na)
 
-#define CONFIG_SYS_MMC_ENV_DEV 1
-
 #endif

diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 9100d3b14a018cd84c9338aa4e66c14e147a3ec2..7678f69dede370a2b7b6b16aa45ab596e772cfad 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -145,7 +145,6 @@
 #else /* CONFIG_CMD_NAND */
 
 /* Environment in MMC */
-#define CONFIG_SYS_MMC_ENV_DEV         0
 
 #endif /* CONFIG_CMD_NAND */
 

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 13ab1cc4bf516c8eeae5ca5fdc30d3148256b44d..b58c475c22478dae9fe5dc4c93abf60b230fe977 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -74,8 +74,6 @@
 #define TQMA6_UBOOT_SECTOR_START       0x2
 #define TQMA6_UBOOT_SECTOR_COUNT       0x7fe
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 #define TQMA6_FDT_OFFSET               (2 * SZ_1M)
 #define TQMA6_FDT_SECTOR_START         0x1000
 #define TQMA6_FDT_SECTOR_COUNT         0x800

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 75b1989bb74f2a7a82daf81b7666d898ab9821be..3202627a7dbd9a4523cd54fba2b6fd2ef980198e 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -46,8 +46,6 @@
 #define CONFIG_BOOTBLOCK               "10"
 #define CONFIG_ENV_COMMON_BOOT         "${console} ${meminfo}"
 
-#define CONFIG_SYS_MMC_ENV_DEV         CONFIG_MMC_DEFAULT_DEV
-
 /* Tizen - partitions definitions */
 #define PARTS_CSA              "csa-mmc"
 #define PARTS_BOOT             "boot"

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index b2e017018768c289696283974fe8de45a2de8b4b..14549dd1a0c04f8b0e650bc4b08a6c938cdfecda 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -41,8 +41,6 @@
 
 #define CONFIG_SYS_MONITOR_BASE        0x00000000
 
-#define CONFIG_SYS_MMC_ENV_DEV         CONFIG_MMC_DEFAULT_DEV
-
 /* Tizen - partitions definitions */
 #define PARTS_CSA              "csa-mmc"
 #define PARTS_BOOT             "boot"

diff --git a/include/configs/ts4600.h b/include/configs/ts4600.h
index 6aab8a06a96301763cf521e04e5476f2db4f96f1..ae9352f5b9adeac431630d7807ef9d6200ff4707 100644 (file)
--- a/include/configs/ts4600.h
+++ b/include/configs/ts4600.h
@@ -23,9 +23,6 @@
 /* Environment */
 
 /* Environment is in MMC */
-#if defined(CONFIG_CMD_MMC) && defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
 
 /* Boot Linux */
 #define CONFIG_LOADADDR                0x42000000

diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index f321c152035c0cca029a956c0c14aacdb889d72c..f0630a7b92dd525435cdf498c3b20fea7e41e72d 100644 (file)
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -130,6 +130,4 @@
  * Environment organization
  */
 
-#define CONFIG_SYS_MMC_ENV_DEV 0
-
 #endif

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 706efb2035495db7c4de0b1fc2d3c4fd7e78b685..b4fbf8c6383dc3da744a987a08841a1a5fe49733 100644 (file)
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -85,6 +85,4 @@
 
 /* Environment organization */
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 #endif                        /* __CONFIG_H * */

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 4e95788b24f71cea67f303bf14cc29242c65337d..34a95a0283f0198395068bdf1dc131ce2b31841c 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -22,7 +22,6 @@
 
 /* Command definition */
 #define CONFIG_MXC_UART_BASE           UART1_BASE
-#define CONFIG_SYS_MMC_ENV_DEV         0  /*USDHC2*/
 
 /* Linux only */
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index e006ad280b454d5a1484995a001c9f02f8ba46ee..15fb62722874c95a5723ce950f3ee8d9e8c45736 100644 (file)
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -18,7 +18,5 @@
 #define COUNTER_FREQUENCY      0xFE502A        /* 16.66MHz from CPclk */
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         1
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 #endif /* __ULCB_H */

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index d0841a7d55f9de1a348d1aa1124d678319880d63..740249a74f3e21e23175f9f9d6dbf60c1447d78c 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -50,9 +50,6 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            (CONFIG_SYS_CBSIZE)
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                1
-
 #if !defined(CONFIG_ARM64)
 /* Time clock 1MHz */
 #define CONFIG_SYS_TIMER_RATE                  1000000

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 0c0f85097b232c3d79710ac866c4ddb6b750df83..27053c067fcafc5c37c5d200fed566421168f43f 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -15,7 +15,6 @@
 #include <asm/arch/imx-regs.h>
 
 /* U-Boot environment */
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
 /* U-Boot general configurations */
 #define CONFIG_SYS_CBSIZE      512

diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index b62a43054a21c67259f241baaadc73aeed945237..fe861a6f7b8a810d2795eaa7c6f51d438785306d 100644 (file)
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -19,8 +19,6 @@
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
 
 /* SPI */
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 2c2d66cdc0993ffb20998e487389863012b1868b..21f90f38fc9b3aa20ddaa0b2b051d0cf05ee0963 100644 (file)
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -20,8 +20,6 @@
 #define CONFIG_MACH_TYPE               MACH_TYPE_VENTANA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#define CONFIG_SYS_MMC_ENV_PART 2
 
 #include "tegra-common-post.h"
 

diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 25fa7937df83a954c318fdf20402a016bffdc916..fd8405433dd2d0433b0b953e45b70c1114c07ede 100644 (file)
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -84,8 +84,6 @@
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* USDHC1 eMMC */
-#define CONFIG_SYS_MMC_ENV_PART        1
 #endif
 
 /* Size of malloc() pool */

diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 20a03cff63c096f77d02dee4488a212bec14322b..fd4c749d96b80b11b9d231942640ed4f1797dd9f 100644 (file)
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -173,10 +173,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
-
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_RANGE               (512 * 1024)
 #endif

diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index c4db6f4b3c1ace3832aee7eb6be0973755f42451..a851fb41a814782ddaf56efbe0e6bdaa006027d0 100644 (file)
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -78,9 +78,7 @@
 #define CONFIG_IMX6_PWM_PER_CLK 66000000
 
 #ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV         0 /* USDHC4 eMMC */
 /* 0=user, 1=boot0, 2=boot1, * 4..7=general0..3. */
-#define CONFIG_SYS_MMC_ENV_PART                1 /* boot0 */
 #endif
 
 #ifdef CONFIG_SPL_BUILD

diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h
index 4d8b4a03e1a799333318d8edd77a19f0917c0657..3dc10b29c3facbdeac72683b3d8f2552081a4663 100644 (file)
--- a/include/configs/vyasa-rk3288.h
+++ b/include/configs/vyasa-rk3288.h
@@ -20,8 +20,6 @@
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 1) \
 
-#define CONFIG_SYS_MMC_ENV_DEV 1
-
 #ifndef CONFIG_TPL_BUILD
 
 #define CONFIG_SPL_OS_BOOT

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index c798ca64bf196a79df1a312e2fac8205c3b6c00a..df13e3da537f9300ea98fa8e70d38e35d08706c2 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -122,6 +122,4 @@
 
 /* Environment organization */
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 #endif                        /* __CONFIG_H * */

diff --git a/include/configs/warp.h b/include/configs/warp.h
index 1ab72cd00bce5ba93ca0401d83fddf642cdf1a3d..f17eea117f3ab3916bb227ac940b1b8033ca6649 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -37,8 +37,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-
 /* VDD voltage 1.65 - 1.95 */
 #define CONFIG_SYS_SD_VOLTAGE          0x00000080
 

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 60a902b2c74735fb71e5ff45e06d7afb871a5ad2..2d1ede3bc8dc76436942001faf8dcc06ab1b1b4e 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -143,9 +143,6 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM       1
 
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                0
-
 
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 79364d3437fea0678b259cfd3d439d53b036208b..399925a75bdadea2c372bf0e97dd96377bcabb34 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -48,8 +48,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment is in stored in the eMMC boot partition */
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* USDHC2 */
-#define CONFIG_SYS_MMC_ENV_PART                1       /* boot parition */
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"  /* USDHC2 */
 
 /* USB Configs */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 82f8f12e20b4743f89f08c2a54729e5fe335361f..e2db424fd5e3b6e4940c752df080aeee3b3e720e 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2985,8 +2985,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR
 CONFIG_SYS_MMC_BASE
 CONFIG_SYS_MMC_CD_PIN
 CONFIG_SYS_MMC_CLK_OD
-CONFIG_SYS_MMC_ENV_DEV
-CONFIG_SYS_MMC_ENV_PART
 CONFIG_SYS_MMC_MAX_BLK_COUNT
 CONFIG_SYS_MMC_MAX_DEVICE
 CONFIG_SYS_MMC_U_BOOT_DST