diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-24 11:54:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-24 22:30:25 -0400 |
| commit | e69e219c109fcc105e2712aebd9a97d1b15351d8 (patch) | |
| tree | 7dda5554cd33a72f7f77a942319ca5dfe6068e34 | |
| parent | 4518846889940cb4e05042506beab9779a1988d0 (diff) | |
| download | u-boot-WIP/move-SYS_ENV_MMC_DEV-and-PART.tar.gz | |
Convert CONFIG_SYS_MMC_ENV_DEV et al to KconfigWIP/move-SYS_ENV_MMC_DEV-and-PART
This converts the following to Kconfig:
CONFIG_SYS_MMC_ENV_DEV
CONFIG_SYS_MMC_ENV_PART
Cc: Priyanka Jain <priyanka.jain@nxp.com>
Cc: Madalin Bucur <madalin.bucur@oss.nxp.com>
Cc: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Due to some non-environment usage of the variables, cc'ing a few folks.
Changes in v2:
- A few more migrations
308 files changed, 133 insertions, 454 deletions
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index b161b3bbc3..6812d63ccc 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -35,6 +35,7 @@ CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack" 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_SPL_BLK is not set CONFIG_BOOTCOUNT_LIMIT=y diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig index 6401375250..deaaa3bd8b 100644 --- a/configs/am335x_shc_defconfig +++ b/configs/am335x_shc_defconfig @@ -47,6 +47,7 @@ CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" 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_MMC=y CONFIG_MMC_OMAP_HS=y diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig index fea34a3424..39670f9c48 100644 --- a/configs/am335x_shc_ict_defconfig +++ b/configs/am335x_shc_ict_defconfig @@ -48,6 +48,7 @@ CONFIG_DEFAULT_DEVICE_TREE="am335x-shc" 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_MMC=y CONFIG_MMC_OMAP_HS=y diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index 5ba7b917e9..f894862a8b 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -45,6 +45,8 @@ CONFIG_DEFAULT_DEVICE_TREE="am335x-sl50" 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_BOOTCOUNT_LIMIT=y CONFIG_DM_MMC=y diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index dce50dc4be..05d77eae49 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -52,6 +52,7 @@ CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc 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_SPL_DM=y diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index 081a48f038..fe2a58d40c 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -53,6 +53,7 @@ CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc 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_SPL_DM=y diff --git a/configs/am57xx_hs_evm_usb_defconfig b/configs/am57xx_hs_evm_usb_defconfig index 2ecc990683..daf08d915f 100644 --- a/configs/am57xx_hs_evm_usb_defconfig +++ b/configs/am57xx_hs_evm_usb_defconfig @@ -59,6 +59,7 @@ CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc 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_SPL_DM=y diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig index 918ff4de0c..8e0a49d4fe 100644 --- a/configs/am65x_evm_a53_defconfig +++ b/configs/am65x_evm_a53_defconfig @@ -66,6 +66,7 @@ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=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 bc3da74509..87f28cc64d 100644 --- a/configs/am65x_hs_evm_a53_defconfig +++ b/configs/am65x_hs_evm_a53_defconfig @@ -69,6 +69,7 @@ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=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 289d644edb..606489d540 100644 --- a/configs/apalis-imx8qm_defconfig +++ b/configs/apalis-imx8qm_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis" 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 9301dcb12a..dca15235be 100644 --- a/configs/apalis-tk1_defconfig +++ b/configs/apalis-tk1_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis" 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 2fce8888b5..f15c4141c3 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -60,6 +60,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis" 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 133f0abed1..307ec72d7f 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis" 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 8510cc272f..f04fcf59d5 100644 --- 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 c266bf2ef6..b3a90ee493 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver" 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 09370b7ed0..99fd4bb954 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -69,6 +69,8 @@ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clocks clock-names interrupt 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_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SPL_DM=y diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 456e4507c8..f2709fdf7f 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -68,6 +68,8 @@ CONFIG_OF_SPL_REMOVE_PROPS="" 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_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 8a4603d080..059c6a3586 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu" 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 7f8430acde..57ee61ae36 100644 --- a/configs/cei-tk1-som_defconfig +++ b/configs/cei-tk1-som_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra124-cei-tk1-som" 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 57b48e35b4..d70946b84a 100644 --- a/configs/colibri-imx8qxp_defconfig +++ b/configs/colibri-imx8qxp_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri" 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 388082ae6b..1d64971421 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -60,6 +60,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri" 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 7538f7cff4..763585739d 100644 --- a/configs/colibri_imx7_emmc_defconfig +++ b/configs/colibri_imx7_emmc_defconfig @@ -45,6 +45,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-emmc" 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 67bba304a9..1513bdbfbe 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri" 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 99537d8ab5..7de54a99ef 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore" 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 178148d2ba..407e08bd3c 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -60,6 +60,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8-deneb" 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 12f08ae6f9..86dd686f37 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -53,6 +53,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" 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_SPL_DM=y diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index e15f62eded..3d461d8a15 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -55,6 +55,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" 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_SPL_DM=y diff --git a/configs/dra7xx_hs_evm_usb_defconfig b/configs/dra7xx_hs_evm_usb_defconfig index 4178473ddf..6be4b966c0 100644 --- a/configs/dra7xx_hs_evm_usb_defconfig +++ b/configs/dra7xx_hs_evm_usb_defconfig @@ -55,6 +55,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" 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_SPL_DM=y diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index d4a276ce14..96071fd721 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_TIMER=y CONFIG_DEFAULT_DEVICE_TREE="dragonboard410c" 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 da418de4cd..79bec41337 100644 --- a/configs/e2220-1170_defconfig +++ b/configs/e2220-1170_defconfig @@ -23,6 +23,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170" 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 7667bb037b..c357ca7258 100644 --- 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 c0fc168ff4..74f0dfff49 100644 --- a/configs/ficus-rk3399_defconfig +++ b/configs/ficus-rk3399_defconfig @@ -24,6 +24,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-ficus" 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 e53d2e5aef..af4d2225cb 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -60,6 +60,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8-giedi" 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 fc2504eefe..fa38c46e64 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -65,6 +65,7 @@ CONFIG_CMD_UBI=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 6c6f62728c..62dcf663c6 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -65,6 +65,7 @@ CONFIG_CMD_UBI=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 b58829468b..458f793aeb 100644 --- a/configs/hikey_defconfig +++ b/configs/hikey_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_CACHE=y CONFIG_DEFAULT_DEVICE_TREE="hi6220-hikey" 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 649314ee2e..e5963d5c38 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mamoj" 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 fb34632d31..918abee7fe 100644 --- a/configs/imx8mm_beacon_defconfig +++ b/configs/imx8mm_beacon_defconfig @@ -55,6 +55,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-beacon-kit" 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 d4db74dcbd..6278152940 100644 --- a/configs/imx8mm_evk_defconfig +++ b/configs/imx8mm_evk_defconfig @@ -53,6 +53,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-evk" 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 f49116c9c5..c28561b7ac 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -55,6 +55,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-evk" 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 6ff02e7b91..6a85b93fc4 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -40,6 +40,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-evk" 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 6f8938acba..e16d50d6cd 100644 --- a/configs/imx8mq_phanbell_defconfig +++ b/configs/imx8mq_phanbell_defconfig @@ -41,6 +41,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-phanbell" 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 181e265040..4aea2656bb 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -48,6 +48,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-mek" 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 8af2b239d6..bcd4940479 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -44,6 +44,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8qm-rom7720-a1" 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 ae40766d80..0a956dc03c 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -48,6 +48,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-mek" 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 09a73e590d..75e06600d2 100644 --- a/configs/j721e_evm_a72_defconfig +++ b/configs/j721e_evm_a72_defconfig @@ -77,6 +77,7 @@ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=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 9b5bc6cf54..e45186a0c3 100644 --- a/configs/j721e_hs_evm_a72_defconfig +++ b/configs/j721e_hs_evm_a72_defconfig @@ -70,6 +70,7 @@ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=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 1aa899e63c..46a11f6c7c 100644 --- a/configs/j721e_hs_evm_r5_defconfig +++ b/configs/j721e_hs_evm_r5_defconfig @@ -59,6 +59,7 @@ CONFIG_SPL_OF_CONTROL=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 cf276c5c96..1d4ad6ec97 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1" 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 65ff046140..5ea2d2ff47 100644 --- a/configs/kp_imx6q_tpc_defconfig +++ b/configs/kp_imx6q_tpc_defconfig @@ -48,6 +48,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent assigned-clocks assigned-clock-rate 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/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig index a9142bcd24..ae64436c7d 100644 --- a/configs/mx6dlarm2_defconfig +++ b/configs/mx6dlarm2_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=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 3d26926b92..31c0b2ea06 100644 --- a/configs/mx6dlarm2_lpddr2_defconfig +++ b/configs/mx6dlarm2_lpddr2_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=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 38677a9140..2635dd5048 100644 --- a/configs/mx6qarm2_defconfig +++ b/configs/mx6qarm2_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=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 6a31946423..234aaec479 100644 --- a/configs/mx6qarm2_lpddr2_defconfig +++ b/configs/mx6qarm2_lpddr2_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=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 c03e0b54f5..8efda36612 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -66,6 +66,7 @@ CONFIG_SPL_OF_LIST="imx6dl-sabresd imx6q-sabresd imx6qp-sabresd" CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=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 91dcef10df..64b49d033f 100644 --- a/configs/mx6slevk_defconfig +++ b/configs/mx6slevk_defconfig @@ -33,6 +33,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk" 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 edea036267..90febee8f6 100644 --- a/configs/mx6slevk_spl_defconfig +++ b/configs/mx6slevk_spl_defconfig @@ -42,6 +42,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk" 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 994b038cf8..2f9a029fb8 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6sx-sdb" 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 0a9bead33b..1b53af185c 100644 --- a/configs/mx6ul_14x14_evk_defconfig +++ b/configs/mx6ul_14x14_evk_defconfig @@ -50,6 +50,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-14x14-evk" 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 7b723d8177..c27d099c91 100644 --- a/configs/mx6ul_9x9_evk_defconfig +++ b/configs/mx6ul_9x9_evk_defconfig @@ -45,6 +45,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-9x9-evk" 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 7c77cbb90c..141c1cd357 100644 --- a/configs/mx6ull_14x14_evk_defconfig +++ b/configs/mx6ull_14x14_evk_defconfig @@ -30,6 +30,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk" 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 e96402df65..85acc40507 100644 --- a/configs/mx6ull_14x14_evk_plugin_defconfig +++ b/configs/mx6ull_14x14_evk_plugin_defconfig @@ -31,6 +31,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk" 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 9bb2e257c2..242484ea4a 100644 --- a/configs/mx6ulz_14x14_evk_defconfig +++ b/configs/mx6ulz_14x14_evk_defconfig @@ -28,6 +28,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ulz-14x14-evk" 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 02c80264af..0c463fb8bf 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -46,6 +46,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big" 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 0ed6b0cb36..b51a5fdaf6 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -29,6 +29,7 @@ CONFIG_OF_CONTROL=y CONFIG_SPL_PARTITION_UUIDS=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 317c4848d3..23643d27f7 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -29,6 +29,7 @@ CONFIG_OF_CONTROL=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_DM_MMC=y diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig index 116a697a1b..d304c0b901 100644 --- a/configs/opos6uldev_defconfig +++ b/configs/opos6uldev_defconfig @@ -66,6 +66,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-opos6uldev" 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 d8d28ed6ea..9d6abaa334 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -24,6 +24,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000" 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 ec4c5909ac..42db19df4e 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180" 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 95188a142a..077d5964ac 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -24,6 +24,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571" 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 befa46a4cd..5614d456f9 100644 --- a/configs/p2771-0000-000_defconfig +++ b/configs/p2771-0000-000_defconfig @@ -23,6 +23,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-000" 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 71cde4e41d..8c187f3300 100644 --- a/configs/p2771-0000-500_defconfig +++ b/configs/p2771-0000-500_defconfig @@ -23,6 +23,7 @@ CONFIG_BOOTP_PREFER_SERVERIP=y CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra186-p2771-0000-500" 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 5054bf65ab..491eedb670 100644 --- a/configs/paz00_defconfig +++ b/configs/paz00_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00" 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 05ceaedb85..17447c69e6 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -39,6 +39,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-phycore-rdk" 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 ab031e198b..f2c9a6916d 100644 --- a/configs/pico-imx8mq_defconfig +++ b/configs/pico-imx8mq_defconfig @@ -39,6 +39,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mq-pico-pi" 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 3c5a1dc299..632cfdefdc 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -42,6 +42,7 @@ CONFIG_OF_LIVE=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-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_MISC=y diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig index 5cd8eb527b..83da30f794 100644 --- a/configs/r8a77990_ebisu_defconfig +++ b/configs/r8a77990_ebisu_defconfig @@ -34,6 +34,8 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="r8a77990-ebisu-u-boot" 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 b1a48af8a7..1b62c2b4df 100644 --- a/configs/r8a77995_draak_defconfig +++ b/configs/r8a77995_draak_defconfig @@ -34,6 +34,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="r8a77995-draak-u-boot" 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 2ba3a11a27..726fdc975e 100644 --- a/configs/rcar3_salvator-x_defconfig +++ b/configs/rcar3_salvator-x_defconfig @@ -37,6 +37,8 @@ CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=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 718fcdb560..475491fbb7 100644 --- a/configs/rcar3_ulcb_defconfig +++ b/configs/rcar3_ulcb_defconfig @@ -37,6 +37,8 @@ CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=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 4d8cd54ee9..4a63a2a537 100644 --- a/configs/riotboard_defconfig +++ b/configs/riotboard_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=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 8e9aaf3a13..2e85848258 100644 --- a/configs/riotboard_spl_defconfig +++ b/configs/riotboard_spl_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=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 933a1c6967..8a02f11d6e 100644 --- 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 e0941225a3..1936212444 100644 --- 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 0a51e51a0c..aeb7a2570a 100644 --- 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 59a85c78a1..83256458af 100644 --- a/configs/rock960-rk3399_defconfig +++ b/configs/rock960-rk3399_defconfig @@ -30,6 +30,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock960" 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/seaboard_defconfig b/configs/seaboard_defconfig index 54506329c2..6496a3f791 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard" 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 70aa93d9ca..65773d1fb9 100644 --- a/configs/sei510_defconfig +++ b/configs/sei510_defconfig @@ -34,6 +34,8 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="meson-g12a-sei510" 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 f19f3b55d9..a016c27881 100644 --- a/configs/sei610_defconfig +++ b/configs/sei610_defconfig @@ -34,6 +34,8 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-sei610" 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 091c5b29b1..97dae9f62a 100644 --- a/configs/somlabs_visionsom_6ull_defconfig +++ b/configs/somlabs_visionsom_6ull_defconfig @@ -33,6 +33,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-somlabs-visionsom" 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 61b5a8b11b..c270fec24e 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -60,6 +60,8 @@ CONFIG_OF_DTB_PROPS_REMOVE=y CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-extended interrupt-names interrupt-map interrupt-map-mask" 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 f99be96498..0a9e04b1dd 100644 --- a/configs/tec-ng_defconfig +++ b/configs/tec-ng_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng" 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 9e6bcacba5..80babb7001 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -40,6 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker" 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 daae189fe6..2456c3839f 100644 --- a/configs/tinker-s-rk3288_defconfig +++ b/configs/tinker-s-rk3288_defconfig @@ -41,6 +41,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker-s" 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 12702429b7..e1fc61d3e4 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2" 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 8959a5c99a..1dea3b9714 100644 --- a/configs/ventana_defconfig +++ b/configs/ventana_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana" 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 302345f17a..b2650d6bb3 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -62,6 +62,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-verdin" 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 db79c7cba6..4cc40b6e46 100644 --- a/configs/vining_2000_defconfig +++ b/configs/vining_2000_defconfig @@ -57,6 +57,7 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6sx-softing-vining-2000" 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 c46eed5ae3..8b25ed6a4d 100644 --- a/configs/vyasa-rk3288_defconfig +++ b/configs/vyasa-rk3288_defconfig @@ -37,6 +37,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-vyasa" 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 b1bdb157bb..c181544556 100644 --- a/configs/xpress_defconfig +++ b/configs/xpress_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=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 33e5a774c2..97efaeed29 100644 --- a/configs/xpress_spl_defconfig +++ b/configs/xpress_spl_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=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 852baf000c..e33fe5d99c 100644 --- a/configs/zc5202_defconfig +++ b/configs/zc5202_defconfig @@ -39,6 +39,8 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=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 17c5ce4200..b04fa2c268 100644 --- a/configs/zc5601_defconfig +++ b/configs/zc5601_defconfig @@ -38,6 +38,8 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=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 38e7fadbb9..2eb2fe48da 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -567,6 +567,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/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index fc74d57497..9d499a018e 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -638,7 +638,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 c6a64ee479..87b005a8ad 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -51,7 +51,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 efd9b6b5e1..0142e56fd4 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -134,11 +134,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 8f9de56f07..23e852bc54 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -159,8 +159,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_ENV_OVERWRITE #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 f32e6680b3..a4e373e03c 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -115,11 +115,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 e666e4f4a4..85c002b62b 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -97,11 +97,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 ebe7a9cf92..f83f966066 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -276,11 +276,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 2590a28867..3de3660c67 100644 --- 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 @@ -369,7 +366,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 6de463efa1..9c4ef369c5 100644 --- 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 c881ac6211..2e9c6b831b 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -30,11 +30,6 @@ * 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 diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 9087e04165..16849d8701 100644 --- 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 adcd9a12e2..899fb2e501 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -17,8 +17,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 diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 19d861d402..6507bb60ab 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -141,10 +141,6 @@ 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 6dad8216e9..ba7f5939ae 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -84,8 +84,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/apalis-tk1.h b/include/configs/apalis-tk1.h index 519b3b7823..e5dad9372f 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -20,8 +20,6 @@ #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 efd4aa295b..6aa5682f85 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -198,8 +198,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 -#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 701b34aa84..6918538157 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -19,8 +19,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 b66069c81a..9261dd7ba8 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -25,9 +25,6 @@ #define CONFIG_ENV_OVERWRITE /* 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/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 53629743d9..ba21149e43 100644 --- 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 e27c276a46..780bf0cce7 100644 --- 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 c2d4e485a9..aa875fa9b0 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -98,7 +98,6 @@ #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 diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index e771548aa6..05ada258ea 100644 --- 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 d807997277..c84a5ca2e5 100644 --- 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 31fd6ec08b..f72d62ec35 100644 --- 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/beaver.h b/include/configs/beaver.h index 1b6ba8c85d..545e21ad57 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -23,8 +23,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 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 68931c1358..d4b2402b33 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -180,18 +180,9 @@ 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) +#if defined(CONFIG_ENV_IS_IN_NAND) /* No NAND env support in SPL */ #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 3a18aec5d3..d6a7af1a15 100644 --- 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 38a56e897e..8151bd8700 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -136,8 +136,6 @@ /* Environment organisation */ #define CONFIG_ENV_OVERWRITE -#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 */ diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 7eeadfc9c3..17155163d8 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -27,8 +27,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 diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index dbebef34e3..12bb03899d 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -23,8 +23,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/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index a2cc4f9fa8..26166d359b 100644 --- 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" \ @@ -201,8 +200,5 @@ (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 a2d198c519..86cac236f9 100644 --- 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 67f5bbe9d8..1afd2b38eb 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -39,7 +39,6 @@ #define DM9000_DATA (CONFIG_DM9000_BASE + 2) /* Environment */ -#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 74be2f1378..5441da8c9c 100644 --- 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 8d7222902c..e8d654551c 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -116,8 +116,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 dab96f038d..1d0278bf2c 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -177,8 +177,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 -#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 1afa9373a1..c6a6173a21 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -197,8 +197,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 -#define CONFIG_SYS_MMC_ENV_PART 1 #endif #ifdef CONFIG_TARGET_COLIBRI_IMX7_NAND diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 4e5e89b547..85a5c27a37 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -21,8 +21,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 512d8e16ee..8ab8bb9f33 100644 --- 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 d7812bd886..3570f5b664 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -64,7 +64,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 b587cb8d77..21e036710b 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -52,7 +52,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 0cfc197142..18d9ba1784 100644 --- 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 d933f79e34..b27f715798 100644 --- 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 5d3187331f..bf3afd8016 100644 --- 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 14cd82f5a3..5f7b65fc09 100644 --- 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 3248320b9d..d28cc9d336 100644 --- 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 9362e9322c..65537e4778 100644 --- 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 c4349bda45..5ed62678ce 100644 --- 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 521a348435..06cbb03dc6 100644 --- 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 3918a9fc1c..606c656a72 100644 --- 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 665550a5eb..27e6f1dabe 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -88,9 +88,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 aa6c4b09e2..df04892e5f 100644 --- 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 565cc8818e..8148453d93 100644 --- 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 e761c7c519..27201fcfd7 100644 --- 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 ed801dd845..13ddc18b34 100644 --- 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 bf6c7eaf4c..768004a43c 100644 --- 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 6a91a82ceb..77d99d0a42 100644 --- 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 e19fa90212..053c9032e2 100644 --- 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 0d2cb21ac6..e8893eb7de 100644 --- 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 26687e6386..cac613d021 100644 --- 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 2d3db22877..b7e850370b 100644 --- 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 dff6a26f3b..9297fbdc08 100644 --- 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 9e4a66902b..df96c32952 100644 --- 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 7b8b62fbcb..3af2493043 100644 --- 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 a0d27b6d51..be2dc79968 100644 --- 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 38e8e8e131..a666d420e4 100644 --- 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 2f4b67025c..396870a67f 100644 --- 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 70cd682ca9..a323a0bf69 100644 --- 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 4c7a0cb0bb..0786d66052 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -139,9 +139,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 d70c6dbc23..ee91b7a4b4 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -46,7 +46,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 ce3ba74924..93a1f77207 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -108,7 +108,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) #define CONFIG_ENV_OVERWRITE -#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 d1c0e0ec2e..ccfcbaccdb 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -111,7 +111,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) #define CONFIG_ENV_OVERWRITE -#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 4350b5a62a..919f71f31a 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -113,7 +113,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) #define CONFIG_ENV_OVERWRITE -#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 9c13235982..b6b85b8327 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -121,7 +121,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) #define CONFIG_ENV_OVERWRITE -#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 366577857a..30c652f795 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -163,7 +163,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) #define CONFIG_ENV_OVERWRITE -#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 9c83e1b9f8..7d3d397c75 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -155,7 +155,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) #define CONFIG_ENV_OVERWRITE -#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 1864374a4f..ae2f7e59ad 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -155,12 +155,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 5621ba8232..c9dc76d7a3 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -137,8 +137,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 @@ -147,7 +145,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 5fdb67f0ec..f2eb8a692e 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -154,12 +154,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 8e54565f1a..4fb44774b0 100644 --- 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 3a6b972d9a..4fbcda9581 100644 --- 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 7488b661f5..6f1ad8bbf7 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -152,9 +152,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 98248876e8..a3c385b6e2 100644 --- 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 5e2af76c6e..b755f943aa 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -97,6 +97,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 0f0fe63f4f..6485527bd0 100644 --- 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 1ef7633633..75fc03f147 100644 --- 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 cae0f1ed29..c5b78f9c89 100644 --- 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 2dcd4db28c..db5e6fc133 100644 --- 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 b0a150dbfb..59e68dfd49 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -220,10 +220,6 @@ #define CONFIG_ENV_OVERWRITE -#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 18800ea07a..f1192ac438 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -474,10 +474,6 @@ unsigned long get_board_ddr_clk(void); */ #define CONFIG_ENV_OVERWRITE -#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 72aed8fed6..84aab7f3bb 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -238,10 +238,6 @@ /* Environment */ #define CONFIG_ENV_OVERWRITE -#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 6f7d051bd8..0a3f8b6144 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -447,10 +447,6 @@ */ #define CONFIG_ENV_OVERWRITE -#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 d184673a71..8e4825b088 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -95,7 +95,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 46baeb0d0d..7dc81c94d7 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -396,15 +396,6 @@ unsigned long get_board_ddr_clk(void); */ #define CONFIG_ENV_OVERWRITE -#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 bfaa574fc9..d48b38a386 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -244,15 +244,6 @@ #define CONFIG_ENV_OVERWRITE #endif -#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 44e7fc3a72..b75aedc093 100644 --- 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 diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 969d2c540b..9102c812b5 100644 --- 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 fe8108dae0..dddaa25417 100644 --- 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 1e9e6a8f96..b92ec14c69 100644 --- 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 16e0486d40..5bb321c20e 100644 --- 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 751325ad69..9e174afb92 100644 --- 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 006a4c97fb..b7a7dc0a64 100644 --- 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 9bc287f7aa..697cd5d83b 100644 --- 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 - /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h index 33172a6b97..f43a8415e1 100644 --- 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 a4d9779667..8fff915b50 100644 --- 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 e19fa90212..053c9032e2 100644 --- 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 dfd506ed24..09e038c631 100644 --- a/include/configs/mt7622.h +++ b/include/configs/mt7622.h @@ -23,8 +23,6 @@ /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#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 fe436cca38..f415bff4e9 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -57,8 +57,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 253a54332c..22e4c8f688 100644 --- a/include/configs/mt8512.h +++ b/include/configs/mt8512.h @@ -31,7 +31,6 @@ /* ENV Setting */ #if defined(CONFIG_MMC_MTK) -#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OVERWRITE /* MMC offset in block unit,and block size is 0x200 */ diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h index 276fbc285f..c80d567e9d 100644 --- a/include/configs/mt8518.h +++ b/include/configs/mt8518.h @@ -34,7 +34,6 @@ /* ENV Setting */ #if defined(CONFIG_MMC_MTK) -#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_OVERWRITE /* MMC offset in block unit,and block size is 0x200 */ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 19b5b5b386..c1c2a003aa 100644 --- 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 1f55e92091..795c5f1b47 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -19,9 +19,6 @@ #define CONFIG_ENV_OVERWRITE /* 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 */ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index 595727aa30..cd963216f2 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -22,9 +22,6 @@ #define CONFIG_ENV_OVERWRITE /* 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 c114ec78e1..11249ed88c 100644 --- 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 15b64ee03e..2b58f939d0 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -22,9 +22,6 @@ #define CONFIG_ENV_OVERWRITE /* 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 e99dcd2aa1..93a6f15e4d 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -191,6 +191,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 eb6aa0cda0..d6d6bdf13a 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -164,7 +164,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 e0210047ff..e88384827b 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -94,7 +94,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 19f8408e45..c25a85963e 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -115,6 +115,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 b19a849211..93ee3a0a10 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -170,7 +170,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 8c7d1395d0..e71a73bf80 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -140,7 +140,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 a8d50507cb..03f8321b2a 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -110,6 +110,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 57efe1bab6..b03129bfc6 100644 --- 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 cdc108a735..83c09ead27 100644 --- 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 e444930dc8..1189677718 100644 --- 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 ec1537541a..e8f52cee20 100644 --- 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 3ee9cdd52d..44dadd681c 100644 --- 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 f13429d6ea..9533d30742 100644 --- 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 070216338b..9ad29341c1 100644 --- 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 b30f9e51fb..4a521ec80d 100644 --- 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 f83ad914db..6f1e0d878d 100644 --- 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 e37559d903..ca2f2bd975 100644 --- 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 7e1e8b02cb..98fab6b83d 100644 --- 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 78bdfab5a6..44ece34e68 100644 --- 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 9e93269074..1e27920988 100644 --- 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 0f7d8e7cb5..0598224f66 100644 --- 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 14581e0be0..62faef0703 100644 --- 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 97dd168b01..394fb15f31 100644 --- 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 03229910b2..7173eeba67 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -45,7 +45,6 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 -#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV #define CONFIG_ENV_OVERWRITE /* Partitions name */ diff --git a/include/configs/odroid_go2.h b/include/configs/odroid_go2.h index 00eac2d2a8..53781ba7ae 100644 --- 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 884f45df22..462aa4a5b9 100644 --- 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 53589c03ea..a1f1dafad7 100644 --- 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 3ef5ebbac7..69f5e9f96a 100644 --- 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 3bedc4784b..24b0338deb 100644 --- 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 a33f2f30ca..9448024c54 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -697,7 +697,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 8e3e1a77f5..5cebafc7c7 100644 --- 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 7998eabd30..5e1d50b254 100644 --- 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 e7b860a30e..0b3183a67d 100644 --- 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 7c6d68a4f1..4c3da224c6 100644 --- 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 ae8e0dee2c..7a09ac0dee 100644 --- 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 4ae955d9ca..d7c6f8808e 100644 --- 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 ba7aad8b05..01496cf704 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -158,8 +158,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 58fa2162a8..80610a590a 100644 --- 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 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #ifdef CONFIG_MTD_RAW_NAND diff --git a/include/configs/phycore_rk3288.h b/include/configs/phycore_rk3288.h index 9135aa6b7a..2b7a0670c0 100644 --- 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 814e4b027f..7403c544a4 100644 --- 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 d7942afb67..d712b638b4 100644 --- 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 3ca3ec6112..f1b2ad4480 100644 --- 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 e880fe59ae..c792711df5 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -134,7 +134,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) #define CONFIG_ENV_OVERWRITE -#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 77169f38bb..325a28001e 100644 --- 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 2c7dc8bab6..9763218ecb 100644 --- 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 ddd7012c8f..222e5aae74 100644 --- 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 27a8a7d9c3..d8b71a4a5e 100644 --- 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 d9177576ad..96aefc1947 100644 --- 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 9e4a66902b..df96c32952 100644 --- 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 304ad2b7aa..c6f9122154 100644 --- 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 11ae2c1c52..d6a133dac6 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -163,8 +163,6 @@ /* environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0 - #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 620217f528..305d29f8f3 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -162,7 +162,6 @@ /* FLASH and environment organization */ #define CONFIG_MMC_DEFAULT_DEV 0 -#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV #define CONFIG_ENV_OVERWRITE #define CONFIG_USE_ONENAND_BOARD_INIT diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 5a80958739..da6ed975c3 100644 --- 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 84c6ca95ea..240df9c63b 100644 --- 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 3484bfebf2..6011fb7d52 100644 --- 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 857e2e349e..5b5aa1b2f2 100644 --- 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 45acf95a5b..bd3c3402c4 100644 --- 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 550597c957..08cc4bf356 100644 --- 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 33ec049cf2..511b1a440e 100644 --- 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 336571d4c4..a3f011c400 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -62,7 +62,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 07c9745eba..63eac09da5 100644 --- 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 775a122f1f..89f5104fa1 100644 --- 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 099c069a9f..204818b8eb 100644 --- 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 5b0bec0561..3651d7fcc5 100644 --- 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 32845978a6..b9feee9e9c 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -66,8 +66,6 @@ #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_ENV_OVERWRITE #define CONFIG_BOARD_SIZE_LIMIT 392192 /* (CONFIG_ENV_OFFSET - 1024) */ diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 1047372105..2bc531c463 100644 --- 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 d239e3beb1..269ec529a3 100644 --- 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 9100d3b14a..7678f69ded 100644 --- 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 13ab1cc4bf..b58c475c22 100644 --- 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 f39a7c726a..81bd7b1cc4 100644 --- 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 - #define CONFIG_ENV_OVERWRITE /* Tizen - partitions definitions */ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index f6593e227b..cbd3758678 100644 --- 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 - #define CONFIG_ENV_OVERWRITE /* Tizen - partitions definitions */ diff --git a/include/configs/ts4600.h b/include/configs/ts4600.h index 6aab8a06a9..ae9352f5b9 100644 --- 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 aca0d860af..c8565dbf72 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -133,6 +133,4 @@ * Environment organization */ -#define CONFIG_SYS_MMC_ENV_DEV 0 - #endif diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 706efb2035..b4fbf8c638 100644 --- 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 4e95788b24..34a95a0283 100644 --- 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 e006ad280b..15fb627228 100644 --- 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 d0841a7d55..740249a74f 100644 --- 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 0c0f85097b..27053c067f 100644 --- 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 b62a43054a..fe861a6f7b 100644 --- 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 2c2d66cdc0..21f90f38fc 100644 --- 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 878c4996df..3019f357e8 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -86,8 +86,6 @@ #define CONFIG_ENV_OVERWRITE #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 0ef2de33cc..cb857cdb4b 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -176,10 +176,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 c4db6f4b3c..a851fb41a8 100644 --- 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 4d8b4a03e1..3dc10b29c3 100644 --- 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 c798ca64bf..df13e3da53 100644 --- 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 1ab72cd00b..f17eea117f 100644 --- 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 60a902b2c7..2d1ede3bc8 100644 --- 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 79364d3437..399925a75b 100644 --- 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 2ec7642583..ce42289473 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3055,8 +3055,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 |