Skip to contentSkip to conversation

Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

PATCH New Alex Kiernan 8 participants 11 messages Apr 19, 2019 – Apr 30, 2019

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

This converts the following to Kconfig:
CONFIG_SUPPORT_EMMC_BOOT

---
Green travis build:

https://travis-ci.org/akiernan/u-boot/builds/521906850

Testing affected boards for configuration changes:

boards.cfg is up to date. Nothing to do.
Summary of 3 commits for 95 boards (4 threads, 1 job per thread) 01: Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx

     aarch64:  w+   xilinx_zynqmp_mini_emmc1 xilinx_zynqmp_mini_emmc0 xilinx_zynqmp_mini_qspi clearfog_gt_8k imx8qxp_mek xilinx_zynqmp_mini xilinx_zynqmp_mini_nand imx8mq_evk
         arm:  w+   cm_t54 cl-som-imx7 marsboard clearfog apalis_imx6 warp7 pico-hobbit-imx7d pico-pi-imx6ul dms-ba16 arndale riotboard pico-hobbit-imx6ul colibri_imx7 pico-imx7d xpress_spl opos6uldev warp7_bl33 imx6dl_mamoj ge_bx50v3 display5 mx7dsabresd_qspi display5_factory colibri_imx7_emmc gwventana_nand mx7dsabresd gwventana_gw5904 gwventana_emmc am57xx_hs_evm_usb omap5_uevm brppt1_spi xilinx_zynqmp_r5 vinco mx6sabresd warp riotboard_spl vining_2000 zc5601 zc5202 xpress pico-imx6ul dms-ba16-1g pico-pi-imx7d

02: configs: Resync with savedefconfig
03: Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

 README                                           | 3 ---
 configs/am57xx_evm_defconfig                     | 1 +
 configs/am57xx_hs_evm_defconfig                  | 1 +
 configs/am57xx_hs_evm_usb_defconfig              | 1 +
 configs/apalis-tk1_defconfig                     | 1 +
 configs/apalis_imx6_defconfig                    | 1 +
 configs/arndale_defconfig                        | 1 +
 configs/avnet_ultra96_rev1_defconfig             | 1 +
 configs/cl-som-imx7_defconfig                    | 1 +
 configs/clearfog_defconfig                       | 1 +
 configs/cm_t54_defconfig                         | 1 +
 configs/colibri_imx6_defconfig                   | 1 +
 configs/colibri_imx7_emmc_defconfig              | 1 +
 configs/display5_defconfig                       | 1 +
 configs/display5_factory_defconfig               | 1 +
 configs/dms-ba16-1g_defconfig                    | 1 +
 configs/dms-ba16_defconfig                       | 1 +
 configs/dra7xx_evm_defconfig                     | 1 +
 configs/dra7xx_hs_evm_defconfig                  | 1 +
 configs/dra7xx_hs_evm_usb_defconfig              | 1 +
 configs/edison_defconfig                         | 1 +
 configs/ge_bx50v3_defconfig                      | 1 +
 configs/gwventana_emmc_defconfig                 | 1 +
 configs/gwventana_gw5904_defconfig               | 1 +
 configs/gwventana_nand_defconfig                 | 1 +
 configs/imx6dl_mamoj_defconfig                   | 1 +
 configs/imx8mq_evk_defconfig                     | 1 +
 configs/imx8qxp_mek_defconfig                    | 1 +
 configs/liteboard_defconfig                      | 1 +
 configs/mt7623n_bpir2_defconfig                  | 1 +
 configs/mx6sabresd_defconfig                     | 1 +
 configs/mx7dsabresd_defconfig                    | 1 +
 configs/mx7dsabresd_qspi_defconfig               | 1 +
 configs/mx7ulp_evk_defconfig                     | 1 +
 configs/mx7ulp_evk_plugin_defconfig              | 1 +
 configs/odroid-xu3_defconfig                     | 1 +
 configs/omap5_uevm_defconfig                     | 1 +
 configs/opos6uldev_defconfig                     | 1 +
 configs/peach-pi_defconfig                       | 1 +
 configs/peach-pit_defconfig                      | 1 +
 configs/pico-hobbit-imx6ul_defconfig             | 1 +
 configs/pico-hobbit-imx7d_defconfig              | 1 +
 configs/pico-imx6ul_defconfig                    | 1 +
 configs/pico-imx7d_defconfig                     | 1 +
 configs/pico-pi-imx6ul_defconfig                 | 1 +
 configs/pico-pi-imx7d_defconfig                  | 1 +
 configs/riotboard_defconfig                      | 1 +
 configs/riotboard_spl_defconfig                  | 1 +
 configs/smdk5250_defconfig                       | 1 +
 configs/smdk5420_defconfig                       | 1 +
 configs/snow_defconfig                           | 1 +
 configs/spring_defconfig                         | 1 +
 configs/stm32mp15_basic_defconfig                | 1 +
 configs/stm32mp15_trusted_defconfig              | 1 +
 configs/uniphier_ld4_sld8_defconfig              | 1 +
 configs/uniphier_v7_defconfig                    | 1 +
 configs/uniphier_v8_defconfig                    | 1 +
 configs/vinco_defconfig                          | 1 +
 configs/vining_2000_defconfig                    | 1 +
 configs/warp7_bl33_defconfig                     | 1 +
 configs/warp7_defconfig                          | 1 +
 configs/warp_defconfig                           | 1 +
 configs/xilinx_zynqmp_mini_emmc0_defconfig       | 1 +
 configs/xilinx_zynqmp_mini_emmc1_defconfig       | 1 +
 configs/xilinx_zynqmp_zc1275_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
 configs/xilinx_zynqmp_zcu100_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu106_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu111_revA_defconfig      | 1 +
 configs/xpress_defconfig                         | 1 +
 configs/xpress_spl_defconfig                     | 1 +
 configs/zc5202_defconfig                         | 1 +
 configs/zc5601_defconfig                         | 1 +
 drivers/mmc/Kconfig                              | 6 ++++++
 include/configs/advantech_dms-ba16.h             | 2 --
 include/configs/am57xx_evm.h                     | 2 --
 include/configs/apalis-tk1.h                     | 3 ---
 include/configs/apalis_imx6.h                    | 2 --
 include/configs/arndale.h                        | 3 ---
 include/configs/brppt1.h                         | 5 -----
 include/configs/cl-som-imx7.h                    | 1 -
 include/configs/clearfog.h                       | 4 ----
 include/configs/cm_t54.h                         | 1 -
 include/configs/colibri_imx6.h                   | 2 --
 include/configs/colibri_imx7.h                   | 2 --
 include/configs/display5.h                       | 1 -
 include/configs/dra7xx_evm.h                     | 2 --
 include/configs/dragonboard410c.h                | 7 -------
 include/configs/edison.h                         | 1 -
 include/configs/embestmx6boards.h                | 1 -
 include/configs/exynos5-common.h                 | 1 -
 include/configs/ge_bx50v3.h                      | 3 ---
 include/configs/gw_ventana.h                     | 3 ---
 include/configs/imx6dl-mamoj.h                   | 1 -
 include/configs/imx8mq_evk.h                     | 1 -
 include/configs/imx8qxp_mek.h                    | 1 -
 include/configs/liteboard.h                      | 1 -
 include/configs/mt7623.h                         | 1 -
 include/configs/mx6sabresd.h                     | 2 --
 include/configs/mx7dsabresd.h                    | 1 -
 include/configs/mx7ulp_evk.h                     | 1 -
 include/configs/omap5_uevm.h                     | 1 -
 include/configs/opos6uldev.h                     | 3 ---
 include/configs/pico-imx6ul.h                    | 1 -
 include/configs/pico-imx7d.h                     | 1 -
 include/configs/stm32mp1.h                       | 1 -
 include/configs/uniphier.h                       | 3 ---
 include/configs/vinco.h                          | 1 -
 include/configs/vining_2000.h                    | 1 -
 include/configs/warp.h                           | 1 -
 include/configs/warp7.h                          | 1 -
 include/configs/xilinx_zynqmp.h                  | 4 ----
 include/configs/xpress.h                         | 1 -
 include/configs/zc5202.h                         | 2 --
 include/configs/zc5601.h                         | 2 --
 scripts/config_whitelist.txt                     | 1 -
 124 files changed, 86 insertions(+), 82 deletions(-)
README +0 -3
index a514f48caefc..c444959b662d 100644
@@ -1120,9 +1120,6 @@ The following options need to be configured:
 			CONFIG_SH_MMCIF_CLK
 			Define the clock frequency for MMCIF
 
-		CONFIG_SUPPORT_EMMC_BOOT
-		Enable some additional features of the eMMC boot partitions.
-
 - USB Device Firmware Update (DFU) class support:
 		CONFIG_DFU_OVER_USB
 		This enables the USB portion of the DFU USB class
configs/am57xx_evm_defconfig +1 -0
index 7a46e62ffb59..c17a7d32a8f9 100644
@@ -58,6 +58,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/am57xx_hs_evm_defconfig +1 -0
index 354c3c5c5ab1..0d0afed91604 100644
@@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/am57xx_hs_evm_usb_defconfig +1 -0
index 83b0110bcf40..812df8ffe45c 100644
@@ -62,6 +62,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/apalis-tk1_defconfig +1 -0
index d3ffbc736cef..5fd0b65b392b 100644
@@ -33,6 +33,7 @@ CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_I2C_TEGRA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_TEGRA124_MMC_DISABLE_EXT_LOOPBACK=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/apalis_imx6_defconfig +1 -0
index 2bc5de49011a..7d0736f2f52e 100644
@@ -57,6 +57,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/arndale_defconfig +1 -0
index 89ae6f224a5e..d0af2be0c9c2 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM_I2C_COMPAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/avnet_ultra96_rev1_defconfig +1 -0
index 15a682789350..924153081149 100644
@@ -55,6 +55,7 @@ CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/cl-som-imx7_defconfig +1 -0
index 1701895646dd..2bc668f8a978 100644
@@ -49,6 +49,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb"
 # CONFIG_ENV_IS_IN_MMC is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/clearfog_defconfig +1 -0
index 8f088419d20f..3ed74fdaac6c 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
configs/cm_t54_defconfig +1 -0
index 05ac37cc2503..31d011c7f311 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SCSI_AHCI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_CONS_INDEX=4
configs/colibri_imx6_defconfig +1 -0
index 6e3fc5955def..1c8613f0672c 100644
@@ -55,6 +55,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/colibri_imx7_emmc_defconfig +1 -0
index 5e2a204a881b..0617b120a05c 100644
@@ -45,6 +45,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/display5_defconfig +1 -0
index f22e1a1701a4..294ee93ea080 100644
@@ -62,6 +62,7 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0x020CC068
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
configs/display5_factory_defconfig +1 -0
index 54ec97c4c66c..c601425cfd09 100644
@@ -63,6 +63,7 @@ CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
configs/dms-ba16-1g_defconfig +1 -0
index eed0b67a1278..980f7b4abb62 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/dms-ba16_defconfig +1 -0
index d9f6d59874bf..bea75b5d23c9 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/dra7xx_evm_defconfig +1 -0
index bfc9d36b20e3..cd4c74f12f5c 100644
@@ -64,6 +64,7 @@ CONFIG_PCF8575_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/dra7xx_hs_evm_defconfig +1 -0
index 56dd35b39075..dfe443d71207 100644
@@ -68,6 +68,7 @@ CONFIG_PCF8575_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/dra7xx_hs_evm_usb_defconfig +1 -0
index 63e31dac3cb2..c9ad06778ac6 100644
@@ -69,6 +69,7 @@ CONFIG_PCF8575_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/edison_defconfig +1 -0
index 22fc84a41e38..b99906a4d144 100644
@@ -30,6 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CPU=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_RTC_MC146818=y
 CONFIG_USB_DWC3_GADGET=y
configs/ge_bx50v3_defconfig +1 -0
index eba37939f914..3111451162c1 100644
@@ -42,6 +42,7 @@ CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/gwventana_emmc_defconfig +1 -0
index 4cce2a02a032..9b6aa3bb0e59 100644
@@ -61,6 +61,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_PHYLIB=y
configs/gwventana_gw5904_defconfig +1 -0
index 7983d9a69db8..c812ff8d6628 100644
@@ -61,6 +61,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_PHYLIB=y
configs/gwventana_nand_defconfig +1 -0
index 5b4e807e5cc4..8557fed9253c 100644
@@ -63,6 +63,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
configs/imx6dl_mamoj_defconfig +1 -0
index 10e271c1f07f..53cd1750c3fa 100644
@@ -31,6 +31,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=2
 CONFIG_SYS_I2C_MXC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/imx8mq_evk_defconfig +1 -0
index 46100b671963..dc622b263d21 100644
@@ -28,6 +28,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_ETH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8M=y
configs/imx8qxp_mek_defconfig +1 -0
index a94998b8b524..574e9467c4b8 100644
@@ -51,6 +51,7 @@ CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_PHY_ATHEROS=y
configs/liteboard_defconfig +1 -0
index e4a2fcc7fbe5..f2fceb8f3ddb 100644
@@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_DM_ETH=y
configs/mt7623n_bpir2_defconfig +1 -0
index 5c411fe1d166..ae8209831b44 100644
@@ -35,6 +35,7 @@ CONFIG_SYSCON=y
 CONFIG_CLK=y
 CONFIG_DM_MMC=y
 # CONFIG_MMC_QUIRKS is not set
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_MMC_MTK=y
 CONFIG_PHY_FIXED=y
configs/mx6sabresd_defconfig +1 -0
index e5174bbe7845..746be0dcf8b4 100644
@@ -72,6 +72,7 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=2
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/mx7dsabresd_defconfig +1 -0
index 88d363a27e61..b2ca4f96ccdf 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/mx7dsabresd_qspi_defconfig +1 -0
index 3d74967432da..27a838787a7c 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/mx7ulp_evk_defconfig +1 -0
index 6bbacaa68618..d125ccc1af04 100644
@@ -21,6 +21,7 @@ CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7ULP=y
configs/mx7ulp_evk_plugin_defconfig +1 -0
index 549ca2e9643f..fcead94f57b3 100644
@@ -20,6 +20,7 @@ CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7ULP=y
configs/odroid-xu3_defconfig +1 -0
index 4ec4e5871c5d..b8ebd56bf9d3 100644
@@ -34,6 +34,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_ADC=y
 CONFIG_ADC_EXYNOS=y
 CONFIG_DFU_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x5000000
configs/omap5_uevm_defconfig +1 -0
index 84d4e2b37cdc..9af25fdf9891 100644
@@ -29,6 +29,7 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_CMD_TCA642X=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_CONS_INDEX=3
configs/opos6uldev_defconfig +1 -0
index 7dbeaf1044fb..cf5f52ccd874 100644
@@ -67,6 +67,7 @@ CONFIG_SYSCON=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_PWRSEQ=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/peach-pi_defconfig +1 -0
index f441d5eb9706..002d0969fe72 100644
@@ -37,6 +37,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/peach-pit_defconfig +1 -0
index f091d24f4f3a..33245efc55c6 100644
@@ -36,6 +36,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/pico-hobbit-imx6ul_defconfig +1 -0
index b5ac3a3b260e..0bfe0678a9c8 100644
@@ -44,6 +44,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/pico-hobbit-imx7d_defconfig +1 -0
index 59bc4249c7ed..24f69170a05e 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/pico-imx6ul_defconfig +1 -0
index f81b5a9692aa..366e3d381c59 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/pico-imx7d_defconfig +1 -0
index 3e870518610e..6ecd916ebd38 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/pico-pi-imx6ul_defconfig +1 -0
index d6c39e4f9de8..17b3ba328ea5 100644
@@ -44,6 +44,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/pico-pi-imx7d_defconfig +1 -0
index 20a34eb5627e..9e6f0ffa5432 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/riotboard_defconfig +1 -0
index da08bb89186b..6b0d7e58532e 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/riotboard_spl_defconfig +1 -0
index 65ab90614fe9..d30fc2f4ca83 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/smdk5250_defconfig +1 -0
index b9ab5192e929..bc34d21ca07a 100644
@@ -32,6 +32,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/smdk5420_defconfig +1 -0
index dc17e66a1729..6e555e562270 100644
@@ -27,6 +27,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/snow_defconfig +1 -0
index 43576f7fd7b0..2d34711dd887 100644
@@ -42,6 +42,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/spring_defconfig +1 -0
index 7ec9f674e561..7d4ae5ec08d4 100644
@@ -42,6 +42,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/stm32mp15_basic_defconfig +1 -0
index 6781adb81e73..88e1dfe96bc7 100644
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_STM32F7=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_STM32_SDMMC2=y
 CONFIG_PHY=y
 CONFIG_PHY_STM32_USBPHYC=y
configs/stm32mp15_trusted_defconfig +1 -0
index a050cee6918e..c416c8ca447c 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_I2C_STM32F7=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_STM32_SDMMC2=y
 CONFIG_PHY=y
 CONFIG_PHY_STM32_USBPHYC=y
configs/uniphier_ld4_sld8_defconfig +1 -0
index e69649f30915..3102ebf6507d 100644
@@ -39,6 +39,7 @@ CONFIG_GPIO_UNIPHIER=y
 CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/uniphier_v7_defconfig +1 -0
index 59ed7c2d74e4..75f8a7674ca9 100644
@@ -38,6 +38,7 @@ CONFIG_GPIO_UNIPHIER=y
 CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/uniphier_v8_defconfig +1 -0
index b0c673c98e59..83f78776b7d2 100644
@@ -34,6 +34,7 @@ CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_MMC_SDHCI=y
configs/vinco_defconfig +1 -0
index 5d929437bf35..745aa85f3b6d 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-vinco"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SF_DEFAULT_SPEED=50000000
configs/vining_2000_defconfig +1 -0
index 5347ac8fe851..073ff4832968 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/warp7_bl33_defconfig +1 -0
index 6eaf152bace6..8290c5a4dc91 100644
@@ -29,6 +29,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
configs/warp7_defconfig +1 -0
index efd8860d28f3..0a0862ccfdcb 100644
@@ -38,6 +38,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
configs/warp_defconfig +1 -0
index df43a7986978..a37d76929692 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
 # CONFIG_NET is not set
 CONFIG_DFU_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/xilinx_zynqmp_mini_emmc0_defconfig +1 -0
index d16ec756a99d..3c2ce615828c 100644
@@ -52,6 +52,7 @@ CONFIG_SPL_DM=y
 # CONFIG_DM_WARN is not set
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 # CONFIG_EFI_LOADER is not set
configs/xilinx_zynqmp_mini_emmc1_defconfig +1 -0
index 48b9b5d41d66..c347ef6eed34 100644
@@ -52,6 +52,7 @@ CONFIG_SPL_DM=y
 # CONFIG_DM_WARN is not set
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 # CONFIG_EFI_LOADER is not set
configs/xilinx_zynqmp_zc1275_revB_defconfig +1 -0
index aa44f0424337..5de861910cde 100644
@@ -37,6 +37,7 @@ CONFIG_CLK_ZYNQMP=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +1 -0
index bf141c5e168a..ce1ea089ce8d 100644
@@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +1 -0
index 439f89e50f3c..877f5b230da3 100644
@@ -49,6 +49,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_MTD_DEVICE=y
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +1 -0
index 6f14234a590e..7cd1c905f8b1 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +1 -0
index f1970aadf417..e42d401b54ea 100644
@@ -43,6 +43,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_PHY_MARVELL=y
configs/xilinx_zynqmp_zcu100_revC_defconfig +1 -0
index cd7d2f5376d2..90163001da9f 100644
@@ -55,6 +55,7 @@ CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +1 -0
index 371e6363db2f..62d23bf237c1 100644
@@ -70,6 +70,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_SDHCI=y
configs/xilinx_zynqmp_zcu102_revA_defconfig +1 -0
index a0fb6c3586cc..1fdee2fd384b 100644
@@ -71,6 +71,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu102_revB_defconfig +1 -0
index db7c093d5ebc..ccc72c52887e 100644
@@ -71,6 +71,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu104_revA_defconfig +1 -0
index eacf75d9f8e2..730640758a38 100644
@@ -56,6 +56,7 @@ CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu104_revC_defconfig +1 -0
index 1c9a6d6f1ec4..a4223ebdee54 100644
@@ -57,6 +57,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu106_revA_defconfig +1 -0
index 1b685ca04925..ed56ece40158 100644
@@ -66,6 +66,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu111_revA_defconfig +1 -0
index 74106d7ea8fa..13816205caea 100644
@@ -58,6 +58,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xpress_defconfig +1 -0
index 2cbeeb390087..709a7ef90842 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/xpress_spl_defconfig +1 -0
index cf4f0ed054a5..0026d60c2715 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/zc5202_defconfig +1 -0
index 3c35bed1820c..8d8d172d2112 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=3
configs/zc5601_defconfig +1 -0
index 2f5de909ca2e..02f8da8fbaf6 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=3
drivers/mmc/Kconfig +6 -0
index c34dd5d18790..e96e69370728 100644
@@ -78,6 +78,12 @@ config SUPPORT_EMMC_RPMB
 	  Enable support for reading, writing and programming the
 	  key for the Replay Protection Memory Block partition in eMMC.
 
+config SUPPORT_EMMC_BOOT
+	bool "Support some additional features of the eMMC boot partitions"
+	help
+	  Enable support for eMMC boot partitions. This also enables
+	  extensions within the mmc command.
+
 config MMC_IO_VOLTAGE
 	bool "Support IO voltage configuration"
 	help
include/configs/advantech_dms-ba16.h +0 -2
index 57edeee941e7..22d1e41bc8dc 100644
@@ -21,8 +21,6 @@
 #define CONFIG_LOADCMD "fatload"
 #define CONFIG_RFSPART "2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 #include "mx6_common.h"
 #include <linux/sizes.h>
 
include/configs/am57xx_evm.h +0 -2
index c14b010550fe..2c651aab178b 100644
@@ -63,8 +63,6 @@
 #define CONFIG_NET_RETRY_COUNT		10
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs longer aneg time at 1G */
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP
 
include/configs/apalis-tk1.h +0 -3
index 1d296ba51a05..9c8c8979f046 100644
@@ -18,9 +18,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
-/* SD/MMC support */
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
 #define CONFIG_ENV_OFFSET		(-CONFIG_ENV_SIZE + \
 					 CONFIG_TDX_CFG_BLOCK_OFFSET)
include/configs/apalis_imx6.h +0 -2
index 96169f55f08c..135a0d78287e 100644
@@ -46,8 +46,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	3
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /*
  * SATA Configs
  */
include/configs/arndale.h +0 -3
index 06b02ce90a94..dd321c4748d0 100644
@@ -14,9 +14,6 @@
 #include "exynos5250-common.h"
 #include <configs/exynos5-common.h>
 
-/* SD/MMC configuration */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
include/configs/brppt1.h +0 -5
index ae9b75bb87ad..1d30d4e38f76 100644
@@ -31,11 +31,6 @@
 /*#define CONFIG_MACH_TYPE		3589*/
 #define CONFIG_MACH_TYPE		0xFFFFFFFF /* TODO: check with kernel*/
 
-/* MMC/SD IP block */
-#if defined(CONFIG_EMMC_BOOT)
- #define CONFIG_SUPPORT_EMMC_BOOT
-#endif /* CONFIG_EMMC_BOOT */
-
 /*
  * When we have NAND flash we expect to be making use of mtdparts,
  * both for ease of use in U-Boot and for passing information on to
include/configs/cl-som-imx7.h +0 -1
index 26d1a97891d8..4c93fc6cbea2 100644
@@ -153,7 +153,6 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2" /* USDHC1 */
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #endif
 
 /* USB Configs */
include/configs/clearfog.h +0 -4
index 9f8d3cc9e5e8..d8bd59cc070b 100644
@@ -26,10 +26,6 @@
  */
 #define CONFIG_SYS_MMC_BASE		MVEBU_SDIO_BASE
 
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
-#endif
-
 /* USB/EHCI configuration */
 #define CONFIG_EHCI_IS_TDI
 
include/configs/cm_t54.h +0 -1
index cda1b5528ffa..2387f864e32b 100644
@@ -41,7 +41,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* SATA Boot related defines */
 #define CONFIG_SPL_SATA_BOOT_DEVICE		0
include/configs/colibri_imx6.h +0 -2
index 803c9be0646b..acb79afb039c 100644
@@ -44,8 +44,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /* Network */
 #define CONFIG_FEC_MXC
 #define IMX_FEC_BASE			ENET_BASE_ADDR
include/configs/colibri_imx7.h +0 -2
index 5a4b9801cb77..7dfc92c085b9 100644
@@ -35,8 +35,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	1
 #elif CONFIG_TARGET_COLIBRI_IMX7_EMMC
 #define CONFIG_SYS_FSL_USDHC_NUM	2
-
-#define CONFIG_SUPPORT_EMMC_BOOT
 #endif
 
 #undef CONFIG_BOOTM_PLAN9
include/configs/display5.h +0 -1
index 8ab47abfa85d..8829cbad913c 100644
@@ -83,7 +83,6 @@
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	2
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
include/configs/dra7xx_evm.h +0 -2
index f6be6595fe3c..aec70ee7182d 100644
@@ -96,8 +96,6 @@
 /* SPI SPL */
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP
 
include/configs/dragonboard410c.h +0 -7
index cf021083ae28..7155ebac5c24 100644
@@ -31,13 +31,6 @@
  * it has to be done after each HCD reset */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
-/* Support all possible USB ethernet dongles */
-
-/* Extra Commands */
-/* Enable that for switching of boot partitions */
-/* Disabled by default as some sub-commands can brick eMMC */
-/*#define CONFIG_SUPPORT_EMMC_BOOT */
-
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
include/configs/edison.h +0 -1
index a6155ba5a8b9..218b50a1d9bb 100644
@@ -34,7 +34,6 @@
 #define CONFIG_ENV_SIZE				(64 * 1024)
 #define CONFIG_ENV_OFFSET			(3 * 1024 * 1024)
 #define CONFIG_ENV_OFFSET_REDUND		(6 * 1024 * 1024)
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* RTC */
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS	0
include/configs/embestmx6boards.h +0 -1
index 858bed012c63..8bc7a3ad2e13 100644
@@ -76,7 +76,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	3
 #define CONFIG_SYS_MMC_ENV_DEV		2	/* SDHC4 */
 #define CONFIG_ENV_OFFSET		(6 * 64 * 1024)
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 /* MarSBoard */
 #define CONFIG_FDTFILE	"imx6q-marsboard.dtb"
include/configs/exynos5-common.h +0 -1
index db1fc934bbba..397bbf6d9d30 100644
@@ -44,7 +44,6 @@
 
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR	0x02020030
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* specific .lds file */
 
include/configs/ge_bx50v3.h +0 -3
index 196f114c60e8..0481ed06a91f 100644
@@ -19,9 +19,6 @@
 #define CONFIG_MXC_UART_BASE	UART3_BASE
 #define CONSOLE_DEV	"ttymxc2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
-
 #include "mx6_common.h"
 #include <linux/sizes.h>
 
include/configs/gw_ventana.h +0 -3
index 93608e5aec4d..02ceb4c8fc8b 100644
@@ -81,9 +81,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-/* eMMC Configs */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /*
  * SATA Configs
  */
include/configs/imx6dl-mamoj.h +0 -1
index 030dbedce81b..7605e145c2f3 100644
@@ -51,7 +51,6 @@
 
 /* MMC */
 #define CONFIG_SYS_MMC_ENV_DEV		2
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Ethernet */
 #define CONFIG_FEC_MXC_PHYADDR		1
include/configs/imx8mq_evk.h +0 -1
index 6094d1bf1800..35c1b65079e1 100644
@@ -225,7 +225,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #define CONFIG_MXC_GPIO
include/configs/imx8qxp_mek.h +0 -1
index 312e30dc6c18..3259febdb94f 100644
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 #define USDHC1_BASE_ADDR                0x5B010000
 #define USDHC2_BASE_ADDR                0x5B020000
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 
 #define CONFIG_ENV_OVERWRITE
 
include/configs/liteboard.h +0 -1
index a97ccb50b2ff..975f32474c4a 100644
@@ -24,7 +24,6 @@
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 #endif
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
include/configs/mt7623.h +0 -1
index e449364ad48a..5f67893f3127 100644
@@ -42,7 +42,6 @@
 
 /* MMC */
 #define MMC_SUPPORTS_TUNING
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* DRAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
include/configs/mx6sabresd.h +0 -2
index 555942a2c2ab..ec1537541aea 100644
@@ -16,8 +16,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONSOLE_DEV		"ttymxc0"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "mx6sabre_common.h"
 
 /* Falcon Mode */
include/configs/mx7dsabresd.h +0 -1
index 39d29de74468..77856a8f3a47 100644
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED		100000
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #ifdef CONFIG_IMX_BOOTAUX
include/configs/mx7ulp_evk.h +0 -1
index b8dcaa10361d..5bd63929735e 100644
@@ -28,7 +28,6 @@
 #define IOMUXC_BASE_ADDR		IOMUXC1_RBASE
 
 #define CONFIG_FSL_USDHC
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 
 #define CONFIG_SYS_FSL_USDHC_NUM        1
 
include/configs/omap5_uevm.h +0 -1
index 66bd288040c1..0d8f945349dc 100644
@@ -39,7 +39,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
 #define CONFIG_TCA642X
include/configs/opos6uldev.h +0 -3
index 70cf4665df37..e0c76ff43daa 100644
@@ -33,9 +33,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/pico-imx6ul.h +0 -1
index 050f69801b47..cd051bf263f8 100644
@@ -41,7 +41,6 @@
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/pico-imx7d.h +0 -1
index 0f6d6b789454..0fcecacc0e98 100644
@@ -58,7 +58,6 @@
 	"bootmenu_1=Boot using PICO-Pi baseboard=" \
 		"setenv fdtfile imx7d-pico-pi.dtb\0" \
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/stm32mp1.h +0 -1
index 737dfd6a5c2a..546d7bc88029 100644
@@ -78,7 +78,6 @@
 
 /*MMC SD*/
 #define CONFIG_SYS_MMC_MAX_DEVICE	3
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /*****************************************************************************/
 #ifdef CONFIG_DISTRO_DEFAULTS
include/configs/uniphier.h +0 -3
index 1e509ce9ad7b..3edff50a86be 100644
@@ -94,9 +94,6 @@
 #define CONFIG_SYS_NAND_DATA_BASE			0x68000000
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS			0
 
-/* SD/MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_SDRAM_BASE + 0x01000000)
include/configs/vinco.h +0 -1
index ec22a30cda12..eebb3f7ca789 100644
@@ -43,7 +43,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI			0xfc000000
 #define CONFIG_SYS_MMC_CLK_OD		500000
include/configs/vining_2000.h +0 -1
index d3cbdc6f2e49..fd98c1417e70 100644
@@ -95,7 +95,6 @@
 #define CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
 
 #ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
 #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 */
include/configs/warp.h +0 -1
index 9aa8a48d3d85..5345f5314d66 100644
@@ -23,7 +23,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Watchdog */
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
include/configs/warp7.h +0 -1
index 043f2861b62d..82c483999031 100644
@@ -31,7 +31,6 @@
 
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
include/configs/xilinx_zynqmp.h +0 -4
index 91ae7088a50a..5759b44d2695 100644
@@ -47,10 +47,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_MAY_FAIL
 
-#if defined(CONFIG_MMC_SDHCI_ZYNQ)
-# define CONFIG_SUPPORT_EMMC_BOOT
-#endif
-
 #ifdef CONFIG_NAND_ARASAN
 # define CONFIG_SYS_MAX_NAND_DEVICE	1
 # define CONFIG_SYS_NAND_ONFI_DETECTION
include/configs/xpress.h +0 -1
index 08e0ca0c8f15..4cbf8aa5261d 100644
@@ -21,7 +21,6 @@
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 
 /* I2C configs */
 #define CONFIG_SYS_I2C
include/configs/zc5202.h +0 -2
index 40d33f7830a5..77ff04754bc9 100644
@@ -12,8 +12,6 @@
 #define CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "el6x_common.h"
 
 /* Ethernet */
include/configs/zc5601.h +0 -2
index b9673e2c0651..e4fe7a462d23 100644
@@ -13,8 +13,6 @@
 #define CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p1"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "el6x_common.h"
 
 /* Ethernet */
scripts/config_whitelist.txt +0 -1
index 5092c3fb4ce5..78ccef49fd11 100644
@@ -1940,7 +1940,6 @@ CONFIG_ST_SMI
 CONFIG_SUNXI_GPIO
 CONFIG_SUNXI_MAX_FB_SIZE
 CONFIG_SUPERH_ON_CHIP_R8A66597
-CONFIG_SUPPORT_EMMC_BOOT
 CONFIG_SUVD3
 CONFIG_SXNI855T
 CONFIG_SYSFLAGS_ADDR
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

Hi Alex,

Quoted 11 lines

This converts the following to Kconfig:
CONFIG_SUPPORT_EMMC_BOOT

---
Green travis build:

https://travis-ci.org/akiernan/u-boot/builds/521906850

Testing affected boards for configuration changes:

Quoted 15 lines

boards.cfg is up to date. Nothing to do.
Summary of 3 commits for 95 boards (4 threads, 1 job per thread) 01: Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx
aarch64: w+ xilinx_zynqmp_mini_emmc1 xilinx_zynqmp_mini_emmc0
xilinx_zynqmp_mini_qspi clearfog_gt_8k imx8qxp_mek xilinx_zynqmp_mini
xilinx_zynqmp_mini_nand imx8mq_evk arm: w+ cm_t54 cl-som-imx7
marsboard clearfog apalis_imx6 warp7 pico-hobbit-imx7d pico-pi-imx6ul dms-ba16 arndale riotboard pico-hobbit-imx6ul colibri_imx7 pico-imx7d xpress_spl opos6uldev warp7_bl33 imx6dl_mamoj ge_bx50v3 display5 mx7dsabresd_qspi display5_factory colibri_imx7_emmc gwventana_nand mx7dsabresd gwventana_gw5904 gwventana_emmc am57xx_hs_evm_usb omap5_uevm brppt1_spi xilinx_zynqmp_r5 vinco mx6sabresd warp riotboard_spl vining_2000 zc5601 zc5202 xpress pico-imx6ul dms-ba16-1g pico-pi-imx7d 02: configs: Resync with savedefconfig 03:
Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

Quoted 1,653 lines
 README                                           | 3 ---
 configs/am57xx_evm_defconfig                     | 1 +
 configs/am57xx_hs_evm_defconfig                  | 1 +
 configs/am57xx_hs_evm_usb_defconfig              | 1 +
 configs/apalis-tk1_defconfig                     | 1 +
 configs/apalis_imx6_defconfig                    | 1 +
 configs/arndale_defconfig                        | 1 +
 configs/avnet_ultra96_rev1_defconfig             | 1 +
 configs/cl-som-imx7_defconfig                    | 1 +
 configs/clearfog_defconfig                       | 1 +
 configs/cm_t54_defconfig                         | 1 +
 configs/colibri_imx6_defconfig                   | 1 +
 configs/colibri_imx7_emmc_defconfig              | 1 +
 configs/display5_defconfig                       | 1 +
 configs/display5_factory_defconfig               | 1 +
 configs/dms-ba16-1g_defconfig                    | 1 +
 configs/dms-ba16_defconfig                       | 1 +
 configs/dra7xx_evm_defconfig                     | 1 +
 configs/dra7xx_hs_evm_defconfig                  | 1 +
 configs/dra7xx_hs_evm_usb_defconfig              | 1 +
 configs/edison_defconfig                         | 1 +
 configs/ge_bx50v3_defconfig                      | 1 +
 configs/gwventana_emmc_defconfig                 | 1 +
 configs/gwventana_gw5904_defconfig               | 1 +
 configs/gwventana_nand_defconfig                 | 1 +
 configs/imx6dl_mamoj_defconfig                   | 1 +
 configs/imx8mq_evk_defconfig                     | 1 +
 configs/imx8qxp_mek_defconfig                    | 1 +
 configs/liteboard_defconfig                      | 1 +
 configs/mt7623n_bpir2_defconfig                  | 1 +
 configs/mx6sabresd_defconfig                     | 1 +
 configs/mx7dsabresd_defconfig                    | 1 +
 configs/mx7dsabresd_qspi_defconfig               | 1 +
 configs/mx7ulp_evk_defconfig                     | 1 +
 configs/mx7ulp_evk_plugin_defconfig              | 1 +
 configs/odroid-xu3_defconfig                     | 1 +
 configs/omap5_uevm_defconfig                     | 1 +
 configs/opos6uldev_defconfig                     | 1 +
 configs/peach-pi_defconfig                       | 1 +
 configs/peach-pit_defconfig                      | 1 +
 configs/pico-hobbit-imx6ul_defconfig             | 1 +
 configs/pico-hobbit-imx7d_defconfig              | 1 +
 configs/pico-imx6ul_defconfig                    | 1 +
 configs/pico-imx7d_defconfig                     | 1 +
 configs/pico-pi-imx6ul_defconfig                 | 1 +
 configs/pico-pi-imx7d_defconfig                  | 1 +
 configs/riotboard_defconfig                      | 1 +
 configs/riotboard_spl_defconfig                  | 1 +
 configs/smdk5250_defconfig                       | 1 +
 configs/smdk5420_defconfig                       | 1 +
 configs/snow_defconfig                           | 1 +
 configs/spring_defconfig                         | 1 +
 configs/stm32mp15_basic_defconfig                | 1 +
 configs/stm32mp15_trusted_defconfig              | 1 +
 configs/uniphier_ld4_sld8_defconfig              | 1 +
 configs/uniphier_v7_defconfig                    | 1 +
 configs/uniphier_v8_defconfig                    | 1 +
 configs/vinco_defconfig                          | 1 +
 configs/vining_2000_defconfig                    | 1 +
 configs/warp7_bl33_defconfig                     | 1 +
 configs/warp7_defconfig                          | 1 +
 configs/warp_defconfig                           | 1 +
 configs/xilinx_zynqmp_mini_emmc0_defconfig       | 1 +
 configs/xilinx_zynqmp_mini_emmc1_defconfig       | 1 +
 configs/xilinx_zynqmp_zc1275_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
 configs/xilinx_zynqmp_zcu100_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu106_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu111_revA_defconfig      | 1 +
 configs/xpress_defconfig                         | 1 +
 configs/xpress_spl_defconfig                     | 1 +
 configs/zc5202_defconfig                         | 1 +
 configs/zc5601_defconfig                         | 1 +
 drivers/mmc/Kconfig                              | 6 ++++++
 include/configs/advantech_dms-ba16.h             | 2 --
 include/configs/am57xx_evm.h                     | 2 --
 include/configs/apalis-tk1.h                     | 3 ---
 include/configs/apalis_imx6.h                    | 2 --
 include/configs/arndale.h                        | 3 ---
 include/configs/brppt1.h                         | 5 -----
 include/configs/cl-som-imx7.h                    | 1 -
 include/configs/clearfog.h                       | 4 ----
 include/configs/cm_t54.h                         | 1 -
 include/configs/colibri_imx6.h                   | 2 --
 include/configs/colibri_imx7.h                   | 2 --
 include/configs/display5.h                       | 1 -
 include/configs/dra7xx_evm.h                     | 2 --
 include/configs/dragonboard410c.h                | 7 -------
 include/configs/edison.h                         | 1 -
 include/configs/embestmx6boards.h                | 1 -
 include/configs/exynos5-common.h                 | 1 -
 include/configs/ge_bx50v3.h                      | 3 ---
 include/configs/gw_ventana.h                     | 3 ---
 include/configs/imx6dl-mamoj.h                   | 1 -
 include/configs/imx8mq_evk.h                     | 1 -
 include/configs/imx8qxp_mek.h                    | 1 -
 include/configs/liteboard.h                      | 1 -
 include/configs/mt7623.h                         | 1 -
 include/configs/mx6sabresd.h                     | 2 --
 include/configs/mx7dsabresd.h                    | 1 -
 include/configs/mx7ulp_evk.h                     | 1 -
 include/configs/omap5_uevm.h                     | 1 -
 include/configs/opos6uldev.h                     | 3 ---
 include/configs/pico-imx6ul.h                    | 1 -
 include/configs/pico-imx7d.h                     | 1 -
 include/configs/stm32mp1.h                       | 1 -
 include/configs/uniphier.h                       | 3 ---
 include/configs/vinco.h                          | 1 -
 include/configs/vining_2000.h                    | 1 -
 include/configs/warp.h                           | 1 -
 include/configs/warp7.h                          | 1 -
 include/configs/xilinx_zynqmp.h                  | 4 ----
 include/configs/xpress.h                         | 1 -
 include/configs/zc5202.h                         | 2 --
 include/configs/zc5601.h                         | 2 --
 scripts/config_whitelist.txt                     | 1 -
 124 files changed, 86 insertions(+), 82 deletions(-)
README +0 -2
index a514f48caefc..c444959b662d 100644
@@ -1120,9 +1120,6 @@ The following options need to be configured:
 			CONFIG_SH_MMCIF_CLK
 			Define the clock frequency for MMCIF
 
-		CONFIG_SUPPORT_EMMC_BOOT
-		Enable some additional features of the eMMC boot

partitions. -
- USB Device Firmware Update (DFU) class support:

README +0 -0
 		CONFIG_DFU_OVER_USB
 		This enables the USB portion of the DFU USB class
(quoted diff) +0 -0

b/configs/am57xx_evm_defconfig index 7a46e62ffb59..c17a7d32a8f9 100644

configs/am57xx_evm_defconfig +1 -0
@@ -58,6 +58,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/am57xx_hs_evm_defconfig index 354c3c5c5ab1..0d0afed91604 100644 --- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig

configs/am57xx_evm_defconfig +1 -0
@@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/am57xx_hs_evm_usb_defconfig index 83b0110bcf40..812df8ffe45c 100644 --- a/configs/am57xx_hs_evm_usb_defconfig +++ b/configs/am57xx_hs_evm_usb_defconfig @@ -62,6 +62,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y
CONFIG_MISC=y
CONFIG_DM_MMC=y

configs/am57xx_evm_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/apalis-tk1_defconfig index d3ffbc736cef..5fd0b65b392b 100644

configs/apalis-tk1_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_I2C_TEGRA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_TEGRA124_MMC_DISABLE_EXT_LOOPBACK=y
 CONFIG_E1000=y
 CONFIG_PCI=y
(quoted diff) +0 -0

b/configs/apalis_imx6_defconfig index 2bc5de49011a..7d0736f2f52e 100644 --- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig

configs/apalis_imx6_defconfig +1 -0
@@ -57,6 +57,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/arndale_defconfig +1 -0
index 89ae6f224a5e..d0af2be0c9c2 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM_I2C_COMPAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
(quoted diff) +0 -0

b/configs/avnet_ultra96_rev1_defconfig index 15a682789350..924153081149 100644 --- a/configs/avnet_ultra96_rev1_defconfig +++ b/configs/avnet_ultra96_rev1_defconfig @@ -55,6 +55,7 @@ CONFIG_I2C_MUX_PCA954x=y CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_MISC=y

configs/avnet_ultra96_rev1_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/cl-som-imx7_defconfig index 1701895646dd..2bc668f8a978 100644 --- a/configs/cl-som-imx7_defconfig
+++ b/configs/cl-som-imx7_defconfig

configs/cl-som-imx7_defconfig +1 -0
@@ -49,6 +49,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb"
 # CONFIG_ENV_IS_IN_MMC is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/clearfog_defconfig +1 -0
index 8f088419d20f..3ed74fdaac6c 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
configs/cm_t54_defconfig +1 -0
index 05ac37cc2503..31d011c7f311 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SCSI_AHCI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_CONS_INDEX=4
(quoted diff) +0 -0

b/configs/colibri_imx6_defconfig index 6e3fc5955def..1c8613f0672c 100644 --- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig

configs/apalis_imx6_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
(quoted diff) +0 -0

b/configs/colibri_imx7_emmc_defconfig index 5e2a204a881b..0617b120a05c 100644 --- a/configs/colibri_imx7_emmc_defconfig +++ b/configs/colibri_imx7_emmc_defconfig @@ -45,6 +45,7 @@ CONFIG_DFU_MMC=y CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y

configs/apalis_imx6_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/display5_defconfig +1 -0
index f22e1a1701a4..294ee93ea080 100644
@@ -62,6 +62,7 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0x020CC068
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/display5_factory_defconfig index 54ec97c4c66c..c601425cfd09 100644 --- a/configs/display5_factory_defconfig
+++ b/configs/display5_factory_defconfig

configs/display5_factory_defconfig +1 -0
@@ -63,6 +63,7 @@ CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/dms-ba16-1g_defconfig index eed0b67a1278..980f7b4abb62 100644 --- a/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig

configs/dms-ba16-1g_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/dms-ba16_defconfig +1 -0
index d9f6d59874bf..bea75b5d23c9 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
(quoted diff) +0 -0

b/configs/dra7xx_evm_defconfig index bfc9d36b20e3..cd4c74f12f5c 100644

configs/dra7xx_evm_defconfig +1 -0
@@ -64,6 +64,7 @@ CONFIG_PCF8575_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
(quoted diff) +0 -0

b/configs/dra7xx_hs_evm_defconfig index 56dd35b39075..dfe443d71207 100644 --- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig

configs/dra7xx_evm_defconfig +1 -0
@@ -68,6 +68,7 @@ CONFIG_PCF8575_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
(quoted diff) +0 -0

b/configs/dra7xx_hs_evm_usb_defconfig index 63e31dac3cb2..c9ad06778ac6 100644 --- a/configs/dra7xx_hs_evm_usb_defconfig +++ b/configs/dra7xx_hs_evm_usb_defconfig @@ -69,6 +69,7 @@ CONFIG_PCF8575_GPIO=y CONFIG_DM_I2C=y
CONFIG_MISC=y
CONFIG_DM_MMC=y

configs/dra7xx_evm_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/edison_defconfig +1 -0
index 22fc84a41e38..b99906a4d144 100644
@@ -30,6 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CPU=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_RTC_MC146818=y
 CONFIG_USB_DWC3_GADGET=y
configs/ge_bx50v3_defconfig +1 -0
index eba37939f914..3111451162c1 100644
@@ -42,6 +42,7 @@ CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/gwventana_emmc_defconfig index 4cce2a02a032..9b6aa3bb0e59 100644 --- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig

configs/gwventana_emmc_defconfig +1 -0
@@ -61,6 +61,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_PHYLIB=y
(quoted diff) +0 -0

b/configs/gwventana_gw5904_defconfig index 7983d9a69db8..c812ff8d6628 100644 --- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig

configs/gwventana_emmc_defconfig +1 -0
@@ -61,6 +61,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_PHYLIB=y
(quoted diff) +0 -0

b/configs/gwventana_nand_defconfig index 5b4e807e5cc4..8557fed9253c 100644 --- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig

configs/gwventana_nand_defconfig +1 -0
@@ -63,6 +63,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
(quoted diff) +0 -0

b/configs/imx6dl_mamoj_defconfig index 10e271c1f07f..53cd1750c3fa 100644 --- a/configs/imx6dl_mamoj_defconfig
+++ b/configs/imx6dl_mamoj_defconfig

configs/imx6dl_mamoj_defconfig +1 -0
@@ -31,6 +31,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=2
 CONFIG_SYS_I2C_MXC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
(quoted diff) +0 -0

b/configs/imx8mq_evk_defconfig index 46100b671963..dc622b263d21 100644

configs/imx8mq_evk_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_ETH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8M=y
(quoted diff) +0 -0

b/configs/imx8qxp_mek_defconfig index a94998b8b524..574e9467c4b8 100644 --- a/configs/imx8qxp_mek_defconfig
+++ b/configs/imx8qxp_mek_defconfig

configs/imx8qxp_mek_defconfig +1 -0
@@ -51,6 +51,7 @@ CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_PHY_ATHEROS=y
configs/liteboard_defconfig +1 -0
index e4a2fcc7fbe5..f2fceb8f3ddb 100644
@@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_DM_ETH=y
(quoted diff) +0 -0

b/configs/mt7623n_bpir2_defconfig index 5c411fe1d166..ae8209831b44 100644 --- a/configs/mt7623n_bpir2_defconfig
+++ b/configs/mt7623n_bpir2_defconfig

configs/mt7623n_bpir2_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_SYSCON=y
 CONFIG_CLK=y
 CONFIG_DM_MMC=y
 # CONFIG_MMC_QUIRKS is not set
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_MMC_MTK=y
 CONFIG_PHY_FIXED=y
(quoted diff) +0 -0

b/configs/mx6sabresd_defconfig index e5174bbe7845..746be0dcf8b4 100644

configs/mx6sabresd_defconfig +1 -0
@@ -72,6 +72,7 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=2
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/mx7dsabresd_defconfig index 88d363a27e61..b2ca4f96ccdf 100644 --- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig

configs/mx7dsabresd_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
(quoted diff) +0 -0

b/configs/mx7dsabresd_qspi_defconfig index 3d74967432da..27a838787a7c 100644 --- a/configs/mx7dsabresd_qspi_defconfig
+++ b/configs/mx7dsabresd_qspi_defconfig

configs/mx7dsabresd_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
(quoted diff) +0 -0

b/configs/mx7ulp_evk_defconfig index 6bbacaa68618..d125ccc1af04 100644

configs/mx7ulp_evk_defconfig +1 -0
@@ -21,6 +21,7 @@ CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7ULP=y
(quoted diff) +0 -0

b/configs/mx7ulp_evk_plugin_defconfig index 549ca2e9643f..fcead94f57b3 100644 --- a/configs/mx7ulp_evk_plugin_defconfig +++ b/configs/mx7ulp_evk_plugin_defconfig @@ -20,6 +20,7 @@ CONFIG_IMX_RGPIO2P=y # CONFIG_MXC_GPIO is not set
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y

configs/mx7ulp_evk_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7ULP=y
(quoted diff) +0 -0

b/configs/odroid-xu3_defconfig index 4ec4e5871c5d..b8ebd56bf9d3 100644

configs/odroid-xu3_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_ADC=y
 CONFIG_ADC_EXYNOS=y
 CONFIG_DFU_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x5000000
(quoted diff) +0 -0

b/configs/omap5_uevm_defconfig index 84d4e2b37cdc..9af25fdf9891 100644

configs/omap5_uevm_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_CMD_TCA642X=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_CONS_INDEX=3
(quoted diff) +0 -0

b/configs/opos6uldev_defconfig index 7dbeaf1044fb..cf5f52ccd874 100644

configs/opos6uldev_defconfig +1 -0
@@ -67,6 +67,7 @@ CONFIG_SYSCON=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_PWRSEQ=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/peach-pi_defconfig +1 -0
index f441d5eb9706..002d0969fe72 100644
@@ -37,6 +37,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/peach-pit_defconfig +1 -0
index f091d24f4f3a..33245efc55c6 100644
@@ -36,6 +36,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
(quoted diff) +0 -0

b/configs/pico-hobbit-imx6ul_defconfig index b5ac3a3b260e..0bfe0678a9c8 100644 --- a/configs/pico-hobbit-imx6ul_defconfig +++ b/configs/pico-hobbit-imx6ul_defconfig @@ -44,6 +44,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y

configs/apalis_imx6_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
(quoted diff) +0 -0

b/configs/pico-hobbit-imx7d_defconfig index 59bc4249c7ed..24f69170a05e 100644 --- a/configs/pico-hobbit-imx7d_defconfig +++ b/configs/pico-hobbit-imx7d_defconfig @@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000 CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

configs/pico-hobbit-imx7d_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
(quoted diff) +0 -0

b/configs/pico-imx6ul_defconfig index f81b5a9692aa..366e3d381c59 100644 --- a/configs/pico-imx6ul_defconfig
+++ b/configs/pico-imx6ul_defconfig

configs/apalis_imx6_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
(quoted diff) +0 -0

b/configs/pico-imx7d_defconfig index 3e870518610e..6ecd916ebd38 100644

configs/pico-imx7d_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
(quoted diff) +0 -0

b/configs/pico-pi-imx6ul_defconfig index d6c39e4f9de8..17b3ba328ea5 100644 --- a/configs/pico-pi-imx6ul_defconfig
+++ b/configs/pico-pi-imx6ul_defconfig

configs/apalis_imx6_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
(quoted diff) +0 -0

b/configs/pico-pi-imx7d_defconfig index 20a34eb5627e..9e6f0ffa5432 100644 --- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig

configs/pico-hobbit-imx7d_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/riotboard_defconfig +1 -0
index da08bb89186b..6b0d7e58532e 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
(quoted diff) +0 -0

b/configs/riotboard_spl_defconfig index 65ab90614fe9..d30fc2f4ca83 100644 --- a/configs/riotboard_spl_defconfig
+++ b/configs/riotboard_spl_defconfig

configs/riotboard_defconfig +1 -0
@@ -30,6 +30,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/smdk5250_defconfig +1 -0
index b9ab5192e929..bc34d21ca07a 100644
@@ -32,6 +32,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/smdk5420_defconfig +1 -0
index dc17e66a1729..6e555e562270 100644
@@ -27,6 +27,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/snow_defconfig +1 -0
index 43576f7fd7b0..2d34711dd887 100644
@@ -42,6 +42,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/spring_defconfig +1 -0
index 7ec9f674e561..7d4ae5ec08d4 100644
@@ -42,6 +42,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
(quoted diff) +0 -0

b/configs/stm32mp15_basic_defconfig index 6781adb81e73..88e1dfe96bc7 100644 --- a/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfig

configs/stm32mp15_basic_defconfig +1 -0
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_STM32F7=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_STM32_SDMMC2=y
 CONFIG_PHY=y
 CONFIG_PHY_STM32_USBPHYC=y
(quoted diff) +0 -0

b/configs/stm32mp15_trusted_defconfig index a050cee6918e..c416c8ca447c 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -45,6 +45,7 @@ CONFIG_SYS_I2C_STM32F7=y CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_DM_MMC=y

configs/stm32mp15_basic_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_STM32_SDMMC2=y
 CONFIG_PHY=y
 CONFIG_PHY_STM32_USBPHYC=y
(quoted diff) +0 -0

b/configs/uniphier_ld4_sld8_defconfig index e69649f30915..3102ebf6507d 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -39,6 +39,7 @@ CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y
CONFIG_I2C_EEPROM=y CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10

configs/uniphier_ld4_sld8_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
(quoted diff) +0 -0

b/configs/uniphier_v7_defconfig index 59ed7c2d74e4..75f8a7674ca9 100644 --- a/configs/uniphier_v7_defconfig
+++ b/configs/uniphier_v7_defconfig

configs/uniphier_ld4_sld8_defconfig +1 -0
@@ -38,6 +38,7 @@ CONFIG_GPIO_UNIPHIER=y
 CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
(quoted diff) +0 -0

b/configs/uniphier_v8_defconfig index b0c673c98e59..83f78776b7d2 100644 --- a/configs/uniphier_v8_defconfig
+++ b/configs/uniphier_v8_defconfig

configs/uniphier_v8_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_MMC_SDHCI=y
configs/vinco_defconfig +1 -0
index 5d929437bf35..745aa85f3b6d 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-vinco"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SF_DEFAULT_SPEED=50000000
(quoted diff) +0 -0

b/configs/vining_2000_defconfig index 5347ac8fe851..073ff4832968 100644 --- a/configs/vining_2000_defconfig
+++ b/configs/vining_2000_defconfig

configs/vining_2000_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
(quoted diff) +0 -0

b/configs/warp7_bl33_defconfig index 6eaf152bace6..8290c5a4dc91 100644

configs/warp7_bl33_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
configs/warp7_defconfig +1 -0
index efd8860d28f3..0a0862ccfdcb 100644
@@ -38,6 +38,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
configs/warp_defconfig +1 -0
index df43a7986978..a37d76929692 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
 # CONFIG_NET is not set
 CONFIG_DFU_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_mini_emmc0_defconfig index d16ec756a99d..3c2ce615828c 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -52,6 +52,7 @@ CONFIG_SPL_DM=y # CONFIG_DM_WARN is not set
# CONFIG_DM_DEVICE_REMOVE is not set CONFIG_SPL_DM_SEQ_ALIAS=y

configs/xilinx_zynqmp_mini_emmc0_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 # CONFIG_EFI_LOADER is not set
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_mini_emmc1_defconfig index 48b9b5d41d66..c347ef6eed34 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -52,6 +52,7 @@ CONFIG_SPL_DM=y # CONFIG_DM_WARN is not set
# CONFIG_DM_DEVICE_REMOVE is not set CONFIG_SPL_DM_SEQ_ALIAS=y

configs/xilinx_zynqmp_mini_emmc0_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 # CONFIG_EFI_LOADER is not set
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zc1275_revB_defconfig index aa44f0424337..5de861910cde 100644 --- a/configs/xilinx_zynqmp_zc1275_revB_defconfig +++ b/configs/xilinx_zynqmp_zc1275_revB_defconfig @@ -37,6 +37,7 @@ CONFIG_CLK_ZYNQMP=y CONFIG_FPGA_XILINX=y
CONFIG_FPGA_ZYNQMPPL=y
CONFIG_MISC=y

configs/avnet_ultra96_rev1_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig index bf141c5e168a..ce1ea089ce8d 100644 --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig @@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_MISC=y

configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig index 439f89e50f3c..877f5b230da3 100644 --- a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig @@ -49,6 +49,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_MISC=y

configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_MTD_DEVICE=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig index 6f14234a590e..7cd1c905f8b1 100644 --- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig @@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_MISC=y

configs/avnet_ultra96_rev1_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig index f1970aadf417..e42d401b54ea 100644 --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig @@ -43,6 +43,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_MISC=y

configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_PHY_MARVELL=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zcu100_revC_defconfig index cd7d2f5376d2..90163001da9f 100644 --- a/configs/xilinx_zynqmp_zcu100_revC_defconfig +++ b/configs/xilinx_zynqmp_zcu100_revC_defconfig @@ -55,6 +55,7 @@ CONFIG_I2C_MUX_PCA954x=y CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_MISC=y

configs/avnet_ultra96_rev1_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig index 371e6363db2f..62d23bf237c1 100644 --- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig @@ -70,6 +70,7 @@ CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0

configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_SDHCI=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zcu102_revA_defconfig index a0fb6c3586cc..1fdee2fd384b 100644 --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig @@ -71,6 +71,7 @@ CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0

configs/avnet_ultra96_rev1_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zcu102_revB_defconfig index db7c093d5ebc..ccc72c52887e 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -71,6 +71,7 @@ CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0

configs/avnet_ultra96_rev1_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zcu104_revA_defconfig index eacf75d9f8e2..730640758a38 100644 --- a/configs/xilinx_zynqmp_zcu104_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu104_revA_defconfig @@ -56,6 +56,7 @@ CONFIG_MISC=y CONFIG_I2C_EEPROM=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x0 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0

configs/avnet_ultra96_rev1_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zcu104_revC_defconfig index 1c9a6d6f1ec4..a4223ebdee54 100644 --- a/configs/xilinx_zynqmp_zcu104_revC_defconfig +++ b/configs/xilinx_zynqmp_zcu104_revC_defconfig @@ -57,6 +57,7 @@ CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0

configs/avnet_ultra96_rev1_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zcu106_revA_defconfig index 1b685ca04925..ed56ece40158 100644 --- a/configs/xilinx_zynqmp_zcu106_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu106_revA_defconfig @@ -66,6 +66,7 @@ CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0

configs/avnet_ultra96_rev1_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
(quoted diff) +0 -0

b/configs/xilinx_zynqmp_zcu111_revA_defconfig index 74106d7ea8fa..13816205caea 100644 --- a/configs/xilinx_zynqmp_zcu111_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu111_revA_defconfig @@ -58,6 +58,7 @@ CONFIG_I2C_EEPROM=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0

configs/avnet_ultra96_rev1_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xpress_defconfig +1 -0
index 2cbeeb390087..709a7ef90842 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
(quoted diff) +0 -0

b/configs/xpress_spl_defconfig index cf4f0ed054a5..0026d60c2715 100644

configs/xpress_spl_defconfig +1 -0
@@ -35,6 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/zc5202_defconfig +1 -0
index 3c35bed1820c..8d8d172d2112 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=3
configs/zc5601_defconfig +1 -0
index 2f5de909ca2e..02f8da8fbaf6 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=3
drivers/mmc/Kconfig +0 -0
index c34dd5d18790..e96e69370728 100644
@@ -78,6 +78,12 @@ config SUPPORT_EMMC_RPMB
 	  Enable support for reading, writing and programming the
 	  key for the Replay Protection Memory Block partition in

eMMC.

drivers/mmc/Kconfig +2 -0
+config SUPPORT_EMMC_BOOT
+	bool "Support some additional features of the eMMC boot

partitions"

drivers/mmc/Kconfig +4 -0
+	help
+	  Enable support for eMMC boot partitions. This also enables
+	  extensions within the mmc command.
+
 config MMC_IO_VOLTAGE
 	bool "Support IO voltage configuration"
 	help
(quoted diff) +0 -0

b/include/configs/advantech_dms-ba16.h index 57edeee941e7..22d1e41bc8dc 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -21,8 +21,6 @@
#define CONFIG_LOADCMD "fatload"
#define CONFIG_RFSPART "2"

include/configs/advantech_dms-ba16.h +0 -2
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 #include "mx6_common.h"
 #include <linux/sizes.h>
(quoted diff) +0 -0

b/include/configs/am57xx_evm.h index c14b010550fe..2c651aab178b 100644

include/configs/am57xx_evm.h +0 -0
@@ -63,8 +63,6 @@
 #define CONFIG_NET_RETRY_COUNT		10
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs longer aneg

time at 1G */

include/configs/am57xx_evm.h +0 -2
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP
(quoted diff) +0 -0

b/include/configs/apalis-tk1.h index 1d296ba51a05..9c8c8979f046 100644

include/configs/apalis-tk1.h +0 -3
@@ -18,9 +18,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
-/* SD/MMC support */
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /* Environment in eMMC, before config block at the end of 1st "boot

sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE
+ \ CONFIG_TDX_CFG_BLOCK_OFFSET)

(quoted diff) +0 -0

b/include/configs/apalis_imx6.h index 96169f55f08c..135a0d78287e 100644 --- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h

include/configs/apalis-tk1.h +0 -2
@@ -46,8 +46,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	3
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /*
  * SATA Configs
  */
include/configs/arndale.h +0 -3
index 06b02ce90a94..dd321c4748d0 100644
@@ -14,9 +14,6 @@
 #include "exynos5250-common.h"
 #include <configs/exynos5-common.h>
 
-/* SD/MMC configuration */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
include/configs/brppt1.h +0 -0
index ae9b75bb87ad..1d30d4e38f76 100644
@@ -31,11 +31,6 @@
 /*#define CONFIG_MACH_TYPE		3589*/
 #define CONFIG_MACH_TYPE		0xFFFFFFFF /* TODO: check

with kernel*/

include/configs/brppt1.h +0 -5
-/* MMC/SD IP block */
-#if defined(CONFIG_EMMC_BOOT)
- #define CONFIG_SUPPORT_EMMC_BOOT
-#endif /* CONFIG_EMMC_BOOT */
-
 /*
  * When we have NAND flash we expect to be making use of mtdparts,
  * both for ease of use in U-Boot and for passing information on to
(quoted diff) +0 -0

b/include/configs/cl-som-imx7.h index 26d1a97891d8..4c93fc6cbea2 100644 --- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h

include/configs/cl-som-imx7.h +0 -0
@@ -153,7 +153,6 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2" /*

USDHC1 */ -#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
#endif

/* USB Configs */

include/configs/clearfog.h +0 -4
index 9f8d3cc9e5e8..d8bd59cc070b 100644
@@ -26,10 +26,6 @@
  */
 #define CONFIG_SYS_MMC_BASE		MVEBU_SDIO_BASE
 
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
-#endif
-
 /* USB/EHCI configuration */
 #define CONFIG_EHCI_IS_TDI
 
include/configs/cm_t54.h +0 -1
index cda1b5528ffa..2387f864e32b 100644
@@ -41,7 +41,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* SATA Boot related defines */
 #define CONFIG_SPL_SATA_BOOT_DEVICE		0
(quoted diff) +0 -0

b/include/configs/colibri_imx6.h index 803c9be0646b..acb79afb039c 100644 --- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h

include/configs/colibri_imx6.h +0 -2
@@ -44,8 +44,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /* Network */
 #define CONFIG_FEC_MXC
 #define IMX_FEC_BASE			ENET_BASE_ADDR
(quoted diff) +0 -0

b/include/configs/colibri_imx7.h index 5a4b9801cb77..7dfc92c085b9 100644 --- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h

include/configs/colibri_imx7.h +0 -2
@@ -35,8 +35,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	1
 #elif CONFIG_TARGET_COLIBRI_IMX7_EMMC
 #define CONFIG_SYS_FSL_USDHC_NUM	2
-
-#define CONFIG_SUPPORT_EMMC_BOOT
 #endif
 
 #undef CONFIG_BOOTM_PLAN9
include/configs/display5.h +0 -1
index 8ab47abfa85d..8829cbad913c 100644
@@ -83,7 +83,6 @@
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	2
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
(quoted diff) +0 -0

b/include/configs/dra7xx_evm.h index f6be6595fe3c..aec70ee7182d 100644

include/configs/dra7xx_evm.h +0 -2
@@ -96,8 +96,6 @@
 /* SPI SPL */
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP
 
(quoted diff) +0 -0

b/include/configs/dragonboard410c.h index cf021083ae28..7155ebac5c24 100644 --- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h

include/configs/dragonboard410c.h +0 -7
@@ -31,13 +31,6 @@
  * it has to be done after each HCD reset */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
-/* Support all possible USB ethernet dongles */
-
-/* Extra Commands */
-/* Enable that for switching of boot partitions */
-/* Disabled by default as some sub-commands can brick eMMC */
-/*#define CONFIG_SUPPORT_EMMC_BOOT */
-
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
include/configs/edison.h +0 -1
index a6155ba5a8b9..218b50a1d9bb 100644
@@ -34,7 +34,6 @@
 #define CONFIG_ENV_SIZE				(64 * 1024)
 #define CONFIG_ENV_OFFSET			(3 * 1024 * 1024)
 #define CONFIG_ENV_OFFSET_REDUND		(6 * 1024 * 1024)
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* RTC */
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS	0
(quoted diff) +0 -0

b/include/configs/embestmx6boards.h index 858bed012c63..8bc7a3ad2e13 100644 --- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h

include/configs/embestmx6boards.h +0 -1
@@ -76,7 +76,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	3
 #define CONFIG_SYS_MMC_ENV_DEV		2	/* SDHC4 */
 #define CONFIG_ENV_OFFSET		(6 * 64 * 1024)
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 /* MarSBoard */
 #define CONFIG_FDTFILE	"imx6q-marsboard.dtb"
(quoted diff) +0 -0

b/include/configs/exynos5-common.h index db1fc934bbba..397bbf6d9d30 100644 --- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h

include/configs/exynos5-common.h +0 -1
@@ -44,7 +44,6 @@
 
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR	0x02020030
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* specific .lds file */
 
include/configs/ge_bx50v3.h +0 -3
index 196f114c60e8..0481ed06a91f 100644
@@ -19,9 +19,6 @@
 #define CONFIG_MXC_UART_BASE	UART3_BASE
 #define CONSOLE_DEV	"ttymxc2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
-
 #include "mx6_common.h"
 #include <linux/sizes.h>
 
(quoted diff) +0 -0

b/include/configs/gw_ventana.h index 93608e5aec4d..02ceb4c8fc8b 100644

include/configs/gw_ventana.h +0 -3
@@ -81,9 +81,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-/* eMMC Configs */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /*
  * SATA Configs
  */
(quoted diff) +0 -0

b/include/configs/imx6dl-mamoj.h index 030dbedce81b..7605e145c2f3 100644 --- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h

include/configs/imx6dl-mamoj.h +0 -1
@@ -51,7 +51,6 @@
 
 /* MMC */
 #define CONFIG_SYS_MMC_ENV_DEV		2
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Ethernet */
 #define CONFIG_FEC_MXC_PHYADDR		1
(quoted diff) +0 -0

b/include/configs/imx8mq_evk.h index 6094d1bf1800..35c1b65079e1 100644

include/configs/imx8mq_evk.h +0 -1
@@ -225,7 +225,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #define CONFIG_MXC_GPIO
(quoted diff) +0 -0

b/include/configs/imx8qxp_mek.h index 312e30dc6c18..3259febdb94f 100644 --- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h

include/configs/imx8qxp_mek.h +0 -1
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 #define USDHC1_BASE_ADDR                0x5B010000
 #define USDHC2_BASE_ADDR                0x5B020000
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 
 #define CONFIG_ENV_OVERWRITE
 
include/configs/liteboard.h +0 -1
index a97ccb50b2ff..975f32474c4a 100644
@@ -24,7 +24,6 @@
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 #endif
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
include/configs/mt7623.h +0 -1
index e449364ad48a..5f67893f3127 100644
@@ -42,7 +42,6 @@
 
 /* MMC */
 #define MMC_SUPPORTS_TUNING
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* DRAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
(quoted diff) +0 -0

b/include/configs/mx6sabresd.h index 555942a2c2ab..ec1537541aea 100644

include/configs/mx6sabresd.h +0 -2
@@ -16,8 +16,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONSOLE_DEV		"ttymxc0"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "mx6sabre_common.h"
 
 /* Falcon Mode */
(quoted diff) +0 -0

b/include/configs/mx7dsabresd.h index 39d29de74468..77856a8f3a47 100644 --- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h

include/configs/mx7dsabresd.h +0 -1
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED		100000
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #ifdef CONFIG_IMX_BOOTAUX
(quoted diff) +0 -0

b/include/configs/mx7ulp_evk.h index b8dcaa10361d..5bd63929735e 100644

include/configs/mx7ulp_evk.h +0 -1
@@ -28,7 +28,6 @@
 #define IOMUXC_BASE_ADDR		IOMUXC1_RBASE
 
 #define CONFIG_FSL_USDHC
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 
 #define CONFIG_SYS_FSL_USDHC_NUM        1
 
(quoted diff) +0 -0

b/include/configs/omap5_uevm.h index 66bd288040c1..0d8f945349dc 100644

include/configs/omap5_uevm.h +0 -1
@@ -39,7 +39,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
 #define CONFIG_TCA642X
(quoted diff) +0 -0

b/include/configs/opos6uldev.h index 70cf4665df37..e0c76ff43daa 100644

include/configs/opos6uldev.h +0 -3
@@ -33,9 +33,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
(quoted diff) +0 -0

b/include/configs/pico-imx6ul.h index 050f69801b47..cd051bf263f8 100644 --- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h

include/configs/pico-imx6ul.h +0 -1
@@ -41,7 +41,6 @@
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
(quoted diff) +0 -0

b/include/configs/pico-imx7d.h index 0f6d6b789454..0fcecacc0e98 100644

include/configs/pico-imx7d.h +0 -1
@@ -58,7 +58,6 @@
 	"bootmenu_1=Boot using PICO-Pi baseboard=" \
 		"setenv fdtfile imx7d-pico-pi.dtb\0" \
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/stm32mp1.h +0 -1
index 737dfd6a5c2a..546d7bc88029 100644
@@ -78,7 +78,6 @@
 
 /*MMC SD*/
 #define CONFIG_SYS_MMC_MAX_DEVICE	3
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /*****************************************************************************/
 #ifdef CONFIG_DISTRO_DEFAULTS
include/configs/uniphier.h +1 -3
index 1e509ce9ad7b..3edff50a86be 100644
@@ -94,9 +94,6 @@
 #define CONFIG_SYS_NAND_DATA_BASE			0x68000000
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS			0
 
-/* SD/MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_SDRAM_BASE
+ 0x01000000) diff --git a/include/configs/vinco.h

b/include/configs/vinco.h index ec22a30cda12..eebb3f7ca789 100644

include/configs/vinco.h +0 -1
@@ -43,7 +43,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI			0xfc000000
 #define CONFIG_SYS_MMC_CLK_OD		500000
(quoted diff) +0 -0

b/include/configs/vining_2000.h index d3cbdc6f2e49..fd98c1417e70 100644 --- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h

include/configs/vining_2000.h +0 -1
@@ -95,7 +95,6 @@
 #define CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
 
 #ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
 #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 */
include/configs/warp.h +0 -1
index 9aa8a48d3d85..5345f5314d66 100644
@@ -23,7 +23,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Watchdog */
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
include/configs/warp7.h +0 -1
index 043f2861b62d..82c483999031 100644
@@ -31,7 +31,6 @@
 
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
(quoted diff) +0 -0

b/include/configs/xilinx_zynqmp.h index 91ae7088a50a..5759b44d2695 100644 --- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h

include/configs/xilinx_zynqmp.h +0 -4
@@ -47,10 +47,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_MAY_FAIL
 
-#if defined(CONFIG_MMC_SDHCI_ZYNQ)
-# define CONFIG_SUPPORT_EMMC_BOOT
-#endif
-
 #ifdef CONFIG_NAND_ARASAN
 # define CONFIG_SYS_MAX_NAND_DEVICE	1
 # define CONFIG_SYS_NAND_ONFI_DETECTION
include/configs/xpress.h +0 -1
index 08e0ca0c8f15..4cbf8aa5261d 100644
@@ -21,7 +21,6 @@
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 
 /* I2C configs */
 #define CONFIG_SYS_I2C
include/configs/zc5202.h +0 -2
index 40d33f7830a5..77ff04754bc9 100644
@@ -12,8 +12,6 @@
 #define CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "el6x_common.h"
 
 /* Ethernet */
include/configs/zc5601.h +0 -2
index b9673e2c0651..e4fe7a462d23 100644
@@ -13,8 +13,6 @@
 #define CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p1"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "el6x_common.h"
 
 /* Ethernet */
(quoted diff) +0 -0

b/scripts/config_whitelist.txt index 5092c3fb4ce5..78ccef49fd11 100644

scripts/config_whitelist.txt CONFIG_ST_SMI · line 1945

Quoted 7 lines
scripts/config_whitelist.txt +0 -1
@@ -1940,7 +1940,6 @@ CONFIG_ST_SMI
 CONFIG_SUNXI_GPIO
 CONFIG_SUNXI_MAX_FB_SIZE
 CONFIG_SUPERH_ON_CHIP_R8A66597
-CONFIG_SUPPORT_EMMC_BOOT
 CONFIG_SUVD3
 CONFIG_SXNI855T
 CONFIG_SYSFLAGS_ADDR

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190419/886f66e7/attachment.sig>

#2 lore raw

PATCH 1/1 Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

In reply to Alex Kiernan

Hi Alex,

Quoted 12 lines

This converts the following to Kconfig:
CONFIG_SUPPORT_EMMC_BOOT

---
Green travis build:

https://travis-ci.org/akiernan/u-boot/builds/521906850

Testing affected boards for configuration changes:

Quoted 16 lines

boards.cfg is up to date. Nothing to do.
Summary of 3 commits for 95 boards (4 threads, 1 job per thread) 01: Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx
aarch64: w+ xilinx_zynqmp_mini_emmc1 xilinx_zynqmp_mini_emmc0
xilinx_zynqmp_mini_qspi clearfog_gt_8k imx8qxp_mek xilinx_zynqmp_mini xilinx_zynqmp_mini_nand imx8mq_evk
arm: w+ cm_t54 cl-som-imx7 marsboard clearfog apalis_imx6 warp7 pico-
hobbit-imx7d pico-pi-imx6ul dms-ba16 arndale riotboard pico-hobbit-imx6ul colibri_imx7 pico-imx7d xpress_spl opos6uldev warp7_bl33 imx6dl_mamoj ge_bx50v3 display5 mx7dsabresd_qspi display5_factory colibri_imx7_emmc gwventana_nand mx7dsabresd gwventana_gw5904 gwventana_emmc am57xx_hs_evm_usb omap5_uevm brppt1_spi xilinx_zynqmp_r5 vinco mx6sabresd warp riotboard_spl vining_2000 zc5601 zc5202 xpress pico-imx6ul dms-ba16-1g pico-pi-imx7d
02: configs: Resync with savedefconfig
03: Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

Quoted 1,700 lines
 README                                           | 3 ---
 configs/am57xx_evm_defconfig                     | 1 +
 configs/am57xx_hs_evm_defconfig                  | 1 +
 configs/am57xx_hs_evm_usb_defconfig              | 1 +
 configs/apalis-tk1_defconfig                     | 1 +
 configs/apalis_imx6_defconfig                    | 1 +
 configs/arndale_defconfig                        | 1 +
 configs/avnet_ultra96_rev1_defconfig             | 1 +
 configs/cl-som-imx7_defconfig                    | 1 +
 configs/clearfog_defconfig                       | 1 +
 configs/cm_t54_defconfig                         | 1 +
 configs/colibri_imx6_defconfig                   | 1 +
 configs/colibri_imx7_emmc_defconfig              | 1 +
 configs/display5_defconfig                       | 1 +
 configs/display5_factory_defconfig               | 1 +
 configs/dms-ba16-1g_defconfig                    | 1 +
 configs/dms-ba16_defconfig                       | 1 +
 configs/dra7xx_evm_defconfig                     | 1 +
 configs/dra7xx_hs_evm_defconfig                  | 1 +
 configs/dra7xx_hs_evm_usb_defconfig              | 1 +
 configs/edison_defconfig                         | 1 +
 configs/ge_bx50v3_defconfig                      | 1 +
 configs/gwventana_emmc_defconfig                 | 1 +
 configs/gwventana_gw5904_defconfig               | 1 +
 configs/gwventana_nand_defconfig                 | 1 +
 configs/imx6dl_mamoj_defconfig                   | 1 +
 configs/imx8mq_evk_defconfig                     | 1 +
 configs/imx8qxp_mek_defconfig                    | 1 +
 configs/liteboard_defconfig                      | 1 +
 configs/mt7623n_bpir2_defconfig                  | 1 +
 configs/mx6sabresd_defconfig                     | 1 +
 configs/mx7dsabresd_defconfig                    | 1 +
 configs/mx7dsabresd_qspi_defconfig               | 1 +
 configs/mx7ulp_evk_defconfig                     | 1 +
 configs/mx7ulp_evk_plugin_defconfig              | 1 +
 configs/odroid-xu3_defconfig                     | 1 +
 configs/omap5_uevm_defconfig                     | 1 +
 configs/opos6uldev_defconfig                     | 1 +
 configs/peach-pi_defconfig                       | 1 +
 configs/peach-pit_defconfig                      | 1 +
 configs/pico-hobbit-imx6ul_defconfig             | 1 +
 configs/pico-hobbit-imx7d_defconfig              | 1 +
 configs/pico-imx6ul_defconfig                    | 1 +
 configs/pico-imx7d_defconfig                     | 1 +
 configs/pico-pi-imx6ul_defconfig                 | 1 +
 configs/pico-pi-imx7d_defconfig                  | 1 +
 configs/riotboard_defconfig                      | 1 +
 configs/riotboard_spl_defconfig                  | 1 +
 configs/smdk5250_defconfig                       | 1 +
 configs/smdk5420_defconfig                       | 1 +
 configs/snow_defconfig                           | 1 +
 configs/spring_defconfig                         | 1 +
 configs/stm32mp15_basic_defconfig                | 1 +
 configs/stm32mp15_trusted_defconfig              | 1 +
 configs/uniphier_ld4_sld8_defconfig              | 1 +
 configs/uniphier_v7_defconfig                    | 1 +
 configs/uniphier_v8_defconfig                    | 1 +
 configs/vinco_defconfig                          | 1 +
 configs/vining_2000_defconfig                    | 1 +
 configs/warp7_bl33_defconfig                     | 1 +
 configs/warp7_defconfig                          | 1 +
 configs/warp_defconfig                           | 1 +
 configs/xilinx_zynqmp_mini_emmc0_defconfig       | 1 +
 configs/xilinx_zynqmp_mini_emmc1_defconfig       | 1 +
 configs/xilinx_zynqmp_zc1275_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
 configs/xilinx_zynqmp_zcu100_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu106_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu111_revA_defconfig      | 1 +
 configs/xpress_defconfig                         | 1 +
 configs/xpress_spl_defconfig                     | 1 +
 configs/zc5202_defconfig                         | 1 +
 configs/zc5601_defconfig                         | 1 +
 drivers/mmc/Kconfig                              | 6 ++++++
 include/configs/advantech_dms-ba16.h             | 2 --
 include/configs/am57xx_evm.h                     | 2 --
 include/configs/apalis-tk1.h                     | 3 ---
 include/configs/apalis_imx6.h                    | 2 --
 include/configs/arndale.h                        | 3 ---
 include/configs/brppt1.h                         | 5 -----
 include/configs/cl-som-imx7.h                    | 1 -
 include/configs/clearfog.h                       | 4 ----
 include/configs/cm_t54.h                         | 1 -
 include/configs/colibri_imx6.h                   | 2 --
 include/configs/colibri_imx7.h                   | 2 --
 include/configs/display5.h                       | 1 -
 include/configs/dra7xx_evm.h                     | 2 --
 include/configs/dragonboard410c.h                | 7 -------
 include/configs/edison.h                         | 1 -
 include/configs/embestmx6boards.h                | 1 -
 include/configs/exynos5-common.h                 | 1 -
 include/configs/ge_bx50v3.h                      | 3 ---
 include/configs/gw_ventana.h                     | 3 ---
 include/configs/imx6dl-mamoj.h                   | 1 -
 include/configs/imx8mq_evk.h                     | 1 -
 include/configs/imx8qxp_mek.h                    | 1 -
 include/configs/liteboard.h                      | 1 -
 include/configs/mt7623.h                         | 1 -
 include/configs/mx6sabresd.h                     | 2 --
 include/configs/mx7dsabresd.h                    | 1 -
 include/configs/mx7ulp_evk.h                     | 1 -
 include/configs/omap5_uevm.h                     | 1 -
 include/configs/opos6uldev.h                     | 3 ---
 include/configs/pico-imx6ul.h                    | 1 -
 include/configs/pico-imx7d.h                     | 1 -
 include/configs/stm32mp1.h                       | 1 -
 include/configs/uniphier.h                       | 3 ---
 include/configs/vinco.h                          | 1 -
 include/configs/vining_2000.h                    | 1 -
 include/configs/warp.h                           | 1 -
 include/configs/warp7.h                          | 1 -
 include/configs/xilinx_zynqmp.h                  | 4 ----
 include/configs/xpress.h                         | 1 -
 include/configs/zc5202.h                         | 2 --
 include/configs/zc5601.h                         | 2 --
 scripts/config_whitelist.txt                     | 1 -
 124 files changed, 86 insertions(+), 82 deletions(-)
README +0 -3
index a514f48caefc..c444959b662d 100644
@@ -1120,9 +1120,6 @@ The following options need to be configured:
 			CONFIG_SH_MMCIF_CLK
 			Define the clock frequency for MMCIF
 
-		CONFIG_SUPPORT_EMMC_BOOT
-		Enable some additional features of the eMMC boot partitions.
-
 - USB Device Firmware Update (DFU) class support:
 		CONFIG_DFU_OVER_USB
 		This enables the USB portion of the DFU USB class
configs/am57xx_evm_defconfig +1 -0
index 7a46e62ffb59..c17a7d32a8f9 100644
@@ -58,6 +58,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/am57xx_hs_evm_defconfig +1 -0
index 354c3c5c5ab1..0d0afed91604 100644
@@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/am57xx_hs_evm_usb_defconfig +1 -0
index 83b0110bcf40..812df8ffe45c 100644
@@ -62,6 +62,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/apalis-tk1_defconfig +1 -0
index d3ffbc736cef..5fd0b65b392b 100644
@@ -33,6 +33,7 @@ CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_I2C_TEGRA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_TEGRA124_MMC_DISABLE_EXT_LOOPBACK=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/apalis_imx6_defconfig +1 -0
index 2bc5de49011a..7d0736f2f52e 100644
@@ -57,6 +57,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/arndale_defconfig +1 -0
index 89ae6f224a5e..d0af2be0c9c2 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM_I2C_COMPAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/avnet_ultra96_rev1_defconfig +1 -0
index 15a682789350..924153081149 100644
@@ -55,6 +55,7 @@ CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/cl-som-imx7_defconfig +1 -0
index 1701895646dd..2bc668f8a978 100644
@@ -49,6 +49,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb"
 # CONFIG_ENV_IS_IN_MMC is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/clearfog_defconfig +1 -0
index 8f088419d20f..3ed74fdaac6c 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
configs/cm_t54_defconfig +1 -0
index 05ac37cc2503..31d011c7f311 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SCSI_AHCI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_CONS_INDEX=4
configs/colibri_imx6_defconfig +1 -0
index 6e3fc5955def..1c8613f0672c 100644
@@ -55,6 +55,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/colibri_imx7_emmc_defconfig +1 -0
index 5e2a204a881b..0617b120a05c 100644
@@ -45,6 +45,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/display5_defconfig +1 -0
index f22e1a1701a4..294ee93ea080 100644
@@ -62,6 +62,7 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0x020CC068
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
configs/display5_factory_defconfig +1 -0
index 54ec97c4c66c..c601425cfd09 100644
@@ -63,6 +63,7 @@ CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
configs/dms-ba16-1g_defconfig +1 -0
index eed0b67a1278..980f7b4abb62 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/dms-ba16_defconfig +1 -0
index d9f6d59874bf..bea75b5d23c9 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/dra7xx_evm_defconfig +1 -0
index bfc9d36b20e3..cd4c74f12f5c 100644
@@ -64,6 +64,7 @@ CONFIG_PCF8575_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/dra7xx_hs_evm_defconfig +1 -0
index 56dd35b39075..dfe443d71207 100644
@@ -68,6 +68,7 @@ CONFIG_PCF8575_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/dra7xx_hs_evm_usb_defconfig +1 -0
index 63e31dac3cb2..c9ad06778ac6 100644
@@ -69,6 +69,7 @@ CONFIG_PCF8575_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/edison_defconfig +1 -0
index 22fc84a41e38..b99906a4d144 100644
@@ -30,6 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CPU=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_RTC_MC146818=y
 CONFIG_USB_DWC3_GADGET=y
configs/ge_bx50v3_defconfig +1 -0
index eba37939f914..3111451162c1 100644
@@ -42,6 +42,7 @@ CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/gwventana_emmc_defconfig +1 -0
index 4cce2a02a032..9b6aa3bb0e59 100644
@@ -61,6 +61,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_PHYLIB=y
configs/gwventana_gw5904_defconfig +1 -0
index 7983d9a69db8..c812ff8d6628 100644
@@ -61,6 +61,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_PHYLIB=y
configs/gwventana_nand_defconfig +1 -0
index 5b4e807e5cc4..8557fed9253c 100644
@@ -63,6 +63,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
configs/imx6dl_mamoj_defconfig +1 -0
index 10e271c1f07f..53cd1750c3fa 100644
@@ -31,6 +31,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=2
 CONFIG_SYS_I2C_MXC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/imx8mq_evk_defconfig +1 -0
index 46100b671963..dc622b263d21 100644
@@ -28,6 +28,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_ETH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8M=y
configs/imx8qxp_mek_defconfig +1 -0
index a94998b8b524..574e9467c4b8 100644
@@ -51,6 +51,7 @@ CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_PHY_ATHEROS=y
configs/liteboard_defconfig +1 -0
index e4a2fcc7fbe5..f2fceb8f3ddb 100644
@@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_DM_ETH=y
configs/mt7623n_bpir2_defconfig +1 -0
index 5c411fe1d166..ae8209831b44 100644
@@ -35,6 +35,7 @@ CONFIG_SYSCON=y
 CONFIG_CLK=y
 CONFIG_DM_MMC=y
 # CONFIG_MMC_QUIRKS is not set
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_MMC_MTK=y
 CONFIG_PHY_FIXED=y
configs/mx6sabresd_defconfig +1 -0
index e5174bbe7845..746be0dcf8b4 100644
@@ -72,6 +72,7 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=2
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/mx7dsabresd_defconfig +1 -0
index 88d363a27e61..b2ca4f96ccdf 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/mx7dsabresd_qspi_defconfig +1 -0
index 3d74967432da..27a838787a7c 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/mx7ulp_evk_defconfig +1 -0
index 6bbacaa68618..d125ccc1af04 100644
@@ -21,6 +21,7 @@ CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7ULP=y
configs/mx7ulp_evk_plugin_defconfig +1 -0
index 549ca2e9643f..fcead94f57b3 100644
@@ -20,6 +20,7 @@ CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7ULP=y
configs/odroid-xu3_defconfig +1 -0
index 4ec4e5871c5d..b8ebd56bf9d3 100644
@@ -34,6 +34,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_ADC=y
 CONFIG_ADC_EXYNOS=y
 CONFIG_DFU_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x5000000
configs/omap5_uevm_defconfig +1 -0
index 84d4e2b37cdc..9af25fdf9891 100644
@@ -29,6 +29,7 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_CMD_TCA642X=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_CONS_INDEX=3
configs/opos6uldev_defconfig +1 -0
index 7dbeaf1044fb..cf5f52ccd874 100644
@@ -67,6 +67,7 @@ CONFIG_SYSCON=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_PWRSEQ=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/peach-pi_defconfig +1 -0
index f441d5eb9706..002d0969fe72 100644
@@ -37,6 +37,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/peach-pit_defconfig +1 -0
index f091d24f4f3a..33245efc55c6 100644
@@ -36,6 +36,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/pico-hobbit- renamed from configs/pico-hobbit-imx6ul_defconfig +0 -0

imx6ul_defconfig
index b5ac3a3b260e..0bfe0678a9c8 100644

configs/pico-hobbit-imx6ul_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/pico-hobbit- renamed from configs/pico-hobbit-imx7d_defconfig +0 -0

imx7d_defconfig
index 59bc4249c7ed..24f69170a05e 100644

configs/pico-hobbit-imx7d_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/pico-imx6ul_defconfig +1 -0
index f81b5a9692aa..366e3d381c59 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/pico-imx7d_defconfig +1 -0
index 3e870518610e..6ecd916ebd38 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/pico-pi-imx6ul_defconfig +1 -0
index d6c39e4f9de8..17b3ba328ea5 100644
@@ -44,6 +44,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/pico-pi-imx7d_defconfig +1 -0
index 20a34eb5627e..9e6f0ffa5432 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/riotboard_defconfig +1 -0
index da08bb89186b..6b0d7e58532e 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/riotboard_spl_defconfig +1 -0
index 65ab90614fe9..d30fc2f4ca83 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/smdk5250_defconfig +0 -0
index b9ab5192e929..bc34d21ca07a 100644
@@ -32,6 +32,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-

smdk5250"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_ENV_SPI_BUS=y
CONFIG_ENV_SPI_BUS=1

configs/smdk5250_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/smdk5420_defconfig +0 -0
index dc17e66a1729..6e555e562270 100644
@@ -27,6 +27,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5420-

smdk5420"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_ENV_SPI_BUS=y
CONFIG_ENV_SPI_BUS=1

configs/smdk5420_defconfig +1 -0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/snow_defconfig +1 -0
index 43576f7fd7b0..2d34711dd887 100644
@@ -42,6 +42,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/spring_defconfig +1 -0
index 7ec9f674e561..7d4ae5ec08d4 100644
@@ -42,6 +42,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/stm32mp15_basic_defconfig +1 -0
index 6781adb81e73..88e1dfe96bc7 100644
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_STM32F7=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_STM32_SDMMC2=y
 CONFIG_PHY=y
 CONFIG_PHY_STM32_USBPHYC=y
configs/stm32mp15_trusted_defconfig +1 -0
index a050cee6918e..c416c8ca447c 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_I2C_STM32F7=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_STM32_SDMMC2=y
 CONFIG_PHY=y
 CONFIG_PHY_STM32_USBPHYC=y
configs/uniphier_ld4_sld8_defconfig +1 -0
index e69649f30915..3102ebf6507d 100644
@@ -39,6 +39,7 @@ CONFIG_GPIO_UNIPHIER=y
 CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/uniphier_v7_defconfig +1 -0
index 59ed7c2d74e4..75f8a7674ca9 100644
@@ -38,6 +38,7 @@ CONFIG_GPIO_UNIPHIER=y
 CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/uniphier_v8_defconfig +1 -0
index b0c673c98e59..83f78776b7d2 100644
@@ -34,6 +34,7 @@ CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_MMC_SDHCI=y
configs/vinco_defconfig +1 -0
index 5d929437bf35..745aa85f3b6d 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-vinco"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SF_DEFAULT_SPEED=50000000
configs/vining_2000_defconfig +1 -0
index 5347ac8fe851..073ff4832968 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/warp7_bl33_defconfig +1 -0
index 6eaf152bace6..8290c5a4dc91 100644
@@ -29,6 +29,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
configs/warp7_defconfig +1 -0
index efd8860d28f3..0a0862ccfdcb 100644
@@ -38,6 +38,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
configs/warp_defconfig +1 -0
index df43a7986978..a37d76929692 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
 # CONFIG_NET is not set
 CONFIG_DFU_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/xilinx_zynqmp_mini_emmc0_defconfig +1 -0
index d16ec756a99d..3c2ce615828c 100644
@@ -52,6 +52,7 @@ CONFIG_SPL_DM=y
 # CONFIG_DM_WARN is not set
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 # CONFIG_EFI_LOADER is not set
configs/xilinx_zynqmp_mini_emmc1_defconfig +1 -0
index 48b9b5d41d66..c347ef6eed34 100644
@@ -52,6 +52,7 @@ CONFIG_SPL_DM=y
 # CONFIG_DM_WARN is not set
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 # CONFIG_EFI_LOADER is not set
configs/xilinx_zynqmp_zc1275_revB_defconfig +1 -0
index aa44f0424337..5de861910cde 100644
@@ -37,6 +37,7 @@ CONFIG_CLK_ZYNQMP=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +1 -0
index bf141c5e168a..ce1ea089ce8d 100644
@@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +1 -0
index 439f89e50f3c..877f5b230da3 100644
@@ -49,6 +49,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_MTD_DEVICE=y
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +1 -0
index 6f14234a590e..7cd1c905f8b1 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +1 -0
index f1970aadf417..e42d401b54ea 100644
@@ -43,6 +43,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_PHY_MARVELL=y
configs/xilinx_zynqmp_zcu100_revC_defconfig +1 -0
index cd7d2f5376d2..90163001da9f 100644
@@ -55,6 +55,7 @@ CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +1 -0
index 371e6363db2f..62d23bf237c1 100644
@@ -70,6 +70,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_SDHCI=y
configs/xilinx_zynqmp_zcu102_revA_defconfig +1 -0
index a0fb6c3586cc..1fdee2fd384b 100644
@@ -71,6 +71,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu102_revB_defconfig +1 -0
index db7c093d5ebc..ccc72c52887e 100644
@@ -71,6 +71,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu104_revA_defconfig +1 -0
index eacf75d9f8e2..730640758a38 100644
@@ -56,6 +56,7 @@ CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu104_revC_defconfig +1 -0
index 1c9a6d6f1ec4..a4223ebdee54 100644
@@ -57,6 +57,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu106_revA_defconfig +1 -0
index 1b685ca04925..ed56ece40158 100644
@@ -66,6 +66,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu111_revA_defconfig +1 -0
index 74106d7ea8fa..13816205caea 100644
@@ -58,6 +58,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xpress_defconfig +1 -0
index 2cbeeb390087..709a7ef90842 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/xpress_spl_defconfig +1 -0
index cf4f0ed054a5..0026d60c2715 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/zc5202_defconfig +1 -0
index 3c35bed1820c..8d8d172d2112 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=3
configs/zc5601_defconfig +1 -0
index 2f5de909ca2e..02f8da8fbaf6 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=3
drivers/mmc/Kconfig +6 -0
index c34dd5d18790..e96e69370728 100644
@@ -78,6 +78,12 @@ config SUPPORT_EMMC_RPMB
 	  Enable support for reading, writing and programming the
 	  key for the Replay Protection Memory Block partition in eMMC.
 
+config SUPPORT_EMMC_BOOT
+	bool "Support some additional features of the eMMC boot partitions"
+	help
+	  Enable support for eMMC boot partitions. This also enables
+	  extensions within the mmc command.
+
 config MMC_IO_VOLTAGE
 	bool "Support IO voltage configuration"
 	help
include/configs/advantech_dms-ba16.h +0 -2
index 57edeee941e7..22d1e41bc8dc 100644
@@ -21,8 +21,6 @@
 #define CONFIG_LOADCMD "fatload"
 #define CONFIG_RFSPART "2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 #include "mx6_common.h"
 #include <linux/sizes.h>
 
include/configs/am57xx_evm.h +0 -0
index c14b010550fe..2c651aab178b 100644
@@ -63,8 +63,6 @@
 #define CONFIG_NET_RETRY_COUNT		10
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs longer aneg time at

1G */

include/configs/am57xx_evm.h +0 -2
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP
include/configs/apalis-tk1.h +0 -3
index 1d296ba51a05..9c8c8979f046 100644
@@ -18,9 +18,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1
 	NV_PA_APB_UARTA_BASE
 
-/* SD/MMC support */
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
 #define CONFIG_ENV_OFFSET		(-CONFIG_ENV_SIZE + \
include/configs/apalis-tk1.h +0 -0
 					 CONFIG_TDX_CFG_BLOCK_OFFSET)
include/configs/apalis_imx6.h +0 -2
index 96169f55f08c..135a0d78287e 100644
@@ -46,8 +46,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	3
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /*
  * SATA Configs
  */
include/configs/arndale.h +0 -3
index 06b02ce90a94..dd321c4748d0 100644
@@ -14,9 +14,6 @@
 #include "exynos5250-common.h"
 #include <configs/exynos5-common.h>
 
-/* SD/MMC configuration */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
include/configs/brppt1.h +0 -0
index ae9b75bb87ad..1d30d4e38f76 100644
@@ -31,11 +31,6 @@
 /*#define CONFIG_MACH_TYPE		3589*/
 #define CONFIG_MACH_TYPE		0xFFFFFFFF /* TODO: check with

kernel*/

include/configs/brppt1.h +0 -5
-/* MMC/SD IP block */
-#if defined(CONFIG_EMMC_BOOT)
- #define CONFIG_SUPPORT_EMMC_BOOT
-#endif /* CONFIG_EMMC_BOOT */
-
 /*
  * When we have NAND flash we expect to be making use of mtdparts,
  * both for ease of use in U-Boot and for passing information on to
include/configs/cl-som-imx7.h +0 -1
index 26d1a97891d8..4c93fc6cbea2 100644
@@ -153,7 +153,6 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2" /* USDHC1 */
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #endif
 
 /* USB Configs */
include/configs/clearfog.h +0 -4
index 9f8d3cc9e5e8..d8bd59cc070b 100644
@@ -26,10 +26,6 @@
  */
 #define CONFIG_SYS_MMC_BASE		MVEBU_SDIO_BASE
 
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
-#endif
-
 /* USB/EHCI configuration */
 #define CONFIG_EHCI_IS_TDI
 
include/configs/cm_t54.h +0 -1
index cda1b5528ffa..2387f864e32b 100644
@@ -41,7 +41,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* SATA Boot related defines */
 #define CONFIG_SPL_SATA_BOOT_DEVICE		0
include/configs/colibri_imx6.h +0 -2
index 803c9be0646b..acb79afb039c 100644
@@ -44,8 +44,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /* Network */
 #define CONFIG_FEC_MXC
 #define IMX_FEC_BASE			ENET_BASE_ADDR
include/configs/colibri_imx7.h +0 -2
index 5a4b9801cb77..7dfc92c085b9 100644
@@ -35,8 +35,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	1
 #elif CONFIG_TARGET_COLIBRI_IMX7_EMMC
 #define CONFIG_SYS_FSL_USDHC_NUM	2
-
-#define CONFIG_SUPPORT_EMMC_BOOT
 #endif
 
 #undef CONFIG_BOOTM_PLAN9
include/configs/display5.h +0 -1
index 8ab47abfa85d..8829cbad913c 100644
@@ -83,7 +83,6 @@
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	2
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
include/configs/dra7xx_evm.h +0 -2
index f6be6595fe3c..aec70ee7182d 100644
@@ -96,8 +96,6 @@
 /* SPI SPL */
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP
 
include/configs/dragonboard410c.h +0 -7
index cf021083ae28..7155ebac5c24 100644
@@ -31,13 +31,6 @@
  * it has to be done after each HCD reset */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
-/* Support all possible USB ethernet dongles */
-
-/* Extra Commands */
-/* Enable that for switching of boot partitions */
-/* Disabled by default as some sub-commands can brick eMMC */
-/*#define CONFIG_SUPPORT_EMMC_BOOT */
-
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
include/configs/edison.h +0 -1
index a6155ba5a8b9..218b50a1d9bb 100644
@@ -34,7 +34,6 @@
 #define CONFIG_ENV_SIZE				(64 * 1024)
 #define CONFIG_ENV_OFFSET			(3 * 1024 * 1024)
 #define CONFIG_ENV_OFFSET_REDUND		(6 * 1024 * 1024)
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* RTC */
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS	0
include/configs/embestmx6boards.h +0 -1
index 858bed012c63..8bc7a3ad2e13 100644
@@ -76,7 +76,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	3
 #define CONFIG_SYS_MMC_ENV_DEV		2	/* SDHC4 */
 #define CONFIG_ENV_OFFSET		(6 * 64 * 1024)
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 /* MarSBoard */
 #define CONFIG_FDTFILE	"imx6q-marsboard.dtb"
include/configs/exynos5- renamed from include/configs/exynos5-common.h +0 -0

common.h
index db1fc934bbba..397bbf6d9d30 100644

include/configs/exynos5-common.h +0 -1
@@ -44,7 +44,6 @@
 
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR	0x02020030
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* specific .lds file */
 
include/configs/ge_bx50v3.h +0 -3
index 196f114c60e8..0481ed06a91f 100644
@@ -19,9 +19,6 @@
 #define CONFIG_MXC_UART_BASE	UART3_BASE
 #define CONSOLE_DEV	"ttymxc2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
-
 #include "mx6_common.h"
 #include <linux/sizes.h>
 
include/configs/gw_ventana.h +0 -3
index 93608e5aec4d..02ceb4c8fc8b 100644
@@ -81,9 +81,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-/* eMMC Configs */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /*
  * SATA Configs
  */
include/configs/imx6dl-mamoj.h +0 -1
index 030dbedce81b..7605e145c2f3 100644
@@ -51,7 +51,6 @@
 
 /* MMC */
 #define CONFIG_SYS_MMC_ENV_DEV		2
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Ethernet */
 #define CONFIG_FEC_MXC_PHYADDR		1
include/configs/imx8mq_evk.h +0 -1
index 6094d1bf1800..35c1b65079e1 100644
@@ -225,7 +225,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #define CONFIG_MXC_GPIO
include/configs/imx8qxp_mek.h +0 -1
index 312e30dc6c18..3259febdb94f 100644
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 #define USDHC1_BASE_ADDR                0x5B010000
 #define USDHC2_BASE_ADDR                0x5B020000
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 
 #define CONFIG_ENV_OVERWRITE
 
include/configs/liteboard.h +0 -1
index a97ccb50b2ff..975f32474c4a 100644
@@ -24,7 +24,6 @@
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 #endif
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
include/configs/mt7623.h +0 -1
index e449364ad48a..5f67893f3127 100644
@@ -42,7 +42,6 @@
 
 /* MMC */
 #define MMC_SUPPORTS_TUNING
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* DRAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
include/configs/mx6sabresd.h +0 -2
index 555942a2c2ab..ec1537541aea 100644
@@ -16,8 +16,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONSOLE_DEV		"ttymxc0"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "mx6sabre_common.h"
 
 /* Falcon Mode */
include/configs/mx7dsabresd.h +0 -1
index 39d29de74468..77856a8f3a47 100644
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED		100000
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #ifdef CONFIG_IMX_BOOTAUX
include/configs/mx7ulp_evk.h +0 -1
index b8dcaa10361d..5bd63929735e 100644
@@ -28,7 +28,6 @@
 #define IOMUXC_BASE_ADDR		IOMUXC1_RBASE
 
 #define CONFIG_FSL_USDHC
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 
 #define CONFIG_SYS_FSL_USDHC_NUM        1
 
include/configs/omap5_uevm.h +0 -1
index 66bd288040c1..0d8f945349dc 100644
@@ -39,7 +39,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
 #define CONFIG_TCA642X
include/configs/opos6uldev.h +0 -3
index 70cf4665df37..e0c76ff43daa 100644
@@ -33,9 +33,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/pico-imx6ul.h +0 -1
index 050f69801b47..cd051bf263f8 100644
@@ -41,7 +41,6 @@
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/pico-imx7d.h +0 -1
index 0f6d6b789454..0fcecacc0e98 100644
@@ -58,7 +58,6 @@
 	"bootmenu_1=Boot using PICO-Pi baseboard=" \
 		"setenv fdtfile imx7d-pico-pi.dtb\0" \
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/stm32mp1.h +0 -1
index 737dfd6a5c2a..546d7bc88029 100644
@@ -78,7 +78,6 @@
 
 /*MMC SD*/
 #define CONFIG_SYS_MMC_MAX_DEVICE	3
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /*****************************************************************************/
 #ifdef CONFIG_DISTRO_DEFAULTS
include/configs/uniphier.h +0 -3
index 1e509ce9ad7b..3edff50a86be 100644
@@ -94,9 +94,6 @@
 #define CONFIG_SYS_NAND_DATA_BASE			0x68000000
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS			0
 
-/* SD/MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END
	(CONFIG_SYS_SDRAM_BASE + 0x01000000)
include/configs/vinco.h +0 -1
index ec22a30cda12..eebb3f7ca789 100644
@@ -43,7 +43,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI			0xfc000000
 #define CONFIG_SYS_MMC_CLK_OD		500000
include/configs/vining_2000.h +0 -1
index d3cbdc6f2e49..fd98c1417e70 100644
@@ -95,7 +95,6 @@
 #define CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
 
 #ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
 #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 */
include/configs/warp.h +0 -1
index 9aa8a48d3d85..5345f5314d66 100644
@@ -23,7 +23,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Watchdog */
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
include/configs/warp7.h +0 -1
index 043f2861b62d..82c483999031 100644
@@ -31,7 +31,6 @@
 
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
include/configs/xilinx_zynqmp.h +0 -4
index 91ae7088a50a..5759b44d2695 100644
@@ -47,10 +47,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_MAY_FAIL
 
-#if defined(CONFIG_MMC_SDHCI_ZYNQ)
-# define CONFIG_SUPPORT_EMMC_BOOT
-#endif
-
 #ifdef CONFIG_NAND_ARASAN
 # define CONFIG_SYS_MAX_NAND_DEVICE	1
 # define CONFIG_SYS_NAND_ONFI_DETECTION
include/configs/xpress.h +0 -1
index 08e0ca0c8f15..4cbf8aa5261d 100644
@@ -21,7 +21,6 @@
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 
 /* I2C configs */
 #define CONFIG_SYS_I2C
include/configs/zc5202.h +0 -2
index 40d33f7830a5..77ff04754bc9 100644
@@ -12,8 +12,6 @@
 #define CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "el6x_common.h"
 
 /* Ethernet */
include/configs/zc5601.h +0 -2
index b9673e2c0651..e4fe7a462d23 100644
@@ -13,8 +13,6 @@
 #define CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p1"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "el6x_common.h"
 
 /* Ethernet */
scripts/config_whitelist.txt +0 -2
index 5092c3fb4ce5..78ccef49fd11 100644
@@ -1940,7 +1940,6 @@ CONFIG_ST_SMI
 CONFIG_SUNXI_GPIO
 CONFIG_SUNXI_MAX_FB_SIZE
 CONFIG_SUPERH_ON_CHIP_R8A66597
-CONFIG_SUPPORT_EMMC_BOOT
 CONFIG_SUVD3
 CONFIG_SXNI855T
 CONFIG_SYSFLAGS_ADDR
--
Quoted 1 line

2.17.1

Regards,

Patrick

Acked-by Ian Ray on v1 1/1
#3 lore raw

[U-Boot] EXT: RE: [PATCH] Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

Quoted 35 lines · Patrick DELAUNAY

Hi Alex,

Quoted 12 lines

This converts the following to Kconfig:
CONFIG_SUPPORT_EMMC_BOOT

---
Green travis build:

https://travis-ci.org/akiernan/u-boot/builds/521906850

Testing affected boards for configuration changes:

Quoted 16 lines

boards.cfg is up to date. Nothing to do.
Summary of 3 commits for 95 boards (4 threads, 1 job per thread) 01: Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx
aarch64: w+ xilinx_zynqmp_mini_emmc1 xilinx_zynqmp_mini_emmc0
xilinx_zynqmp_mini_qspi clearfog_gt_8k imx8qxp_mek xilinx_zynqmp_mini xilinx_zynqmp_mini_nand imx8mq_evk
arm: w+ cm_t54 cl-som-imx7 marsboard clearfog apalis_imx6 warp7 pico-
hobbit-imx7d pico-pi-imx6ul dms-ba16 arndale riotboard pico-hobbit-imx6ul colibri_imx7 pico-imx7d xpress_spl opos6uldev warp7_bl33 imx6dl_mamoj ge_bx50v3 display5 mx7dsabresd_qspi display5_factory colibri_imx7_emmc gwventana_nand mx7dsabresd gwventana_gw5904 gwventana_emmc am57xx_hs_evm_usb omap5_uevm brppt1_spi xilinx_zynqmp_r5 vinco mx6sabresd warp riotboard_spl vining_2000 zc5601 zc5202 xpress pico-imx6ul dms-ba16-1g pico-pi-imx7d
02: configs: Resync with savedefconfig
03: Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

Quoted 1 line
Quoted 1,705 lines
Quoted 1,693 lines
README                                           | 3 ---
configs/am57xx_evm_defconfig                     | 1 +
configs/am57xx_hs_evm_defconfig                  | 1 +
configs/am57xx_hs_evm_usb_defconfig              | 1 +
configs/apalis-tk1_defconfig                     | 1 +
configs/apalis_imx6_defconfig                    | 1 +
configs/arndale_defconfig                        | 1 +
configs/avnet_ultra96_rev1_defconfig             | 1 +
configs/cl-som-imx7_defconfig                    | 1 +
configs/clearfog_defconfig                       | 1 +
configs/cm_t54_defconfig                         | 1 +
configs/colibri_imx6_defconfig                   | 1 +
configs/colibri_imx7_emmc_defconfig              | 1 +
configs/display5_defconfig                       | 1 +
configs/display5_factory_defconfig               | 1 +
configs/dms-ba16-1g_defconfig                    | 1 +
configs/dms-ba16_defconfig                       | 1 +
configs/dra7xx_evm_defconfig                     | 1 +
configs/dra7xx_hs_evm_defconfig                  | 1 +
configs/dra7xx_hs_evm_usb_defconfig              | 1 +
configs/edison_defconfig                         | 1 +
configs/ge_bx50v3_defconfig                      | 1 +
configs/gwventana_emmc_defconfig                 | 1 +
configs/gwventana_gw5904_defconfig               | 1 +
configs/gwventana_nand_defconfig                 | 1 +
configs/imx6dl_mamoj_defconfig                   | 1 +
configs/imx8mq_evk_defconfig                     | 1 +
configs/imx8qxp_mek_defconfig                    | 1 +
configs/liteboard_defconfig                      | 1 +
configs/mt7623n_bpir2_defconfig                  | 1 +
configs/mx6sabresd_defconfig                     | 1 +
configs/mx7dsabresd_defconfig                    | 1 +
configs/mx7dsabresd_qspi_defconfig               | 1 +
configs/mx7ulp_evk_defconfig                     | 1 +
configs/mx7ulp_evk_plugin_defconfig              | 1 +
configs/odroid-xu3_defconfig                     | 1 +
configs/omap5_uevm_defconfig                     | 1 +
configs/opos6uldev_defconfig                     | 1 +
configs/peach-pi_defconfig                       | 1 +
configs/peach-pit_defconfig                      | 1 +
configs/pico-hobbit-imx6ul_defconfig             | 1 +
configs/pico-hobbit-imx7d_defconfig              | 1 +
configs/pico-imx6ul_defconfig                    | 1 +
configs/pico-imx7d_defconfig                     | 1 +
configs/pico-pi-imx6ul_defconfig                 | 1 +
configs/pico-pi-imx7d_defconfig                  | 1 +
configs/riotboard_defconfig                      | 1 +
configs/riotboard_spl_defconfig                  | 1 +
configs/smdk5250_defconfig                       | 1 +
configs/smdk5420_defconfig                       | 1 +
configs/snow_defconfig                           | 1 +
configs/spring_defconfig                         | 1 +
configs/stm32mp15_basic_defconfig                | 1 +
configs/stm32mp15_trusted_defconfig              | 1 +
configs/uniphier_ld4_sld8_defconfig              | 1 +
configs/uniphier_v7_defconfig                    | 1 +
configs/uniphier_v8_defconfig                    | 1 +
configs/vinco_defconfig                          | 1 +
configs/vining_2000_defconfig                    | 1 +
configs/warp7_bl33_defconfig                     | 1 +
configs/warp7_defconfig                          | 1 +
configs/warp_defconfig                           | 1 +
configs/xilinx_zynqmp_mini_emmc0_defconfig       | 1 +
configs/xilinx_zynqmp_mini_emmc1_defconfig       | 1 +
configs/xilinx_zynqmp_zc1275_revB_defconfig      | 1 +
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
configs/xilinx_zynqmp_zcu100_revC_defconfig      | 1 +
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    | 1 +
configs/xilinx_zynqmp_zcu102_revA_defconfig      | 1 +
configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
configs/xilinx_zynqmp_zcu104_revA_defconfig      | 1 +
configs/xilinx_zynqmp_zcu104_revC_defconfig      | 1 +
configs/xilinx_zynqmp_zcu106_revA_defconfig      | 1 +
configs/xilinx_zynqmp_zcu111_revA_defconfig      | 1 +
configs/xpress_defconfig                         | 1 +
configs/xpress_spl_defconfig                     | 1 +
configs/zc5202_defconfig                         | 1 +
configs/zc5601_defconfig                         | 1 +
drivers/mmc/Kconfig                              | 6 ++++++
include/configs/advantech_dms-ba16.h             | 2 --
include/configs/am57xx_evm.h                     | 2 --
include/configs/apalis-tk1.h                     | 3 ---
include/configs/apalis_imx6.h                    | 2 --
include/configs/arndale.h                        | 3 ---
include/configs/brppt1.h                         | 5 -----
include/configs/cl-som-imx7.h                    | 1 -
include/configs/clearfog.h                       | 4 ----
include/configs/cm_t54.h                         | 1 -
include/configs/colibri_imx6.h                   | 2 --
include/configs/colibri_imx7.h                   | 2 --
include/configs/display5.h                       | 1 -
include/configs/dra7xx_evm.h                     | 2 --
include/configs/dragonboard410c.h                | 7 -------
include/configs/edison.h                         | 1 -
include/configs/embestmx6boards.h                | 1 -
include/configs/exynos5-common.h                 | 1 -
include/configs/ge_bx50v3.h                      | 3 ---
include/configs/gw_ventana.h                     | 3 ---
include/configs/imx6dl-mamoj.h                   | 1 -
include/configs/imx8mq_evk.h                     | 1 -
include/configs/imx8qxp_mek.h                    | 1 -
include/configs/liteboard.h                      | 1 -
include/configs/mt7623.h                         | 1 -
include/configs/mx6sabresd.h                     | 2 --
include/configs/mx7dsabresd.h                    | 1 -
include/configs/mx7ulp_evk.h                     | 1 -
include/configs/omap5_uevm.h                     | 1 -
include/configs/opos6uldev.h                     | 3 ---
include/configs/pico-imx6ul.h                    | 1 -
include/configs/pico-imx7d.h                     | 1 -
include/configs/stm32mp1.h                       | 1 -
include/configs/uniphier.h                       | 3 ---
include/configs/vinco.h                          | 1 -
include/configs/vining_2000.h                    | 1 -
include/configs/warp.h                           | 1 -
include/configs/warp7.h                          | 1 -
include/configs/xilinx_zynqmp.h                  | 4 ----
include/configs/xpress.h                         | 1 -
include/configs/zc5202.h                         | 2 --
include/configs/zc5601.h                         | 2 --
scripts/config_whitelist.txt                     | 1 -
124 files changed, 86 insertions(+), 82 deletions(-)
README +0 -4
index a514f48caefc..c444959b662d 100644
@@ -1120,9 +1120,6 @@ The following options need to be configured:
 			CONFIG_SH_MMCIF_CLK
 			Define the clock frequency for MMCIF
 
-		CONFIG_SUPPORT_EMMC_BOOT
-		Enable some additional features of the eMMC boot partitions.
-
- USB Device Firmware Update (DFU) class support:
 		CONFIG_DFU_OVER_USB
 		This enables the USB portion of the DFU USB class
configs/am57xx_evm_defconfig +0 -0
index 7a46e62ffb59..c17a7d32a8f9 100644
@@ -58,6 +58,7 @@ CONFIG_DM_GPIO=y

CONFIG_DM_I2C=y
CONFIG_MISC=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_OMAP_HS=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y

configs/am57xx_hs_evm_defconfig +0 -0
index 354c3c5c5ab1..0d0afed91604 100644
@@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y

CONFIG_DM_I2C=y
CONFIG_MISC=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_OMAP_HS=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y

configs/am57xx_hs_evm_usb_defconfig +0 -0
index 83b0110bcf40..812df8ffe45c 100644
@@ -62,6 +62,7 @@ CONFIG_DM_GPIO=y

CONFIG_DM_I2C=y
CONFIG_MISC=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_OMAP_HS=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y

configs/apalis-tk1_defconfig +0 -0
index d3ffbc736cef..5fd0b65b392b 100644
@@ -33,6 +33,7 @@ CONFIG_SPL_DM=y

CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
CONFIG_SYS_I2C_TEGRA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_TEGRA124_MMC_DISABLE_EXT_LOOPBACK=y
CONFIG_E1000=y
CONFIG_PCI=y

configs/apalis_imx6_defconfig +0 -0
index 2bc5de49011a..7d0736f2f52e 100644
@@ -57,6 +57,7 @@ CONFIG_DFU_MMC=y

CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y

configs/arndale_defconfig +0 -0
index 89ae6f224a5e..d0af2be0c9c2 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y

CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM_I2C_COMPAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_DW=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_S5P=y

configs/avnet_ultra96_rev1_defconfig +0 -0
index 15a682789350..924153081149 100644
@@ -55,6 +55,7 @@ CONFIG_I2C_MUX_PCA954x=y

CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y

configs/cl-som-imx7_defconfig +0 -0
index 1701895646dd..2bc668f8a978 100644
@@ -49,6 +49,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb"
 # CONFIG_ENV_IS_IN_MMC is not set

CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_MODE=0

configs/clearfog_defconfig +0 -0
index 8f088419d20f..3ed74fdaac6c 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y

CONFIG_DM_PCA953X=y
CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MVTWSI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
CONFIG_MMC_SDHCI_MV=y

configs/cm_t54_defconfig +0 -0
index 05ac37cc2503..31d011c7f311 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y

CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_SCSI_AHCI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_OMAP_HS=y
CONFIG_SCSI=y
CONFIG_CONS_INDEX=4

configs/colibri_imx6_defconfig +0 -0
index 6e3fc5955def..1c8613f0672c 100644
@@ -55,6 +55,7 @@ CONFIG_DFU_MMC=y

CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y

configs/colibri_imx7_emmc_defconfig +0 -0
index 5e2a204a881b..0617b120a05c 100644
@@ -45,6 +45,7 @@ CONFIG_DFU_MMC=y

CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y

configs/display5_defconfig +0 -0
index f22e1a1701a4..294ee93ea080 100644
@@ -62,6 +62,7 @@ CONFIG_BOOTCOUNT_LIMIT=y

CONFIG_BOOTCOUNT_BOOTLIMIT=3
CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
CONFIG_SYS_BOOTCOUNT_ADDR=0x020CC068
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_MTD_DEVICE=y
CONFIG_SPI_FLASH=y

configs/display5_factory_defconfig +0 -0
index 54ec97c4c66c..c601425cfd09 100644
@@ -63,6 +63,7 @@ CONFIG_PARTITION_TYPE_GUID=y

CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DFU_MMC=y
CONFIG_DFU_SF=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_MTD_DEVICE=y
CONFIG_SPI_FLASH=y

configs/dms-ba16-1g_defconfig +0 -0
index eed0b67a1278..980f7b4abb62 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y

CONFIG_CMD_FS_GENERIC=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DWC_AHSATA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_MODE=0

configs/dms-ba16_defconfig +0 -0
index d9f6d59874bf..bea75b5d23c9 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_FAT=y

CONFIG_CMD_FS_GENERIC=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DWC_AHSATA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_MODE=0

configs/dra7xx_evm_defconfig +0 -0
index bfc9d36b20e3..cd4c74f12f5c 100644
@@ -64,6 +64,7 @@ CONFIG_PCF8575_GPIO=y

CONFIG_DM_I2C=y
CONFIG_MISC=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y

configs/dra7xx_hs_evm_defconfig +0 -0
index 56dd35b39075..dfe443d71207 100644
@@ -68,6 +68,7 @@ CONFIG_PCF8575_GPIO=y

CONFIG_DM_I2C=y
CONFIG_MISC=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y

configs/dra7xx_hs_evm_usb_defconfig +0 -0
index 63e31dac3cb2..c9ad06778ac6 100644
@@ -69,6 +69,7 @@ CONFIG_PCF8575_GPIO=y

CONFIG_DM_I2C=y
CONFIG_MISC=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y

configs/edison_defconfig +0 -0
index 22fc84a41e38..b99906a4d144 100644
@@ -30,6 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y

CONFIG_CPU=y
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_RTC_MC146818=y
CONFIG_USB_DWC3_GADGET=y

configs/ge_bx50v3_defconfig +0 -0
index eba37939f914..3111451162c1 100644
@@ -42,6 +42,7 @@ CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"

CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y

configs/gwventana_emmc_defconfig +0 -0
index 4cce2a02a032..9b6aa3bb0e59 100644
@@ -61,6 +61,7 @@ CONFIG_ENV_IS_IN_MMC=y

CONFIG_DM=y
CONFIG_DWC_AHSATA=y
CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_MTD_DEVICE=y
CONFIG_PHYLIB=y

configs/gwventana_gw5904_defconfig +0 -0
index 7983d9a69db8..c812ff8d6628 100644
@@ -61,6 +61,7 @@ CONFIG_ENV_IS_IN_MMC=y

CONFIG_DM=y
CONFIG_DWC_AHSATA=y
CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_MTD_DEVICE=y
CONFIG_PHYLIB=y

configs/gwventana_nand_defconfig +0 -0
index 5b4e807e5cc4..8557fed9253c 100644
@@ -63,6 +63,7 @@ CONFIG_ENV_IS_IN_NAND=y

CONFIG_DM=y
CONFIG_DWC_AHSATA=y
CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_NAND=y
CONFIG_NAND_MXS=y

configs/imx6dl_mamoj_defconfig +0 -0
index 10e271c1f07f..53cd1750c3fa 100644
@@ -31,6 +31,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000

CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=2
CONFIG_SYS_I2C_MXC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y

configs/imx8mq_evk_defconfig +0 -0
index 46100b671963..dc622b263d21 100644
@@ -28,6 +28,7 @@ CONFIG_DM_GPIO=y

CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MXC=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_DM_ETH=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX8M=y

configs/imx8qxp_mek_defconfig +0 -0
index a94998b8b524..574e9467c4b8 100644
@@ -51,6 +51,7 @@ CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_PCA954x=y
CONFIG_MISC=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_PHYLIB=y
CONFIG_PHY_ADDR_ENABLE=y
CONFIG_PHY_ATHEROS=y

configs/liteboard_defconfig +0 -0
index e4a2fcc7fbe5..f2fceb8f3ddb 100644
@@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y

CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_DM_ETH=y

configs/mt7623n_bpir2_defconfig +0 -0
index 5c411fe1d166..ae8209831b44 100644
@@ -35,6 +35,7 @@ CONFIG_SYSCON=y

CONFIG_CLK=y
CONFIG_DM_MMC=y
# CONFIG_MMC_QUIRKS is not set
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_HS400_SUPPORT=y
CONFIG_MMC_MTK=y
CONFIG_PHY_FIXED=y

configs/mx6sabresd_defconfig +0 -0
index e5174bbe7845..746be0dcf8b4 100644
@@ -72,6 +72,7 @@ CONFIG_FASTBOOT_FLASH=y

CONFIG_FASTBOOT_FLASH_MMC_DEV=2
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y

configs/mx7dsabresd_defconfig +0 -0
index 88d363a27e61..b2ca4f96ccdf 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y

CONFIG_DM_74X164=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y

configs/mx7dsabresd_qspi_defconfig +0 -0
index 3d74967432da..27a838787a7c 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y

CONFIG_DM_74X164=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_HS200_SUPPORT=y

configs/mx7ulp_evk_defconfig +0 -0
index 6bbacaa68618..d125ccc1af04 100644
@@ -21,6 +21,7 @@ CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set

CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX7ULP=y

configs/mx7ulp_evk_plugin_defconfig +0 -0
index 549ca2e9643f..fcead94f57b3 100644
@@ -20,6 +20,7 @@ CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set

CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX7ULP=y

configs/odroid-xu3_defconfig +0 -0
index 4ec4e5871c5d..b8ebd56bf9d3 100644
@@ -34,6 +34,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

CONFIG_ADC=y
CONFIG_ADC_EXYNOS=y
CONFIG_DFU_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_DW=y
CONFIG_SMC911X=y
CONFIG_SMC911X_BASE=0x5000000

configs/omap5_uevm_defconfig +0 -0
index 84d4e2b37cdc..9af25fdf9891 100644
@@ -29,6 +29,7 @@ CONFIG_SCSI_AHCI=y

CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
CONFIG_CMD_TCA642X=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_OMAP_HS=y
CONFIG_SCSI=y
CONFIG_CONS_INDEX=3

configs/opos6uldev_defconfig +0 -0
index 7dbeaf1044fb..cf5f52ccd874 100644
@@ -67,6 +67,7 @@ CONFIG_SYSCON=y

CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MXC=y
CONFIG_PWRSEQ=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y

configs/peach-pi_defconfig +0 -0
index f441d5eb9706..002d0969fe72 100644
@@ -37,6 +37,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y

CONFIG_CROS_EC_KEYB=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_DW=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_S5P=y

configs/peach-pit_defconfig +0 -0
index f091d24f4f3a..33245efc55c6 100644
@@ -36,6 +36,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y

CONFIG_CROS_EC_KEYB=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_DW=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_S5P=y

configs/pico-hobbit- renamed from configs/pico-hobbit-imx6ul_defconfig +0 -0

imx6ul_defconfig
index b5ac3a3b260e..0bfe0678a9c8 100644

configs/pico-hobbit-imx6ul_defconfig +0 -0
@@ -44,6 +44,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y

configs/pico-hobbit- renamed from configs/pico-hobbit-imx7d_defconfig +0 -0

imx7d_defconfig
index 59bc4249c7ed..24f69170a05e 100644

configs/pico-hobbit-imx7d_defconfig +0 -0
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000

CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_MII=y

configs/pico-imx6ul_defconfig +0 -0
index f81b5a9692aa..366e3d381c59 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y

configs/pico-imx7d_defconfig +0 -0
index 3e870518610e..6ecd916ebd38 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000

CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_MII=y

configs/pico-pi-imx6ul_defconfig +0 -0
index d6c39e4f9de8..17b3ba328ea5 100644
@@ -44,6 +44,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y

configs/pico-pi-imx7d_defconfig +0 -0
index 20a34eb5627e..9e6f0ffa5432 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000

CONFIG_FASTBOOT_FLASH=y
CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_MII=y

configs/riotboard_defconfig +0 -0
index da08bb89186b..6b0d7e58532e 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_CACHE=y

CONFIG_CMD_EXT4_WRITE=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_MODE=0

configs/riotboard_spl_defconfig +0 -0
index 65ab90614fe9..d30fc2f4ca83 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_CACHE=y

CONFIG_CMD_EXT4_WRITE=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_DM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_MODE=0

configs/smdk5250_defconfig +0 -0
index b9ab5192e929..bc34d21ca07a 100644
@@ -32,6 +32,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-

smdk5250"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_ENV_SPI_BUS=y
CONFIG_ENV_SPI_BUS=1
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_DW=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_S5P=y

configs/smdk5420_defconfig +0 -0
index dc17e66a1729..6e555e562270 100644
@@ -27,6 +27,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5420-

smdk5420"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_ENV_SPI_BUS=y
CONFIG_ENV_SPI_BUS=1
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_DW=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_S5P=y

configs/snow_defconfig +0 -0
index 43576f7fd7b0..2d34711dd887 100644
@@ -42,6 +42,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y

CONFIG_CROS_EC_KEYB=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_DW=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_S5P=y

configs/spring_defconfig +0 -0
index 7ec9f674e561..7d4ae5ec08d4 100644
@@ -42,6 +42,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y

CONFIG_CROS_EC_KEYB=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_DW=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_S5P=y

configs/stm32mp15_basic_defconfig +0 -0
index 6781adb81e73..88e1dfe96bc7 100644
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_STM32F7=y

CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_STM32_SDMMC2=y
CONFIG_PHY=y
CONFIG_PHY_STM32_USBPHYC=y

configs/stm32mp15_trusted_defconfig +0 -0
index a050cee6918e..c416c8ca447c 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_I2C_STM32F7=y

CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_STM32_SDMMC2=y
CONFIG_PHY=y
CONFIG_PHY_STM32_USBPHYC=y

configs/uniphier_ld4_sld8_defconfig +0 -0
index e69649f30915..3102ebf6507d 100644
@@ -39,6 +39,7 @@ CONFIG_GPIO_UNIPHIER=y

CONFIG_MISC=y
CONFIG_I2C_EEPROM=y
CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_UNIPHIER=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_CFI=y

configs/uniphier_v7_defconfig +0 -0
index 59ed7c2d74e4..75f8a7674ca9 100644
@@ -38,6 +38,7 @@ CONFIG_GPIO_UNIPHIER=y

CONFIG_MISC=y
CONFIG_I2C_EEPROM=y
CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_UNIPHIER=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_CFI=y

configs/uniphier_v8_defconfig +0 -0
index b0c673c98e59..83f78776b7d2 100644
@@ -34,6 +34,7 @@ CONFIG_MISC=y

CONFIG_I2C_EEPROM=y
CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_HS200_SUPPORT=y
CONFIG_MMC_UNIPHIER=y
CONFIG_MMC_SDHCI=y

configs/vinco_defconfig +0 -0
index 5d929437bf35..745aa85f3b6d 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y

CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="at91-vinco"
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_MODE=0
CONFIG_SF_DEFAULT_SPEED=50000000

configs/vining_2000_defconfig +0 -0
index 5347ac8fe851..073ff4832968 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_FS_GENERIC=y

CONFIG_EFI_PARTITION=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_MII=y

configs/warp7_bl33_defconfig +0 -0
index 6eaf152bace6..8290c5a4dc91 100644
@@ -29,6 +29,7 @@ CONFIG_DFU_MMC=y

CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX7=y

configs/warp7_defconfig +0 -0
index efd8860d28f3..0a0862ccfdcb 100644
@@ -38,6 +38,7 @@ CONFIG_DFU_MMC=y

CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX7=y

configs/warp_defconfig +0 -0
index df43a7986978..a37d76929692 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y

CONFIG_ENV_IS_IN_MMC=y
# CONFIG_NET is not set
CONFIG_DFU_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y

configs/xilinx_zynqmp_mini_emmc0_defconfig +0 -0
index d16ec756a99d..3c2ce615828c 100644
@@ -52,6 +52,7 @@ CONFIG_SPL_DM=y
 # CONFIG_DM_WARN is not set
 # CONFIG_DM_DEVICE_REMOVE is not set

CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
# CONFIG_EFI_LOADER is not set

configs/xilinx_zynqmp_mini_emmc1_defconfig +0 -0
index 48b9b5d41d66..c347ef6eed34 100644
@@ -52,6 +52,7 @@ CONFIG_SPL_DM=y
 # CONFIG_DM_WARN is not set
 # CONFIG_DM_DEVICE_REMOVE is not set

CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
# CONFIG_EFI_LOADER is not set

configs/xilinx_zynqmp_zc1275_revB_defconfig +0 -0
index aa44f0424337..5de861910cde 100644
@@ -37,6 +37,7 @@ CONFIG_CLK_ZYNQMP=y

CONFIG_FPGA_XILINX=y
CONFIG_FPGA_ZYNQMPPL=y
CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y

configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +0 -0
index bf141c5e168a..ce1ea089ce8d 100644
@@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y

CONFIG_DM_I2C=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_HS200_SUPPORT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y

configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +0 -0
index 439f89e50f3c..877f5b230da3 100644
@@ -49,6 +49,7 @@ CONFIG_DM_GPIO=y

CONFIG_DM_I2C=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_MTD_DEVICE=y

configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +0 -0
index 6f14234a590e..7cd1c905f8b1 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y

CONFIG_DM_I2C=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y

configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +0 -0
index f1970aadf417..e42d401b54ea 100644
@@ -43,6 +43,7 @@ CONFIG_DM_GPIO=y

CONFIG_DM_I2C=y
CONFIG_SYS_I2C_CADENCE=y
CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_PHY_MARVELL=y

configs/xilinx_zynqmp_zcu100_revC_defconfig +0 -0
index cd7d2f5376d2..90163001da9f 100644
@@ -55,6 +55,7 @@ CONFIG_I2C_MUX_PCA954x=y

CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y

configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +0 -0
index 371e6363db2f..62d23bf237c1 100644
@@ -70,6 +70,7 @@ CONFIG_I2C_EEPROM=y

CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0
CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_IO_VOLTAGE=y
CONFIG_MMC_UHS_SUPPORT=y
CONFIG_MMC_SDHCI=y

configs/xilinx_zynqmp_zcu102_revA_defconfig +0 -0
index a0fb6c3586cc..1fdee2fd384b 100644
@@ -71,6 +71,7 @@ CONFIG_I2C_EEPROM=y

CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0
CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y

configs/xilinx_zynqmp_zcu102_revB_defconfig +0 -0
index db7c093d5ebc..ccc72c52887e 100644
@@ -71,6 +71,7 @@ CONFIG_I2C_EEPROM=y

CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0
CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y

configs/xilinx_zynqmp_zcu104_revA_defconfig +0 -0
index eacf75d9f8e2..730640758a38 100644
@@ -56,6 +56,7 @@ CONFIG_MISC=y

CONFIG_I2C_EEPROM=y
CONFIG_SYS_I2C_EEPROM_ADDR=0x0
CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y

configs/xilinx_zynqmp_zcu104_revC_defconfig +0 -0
index 1c9a6d6f1ec4..a4223ebdee54 100644
@@ -57,6 +57,7 @@ CONFIG_I2C_EEPROM=y

CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0
CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y

configs/xilinx_zynqmp_zcu106_revA_defconfig +0 -0
index 1b685ca04925..ed56ece40158 100644
@@ -66,6 +66,7 @@ CONFIG_I2C_EEPROM=y

CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0
CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y

configs/xilinx_zynqmp_zcu111_revA_defconfig +0 -0
index 74106d7ea8fa..13816205caea 100644
@@ -58,6 +58,7 @@ CONFIG_I2C_EEPROM=y

CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_SYS_I2C_EEPROM_ADDR=0x0
CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ZYNQ=y
CONFIG_SPI_FLASH=y

configs/xpress_defconfig +0 -0
index 2cbeeb390087..709a7ef90842 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y

CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_MII=y

configs/xpress_spl_defconfig +0 -0
index cf4f0ed054a5..0026d60c2715 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y

CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_MII=y

configs/zc5202_defconfig +0 -0
index 3c35bed1820c..8d8d172d2112 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_CACHE=y

CONFIG_CMD_EXT4_WRITE=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_BUS=3

configs/zc5601_defconfig +0 -0
index 2f5de909ca2e..02f8da8fbaf6 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_CACHE=y

CONFIG_CMD_EXT4_WRITE=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_BUS=3

drivers/mmc/Kconfig +6 -0
index c34dd5d18790..e96e69370728 100644
@@ -78,6 +78,12 @@ config SUPPORT_EMMC_RPMB
 	  Enable support for reading, writing and programming the
 	  key for the Replay Protection Memory Block partition in eMMC.
 
+config SUPPORT_EMMC_BOOT
+	bool "Support some additional features of the eMMC boot partitions"
+	help
+	  Enable support for eMMC boot partitions. This also enables
+	  extensions within the mmc command.
+

config MMC_IO_VOLTAGE
bool "Support IO voltage configuration"
help

include/configs/advantech_dms-ba16.h +0 -2
index 57edeee941e7..22d1e41bc8dc 100644
@@ -21,8 +21,6 @@
 #define CONFIG_LOADCMD "fatload"
 #define CONFIG_RFSPART "2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 #include "mx6_common.h"
 #include <linux/sizes.h>
 
include/configs/am57xx_evm.h +0 -0
index c14b010550fe..2c651aab178b 100644
@@ -63,8 +63,6 @@
 #define CONFIG_NET_RETRY_COUNT		10
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs longer aneg time at

1G */

include/configs/am57xx_evm.h +0 -2
-#define CONFIG_SUPPORT_EMMC_BOOT
-

/* USB xHCI HOST */
#define CONFIG_USB_XHCI_OMAP

include/configs/apalis-tk1.h +0 -3
index 1d296ba51a05..9c8c8979f046 100644
@@ -18,9 +18,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1
 	NV_PA_APB_UARTA_BASE
 
-/* SD/MMC support */
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
 #define CONFIG_ENV_OFFSET		(-CONFIG_ENV_SIZE + \

CONFIG_TDX_CFG_BLOCK_OFFSET)

include/configs/apalis_imx6.h +0 -2
index 96169f55f08c..135a0d78287e 100644
@@ -46,8 +46,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	3
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /*
 * SATA Configs
 */
include/configs/arndale.h +0 -3
index 06b02ce90a94..dd321c4748d0 100644
@@ -14,9 +14,6 @@
 #include "exynos5250-common.h"
 #include <configs/exynos5-common.h>
 
-/* SD/MMC configuration */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
include/configs/brppt1.h +0 -0
index ae9b75bb87ad..1d30d4e38f76 100644
@@ -31,11 +31,6 @@
 /*#define CONFIG_MACH_TYPE		3589*/
 #define CONFIG_MACH_TYPE		0xFFFFFFFF /* TODO: check with

kernel*/

include/configs/brppt1.h +0 -5
-/* MMC/SD IP block */
-#if defined(CONFIG_EMMC_BOOT)
- #define CONFIG_SUPPORT_EMMC_BOOT
-#endif /* CONFIG_EMMC_BOOT */
-

/*
* When we have NAND flash we expect to be making use of mtdparts,
* both for ease of use in U-Boot and for passing information on to

include/configs/cl-som-imx7.h +0 -1
index 26d1a97891d8..4c93fc6cbea2 100644
@@ -153,7 +153,6 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2" /* USDHC1 */
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #endif
 
 /* USB Configs */
include/configs/clearfog.h +0 -4
index 9f8d3cc9e5e8..d8bd59cc070b 100644
@@ -26,10 +26,6 @@
 */
 #define CONFIG_SYS_MMC_BASE		MVEBU_SDIO_BASE
 
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
-#endif
-
 /* USB/EHCI configuration */
 #define CONFIG_EHCI_IS_TDI
 
include/configs/cm_t54.h +0 -1
index cda1b5528ffa..2387f864e32b 100644
@@ -41,7 +41,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* SATA Boot related defines */
 #define CONFIG_SPL_SATA_BOOT_DEVICE		0
include/configs/colibri_imx6.h +0 -2
index 803c9be0646b..acb79afb039c 100644
@@ -44,8 +44,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
-
 /* Network */
 #define CONFIG_FEC_MXC
 #define IMX_FEC_BASE			ENET_BASE_ADDR
include/configs/colibri_imx7.h +0 -2
index 5a4b9801cb77..7dfc92c085b9 100644
@@ -35,8 +35,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	1
 #elif CONFIG_TARGET_COLIBRI_IMX7_EMMC
 #define CONFIG_SYS_FSL_USDHC_NUM	2
-
-#define CONFIG_SUPPORT_EMMC_BOOT
 #endif
 
 #undef CONFIG_BOOTM_PLAN9
include/configs/display5.h +0 -1
index 8ab47abfa85d..8829cbad913c 100644
@@ -83,7 +83,6 @@
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	2
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
include/configs/dra7xx_evm.h +0 -2
index f6be6595fe3c..aec70ee7182d 100644
@@ -96,8 +96,6 @@
 /* SPI SPL */
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP
 
include/configs/dragonboard410c.h +0 -7
index cf021083ae28..7155ebac5c24 100644
@@ -31,13 +31,6 @@
 * it has to be done after each HCD reset */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
-/* Support all possible USB ethernet dongles */
-
-/* Extra Commands */
-/* Enable that for switching of boot partitions */
-/* Disabled by default as some sub-commands can brick eMMC */
-/*#define CONFIG_SUPPORT_EMMC_BOOT */
-
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
include/configs/edison.h +0 -1
index a6155ba5a8b9..218b50a1d9bb 100644
@@ -34,7 +34,6 @@
 #define CONFIG_ENV_SIZE				(64 * 1024)
 #define CONFIG_ENV_OFFSET			(3 * 1024 * 1024)
 #define CONFIG_ENV_OFFSET_REDUND		(6 * 1024 * 1024)
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* RTC */
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS	0
include/configs/embestmx6boards.h +0 -1
index 858bed012c63..8bc7a3ad2e13 100644
@@ -76,7 +76,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	3
 #define CONFIG_SYS_MMC_ENV_DEV		2	/* SDHC4 */
 #define CONFIG_ENV_OFFSET		(6 * 64 * 1024)
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 /* MarSBoard */
 #define CONFIG_FDTFILE	"imx6q-marsboard.dtb"
include/configs/exynos5- renamed from include/configs/exynos5-common.h +0 -0

common.h
index db1fc934bbba..397bbf6d9d30 100644

include/configs/exynos5-common.h +0 -1
@@ -44,7 +44,6 @@
 
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR	0x02020030
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* specific .lds file */
 
include/configs/ge_bx50v3.h +0 -3
index 196f114c60e8..0481ed06a91f 100644
@@ -19,9 +19,6 @@
 #define CONFIG_MXC_UART_BASE	UART3_BASE
 #define CONSOLE_DEV	"ttymxc2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
-
 #include "mx6_common.h"
 #include <linux/sizes.h>
 
include/configs/gw_ventana.h +0 -3
index 93608e5aec4d..02ceb4c8fc8b 100644
@@ -81,9 +81,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-/* eMMC Configs */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /*
 * SATA Configs
 */
include/configs/imx6dl-mamoj.h +0 -1
index 030dbedce81b..7605e145c2f3 100644
@@ -51,7 +51,6 @@
 
 /* MMC */
 #define CONFIG_SYS_MMC_ENV_DEV		2
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Ethernet */
 #define CONFIG_FEC_MXC_PHYADDR		1
include/configs/imx8mq_evk.h +0 -1
index 6094d1bf1800..35c1b65079e1 100644
@@ -225,7 +225,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #define CONFIG_MXC_GPIO
include/configs/imx8qxp_mek.h +0 -1
index 312e30dc6c18..3259febdb94f 100644
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 #define USDHC1_BASE_ADDR                0x5B010000
 #define USDHC2_BASE_ADDR                0x5B020000
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 
 #define CONFIG_ENV_OVERWRITE
 
include/configs/liteboard.h +0 -1
index a97ccb50b2ff..975f32474c4a 100644
@@ -24,7 +24,6 @@
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 #endif
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
include/configs/mt7623.h +0 -1
index e449364ad48a..5f67893f3127 100644
@@ -42,7 +42,6 @@
 
 /* MMC */
 #define MMC_SUPPORTS_TUNING
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* DRAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
include/configs/mx6sabresd.h +0 -2
index 555942a2c2ab..ec1537541aea 100644
@@ -16,8 +16,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONSOLE_DEV		"ttymxc0"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "mx6sabre_common.h"
 
 /* Falcon Mode */
include/configs/mx7dsabresd.h +0 -1
index 39d29de74468..77856a8f3a47 100644
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED		100000
 
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #ifdef CONFIG_IMX_BOOTAUX
include/configs/mx7ulp_evk.h +0 -1
index b8dcaa10361d..5bd63929735e 100644
@@ -28,7 +28,6 @@
 #define IOMUXC_BASE_ADDR		IOMUXC1_RBASE
 
 #define CONFIG_FSL_USDHC
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 
 #define CONFIG_SYS_FSL_USDHC_NUM        1
 
include/configs/omap5_uevm.h +0 -1
index 66bd288040c1..0d8f945349dc 100644
@@ -39,7 +39,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
 #define CONFIG_TCA642X
include/configs/opos6uldev.h +0 -3
index 70cf4665df37..e0c76ff43daa 100644
@@ -33,9 +33,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/pico-imx6ul.h +0 -1
index 050f69801b47..cd051bf263f8 100644
@@ -41,7 +41,6 @@
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/pico-imx7d.h +0 -1
index 0f6d6b789454..0fcecacc0e98 100644
@@ -58,7 +58,6 @@
 	"bootmenu_1=Boot using PICO-Pi baseboard=" \
 		"setenv fdtfile imx7d-pico-pi.dtb\0" \
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/stm32mp1.h +0 -1
index 737dfd6a5c2a..546d7bc88029 100644
@@ -78,7 +78,6 @@
 
 /*MMC SD*/
 #define CONFIG_SYS_MMC_MAX_DEVICE	3
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /*****************************************************************************/
 #ifdef CONFIG_DISTRO_DEFAULTS
include/configs/uniphier.h +0 -3
index 1e509ce9ad7b..3edff50a86be 100644
@@ -94,9 +94,6 @@
 #define CONFIG_SYS_NAND_DATA_BASE			0x68000000
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS			0
 
-/* SD/MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END
	(CONFIG_SYS_SDRAM_BASE + 0x01000000)
include/configs/vinco.h +0 -1
index ec22a30cda12..eebb3f7ca789 100644
@@ -43,7 +43,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI			0xfc000000
 #define CONFIG_SYS_MMC_CLK_OD		500000
include/configs/vining_2000.h +0 -1
index d3cbdc6f2e49..fd98c1417e70 100644
@@ -95,7 +95,6 @@
 #define CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
 
 #ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
 #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 */
include/configs/warp.h +0 -1
index 9aa8a48d3d85..5345f5314d66 100644
@@ -23,7 +23,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Watchdog */
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
include/configs/warp7.h +0 -1
index 043f2861b62d..82c483999031 100644
@@ -31,7 +31,6 @@
 
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
 
include/configs/xilinx_zynqmp.h +0 -4
index 91ae7088a50a..5759b44d2695 100644
@@ -47,10 +47,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_MAY_FAIL
 
-#if defined(CONFIG_MMC_SDHCI_ZYNQ)
-# define CONFIG_SUPPORT_EMMC_BOOT
-#endif
-
 #ifdef CONFIG_NAND_ARASAN
 # define CONFIG_SYS_MAX_NAND_DEVICE	1
 # define CONFIG_SYS_NAND_ONFI_DETECTION
include/configs/xpress.h +0 -1
index 08e0ca0c8f15..4cbf8aa5261d 100644
@@ -21,7 +21,6 @@
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
 
 /* I2C configs */
 #define CONFIG_SYS_I2C
include/configs/zc5202.h +0 -2
index 40d33f7830a5..77ff04754bc9 100644
@@ -12,8 +12,6 @@
 #define CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "el6x_common.h"
 
 /* Ethernet */
include/configs/zc5601.h +0 -2
index b9673e2c0651..e4fe7a462d23 100644
@@ -13,8 +13,6 @@
 #define CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk0p1"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "el6x_common.h"
 
 /* Ethernet */
scripts/config_whitelist.txt +0 -0
index 5092c3fb4ce5..78ccef49fd11 100644
@@ -1940,7 +1940,6 @@ CONFIG_ST_SMI

CONFIG_SUNXI_GPIO

Quoted 8 lines

CONFIG_SUNXI_MAX_FB_SIZE
CONFIG_SUPERH_ON_CHIP_R8A66597
-CONFIG_SUPPORT_EMMC_BOOT
CONFIG_SUVD3
CONFIG_SXNI855T
CONFIG_SYSFLAGS_ADDR
--
2.17.1

Regards,

Patrick

#4 lore raw

PATCH 1/1 Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

In reply to Alex Kiernan
Quoted 1,745 lines · Alex Kiernan

This converts the following to Kconfig:
CONFIG_SUPPORT_EMMC_BOOT

---
Green travis build:

https://travis-ci.org/akiernan/u-boot/builds/521906850

Testing affected boards for configuration changes:

boards.cfg is up to date. Nothing to do.
Summary of 3 commits for 95 boards (4 threads, 1 job per thread) 01: Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx
aarch64: w+ xilinx_zynqmp_mini_emmc1 xilinx_zynqmp_mini_emmc0
xilinx_zynqmp_mini_qspi clearfog_gt_8k imx8qxp_mek xilinx_zynqmp_mini xilinx_zynqmp_mini_nand imx8mq_evk
arm: w+ cm_t54 cl-som-imx7 marsboard clearfog apalis_imx6
warp7 pico-hobbit-imx7d pico-pi-imx6ul dms-ba16 arndale riotboard pico-hobbit-imx6ul colibri_imx7 pico-imx7d xpress_spl opos6uldev warp7_bl33 imx6dl_mamoj ge_bx50v3 display5 mx7dsabresd_qspi display5_factory colibri_imx7_emmc gwventana_nand mx7dsabresd gwventana_gw5904 gwventana_emmc am57xx_hs_evm_usb omap5_uevm brppt1_spi xilinx_zynqmp_r5 vinco mx6sabresd warp riotboard_spl vining_2000 zc5601 zc5202 xpress pico-imx6ul dms-ba16-1g pico-pi-imx7d
02: configs: Resync with savedefconfig
03: Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

 README                                           | 3 ---
 configs/am57xx_evm_defconfig                     | 1 +
 configs/am57xx_hs_evm_defconfig                  | 1 +
 configs/am57xx_hs_evm_usb_defconfig              | 1 +
 configs/apalis-tk1_defconfig                     | 1 +
 configs/apalis_imx6_defconfig                    | 1 +
 configs/arndale_defconfig                        | 1 +
 configs/avnet_ultra96_rev1_defconfig             | 1 +
 configs/cl-som-imx7_defconfig                    | 1 +
 configs/clearfog_defconfig                       | 1 +
 configs/cm_t54_defconfig                         | 1 +
 configs/colibri_imx6_defconfig                   | 1 +
 configs/colibri_imx7_emmc_defconfig              | 1 +
 configs/display5_defconfig                       | 1 +
 configs/display5_factory_defconfig               | 1 +
 configs/dms-ba16-1g_defconfig                    | 1 +
 configs/dms-ba16_defconfig                       | 1 +
 configs/dra7xx_evm_defconfig                     | 1 +
 configs/dra7xx_hs_evm_defconfig                  | 1 +
 configs/dra7xx_hs_evm_usb_defconfig              | 1 +
 configs/edison_defconfig                         | 1 +
 configs/ge_bx50v3_defconfig                      | 1 +
 configs/gwventana_emmc_defconfig                 | 1 +
 configs/gwventana_gw5904_defconfig               | 1 +
 configs/gwventana_nand_defconfig                 | 1 +
 configs/imx6dl_mamoj_defconfig                   | 1 +
 configs/imx8mq_evk_defconfig                     | 1 +
 configs/imx8qxp_mek_defconfig                    | 1 +
 configs/liteboard_defconfig                      | 1 +
 configs/mt7623n_bpir2_defconfig                  | 1 +
 configs/mx6sabresd_defconfig                     | 1 +
 configs/mx7dsabresd_defconfig                    | 1 +
 configs/mx7dsabresd_qspi_defconfig               | 1 +
 configs/mx7ulp_evk_defconfig                     | 1 +
 configs/mx7ulp_evk_plugin_defconfig              | 1 +
 configs/odroid-xu3_defconfig                     | 1 +
 configs/omap5_uevm_defconfig                     | 1 +
 configs/opos6uldev_defconfig                     | 1 +
 configs/peach-pi_defconfig                       | 1 +
 configs/peach-pit_defconfig                      | 1 +
 configs/pico-hobbit-imx6ul_defconfig             | 1 +
 configs/pico-hobbit-imx7d_defconfig              | 1 +
 configs/pico-imx6ul_defconfig                    | 1 +
 configs/pico-imx7d_defconfig                     | 1 +
 configs/pico-pi-imx6ul_defconfig                 | 1 +
 configs/pico-pi-imx7d_defconfig                  | 1 +
 configs/riotboard_defconfig                      | 1 +
 configs/riotboard_spl_defconfig                  | 1 +
 configs/smdk5250_defconfig                       | 1 +
 configs/smdk5420_defconfig                       | 1 +
 configs/snow_defconfig                           | 1 +
 configs/spring_defconfig                         | 1 +
 configs/stm32mp15_basic_defconfig                | 1 +
 configs/stm32mp15_trusted_defconfig              | 1 +
 configs/uniphier_ld4_sld8_defconfig              | 1 +
 configs/uniphier_v7_defconfig                    | 1 +
 configs/uniphier_v8_defconfig                    | 1 +
 configs/vinco_defconfig                          | 1 +
 configs/vining_2000_defconfig                    | 1 +
 configs/warp7_bl33_defconfig                     | 1 +
 configs/warp7_defconfig                          | 1 +
 configs/warp_defconfig                           | 1 +
 configs/xilinx_zynqmp_mini_emmc0_defconfig       | 1 +
 configs/xilinx_zynqmp_mini_emmc1_defconfig       | 1 +
 configs/xilinx_zynqmp_zc1275_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
 configs/xilinx_zynqmp_zcu100_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu106_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu111_revA_defconfig      | 1 +
 configs/xpress_defconfig                         | 1 +
 configs/xpress_spl_defconfig                     | 1 +
 configs/zc5202_defconfig                         | 1 +
 configs/zc5601_defconfig                         | 1 +
 drivers/mmc/Kconfig                              | 6 ++++++
 include/configs/advantech_dms-ba16.h             | 2 --
 include/configs/am57xx_evm.h                     | 2 --
 include/configs/apalis-tk1.h                     | 3 ---
 include/configs/apalis_imx6.h                    | 2 --
 include/configs/arndale.h                        | 3 ---
 include/configs/brppt1.h                         | 5 -----
 include/configs/cl-som-imx7.h                    | 1 -
 include/configs/clearfog.h                       | 4 ----
 include/configs/cm_t54.h                         | 1 -
 include/configs/colibri_imx6.h                   | 2 --
 include/configs/colibri_imx7.h                   | 2 --
 include/configs/display5.h                       | 1 -
 include/configs/dra7xx_evm.h                     | 2 --
 include/configs/dragonboard410c.h                | 7 -------
 include/configs/edison.h                         | 1 -
 include/configs/embestmx6boards.h                | 1 -
 include/configs/exynos5-common.h                 | 1 -
 include/configs/ge_bx50v3.h                      | 3 ---
 include/configs/gw_ventana.h                     | 3 ---
 include/configs/imx6dl-mamoj.h                   | 1 -
 include/configs/imx8mq_evk.h                     | 1 -
 include/configs/imx8qxp_mek.h                    | 1 -
 include/configs/liteboard.h                      | 1 -
 include/configs/mt7623.h                         | 1 -
 include/configs/mx6sabresd.h                     | 2 --
 include/configs/mx7dsabresd.h                    | 1 -
 include/configs/mx7ulp_evk.h                     | 1 -
 include/configs/omap5_uevm.h                     | 1 -
 include/configs/opos6uldev.h                     | 3 ---
 include/configs/pico-imx6ul.h                    | 1 -
 include/configs/pico-imx7d.h                     | 1 -
 include/configs/stm32mp1.h                       | 1 -
 include/configs/uniphier.h                       | 3 ---
 include/configs/vinco.h                          | 1 -
 include/configs/vining_2000.h                    | 1 -
 include/configs/warp.h                           | 1 -
 include/configs/warp7.h                          | 1 -
 include/configs/xilinx_zynqmp.h                  | 4 ----
 include/configs/xpress.h                         | 1 -
 include/configs/zc5202.h                         | 2 --
 include/configs/zc5601.h                         | 2 --
 scripts/config_whitelist.txt                     | 1 -
 124 files changed, 86 insertions(+), 82 deletions(-)
README +0 -2
index a514f48caefc..c444959b662d 100644
@@ -1120,9 +1120,6 @@ The following options need to be configured:
                        CONFIG_SH_MMCIF_CLK
                        Define the clock frequency for MMCIF
 
-               CONFIG_SUPPORT_EMMC_BOOT
-               Enable some additional features of the eMMC boot

partitions.

README +0 -1
-
 - USB Device Firmware Update (DFU) class support:
                CONFIG_DFU_OVER_USB
                This enables the USB portion of the DFU USB class
configs/am57xx_evm_defconfig +1 -0
index 7a46e62ffb59..c17a7d32a8f9 100644
@@ -58,6 +58,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/am57xx_hs_evm_defconfig +1 -0
index 354c3c5c5ab1..0d0afed91604 100644
@@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/am57xx_hs_evm_usb_defconfig +1 -0
index 83b0110bcf40..812df8ffe45c 100644
@@ -62,6 +62,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/apalis-tk1_defconfig +1 -0
index d3ffbc736cef..5fd0b65b392b 100644
@@ -33,6 +33,7 @@ CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_I2C_TEGRA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_TEGRA124_MMC_DISABLE_EXT_LOOPBACK=y
 CONFIG_E1000=y
 CONFIG_PCI=y
configs/apalis_imx6_defconfig +1 -0
index 2bc5de49011a..7d0736f2f52e 100644
@@ -57,6 +57,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/arndale_defconfig +1 -0
index 89ae6f224a5e..d0af2be0c9c2 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM_I2C_COMPAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/avnet_ultra96_rev1_defconfig +1 -0
index 15a682789350..924153081149 100644
@@ -55,6 +55,7 @@ CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/cl-som-imx7_defconfig +1 -0
index 1701895646dd..2bc668f8a978 100644
@@ -49,6 +49,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb"
 # CONFIG_ENV_IS_IN_MMC is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/clearfog_defconfig +1 -0
index 8f088419d20f..3ed74fdaac6c 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
configs/cm_t54_defconfig +1 -0
index 05ac37cc2503..31d011c7f311 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SCSI_AHCI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_CONS_INDEX=4
configs/colibri_imx6_defconfig +1 -0
index 6e3fc5955def..1c8613f0672c 100644
@@ -55,6 +55,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/colibri_imx7_emmc_defconfig +1 -0
index 5e2a204a881b..0617b120a05c 100644
@@ -45,6 +45,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/display5_defconfig +1 -0
index f22e1a1701a4..294ee93ea080 100644
@@ -62,6 +62,7 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0x020CC068
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
configs/display5_factory_defconfig +1 -0
index 54ec97c4c66c..c601425cfd09 100644
@@ -63,6 +63,7 @@ CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_SPI_FLASH=y
configs/dms-ba16-1g_defconfig +1 -0
index eed0b67a1278..980f7b4abb62 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/dms-ba16_defconfig +1 -0
index d9f6d59874bf..bea75b5d23c9 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/dra7xx_evm_defconfig +1 -0
index bfc9d36b20e3..cd4c74f12f5c 100644
@@ -64,6 +64,7 @@ CONFIG_PCF8575_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/dra7xx_hs_evm_defconfig +1 -0
index 56dd35b39075..dfe443d71207 100644
@@ -68,6 +68,7 @@ CONFIG_PCF8575_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/dra7xx_hs_evm_usb_defconfig +1 -0
index 63e31dac3cb2..c9ad06778ac6 100644
@@ -69,6 +69,7 @@ CONFIG_PCF8575_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/edison_defconfig +1 -0
index 22fc84a41e38..b99906a4d144 100644
@@ -30,6 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CPU=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_RTC_MC146818=y
 CONFIG_USB_DWC3_GADGET=y
configs/ge_bx50v3_defconfig +1 -0
index eba37939f914..3111451162c1 100644
@@ -42,6 +42,7 @@ CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/gwventana_emmc_defconfig +1 -0
index 4cce2a02a032..9b6aa3bb0e59 100644
@@ -61,6 +61,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_PHYLIB=y
configs/gwventana_gw5904_defconfig +1 -0
index 7983d9a69db8..c812ff8d6628 100644
@@ -61,6 +61,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_DEVICE=y
 CONFIG_PHYLIB=y
configs/gwventana_nand_defconfig +1 -0
index 5b4e807e5cc4..8557fed9253c 100644
@@ -63,6 +63,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM=y
 CONFIG_DWC_AHSATA=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
configs/imx6dl_mamoj_defconfig +1 -0
index 10e271c1f07f..53cd1750c3fa 100644
@@ -31,6 +31,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=2
 CONFIG_SYS_I2C_MXC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/imx8mq_evk_defconfig +1 -0
index 46100b671963..dc622b263d21 100644
@@ -28,6 +28,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_ETH=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8M=y
configs/imx8qxp_mek_defconfig +1 -0
index a94998b8b524..574e9467c4b8 100644
@@ -51,6 +51,7 @@ CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_PHY_ATHEROS=y
configs/liteboard_defconfig +1 -0
index e4a2fcc7fbe5..f2fceb8f3ddb 100644
@@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_DM_ETH=y
configs/mt7623n_bpir2_defconfig +1 -0
index 5c411fe1d166..ae8209831b44 100644
@@ -35,6 +35,7 @@ CONFIG_SYSCON=y
 CONFIG_CLK=y
 CONFIG_DM_MMC=y
 # CONFIG_MMC_QUIRKS is not set
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_MMC_MTK=y
 CONFIG_PHY_FIXED=y
configs/mx6sabresd_defconfig +1 -0
index e5174bbe7845..746be0dcf8b4 100644
@@ -72,6 +72,7 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=2
 CONFIG_DM_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
configs/mx7dsabresd_defconfig +1 -0
index 88d363a27e61..b2ca4f96ccdf 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/mx7dsabresd_qspi_defconfig +1 -0
index 3d74967432da..27a838787a7c 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_74X164=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
configs/mx7ulp_evk_defconfig +1 -0
index 6bbacaa68618..d125ccc1af04 100644
@@ -21,6 +21,7 @@ CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7ULP=y
configs/mx7ulp_evk_plugin_defconfig +1 -0
index 549ca2e9643f..fcead94f57b3 100644
@@ -20,6 +20,7 @@ CONFIG_IMX_RGPIO2P=y
 # CONFIG_MXC_GPIO is not set
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7ULP=y
configs/odroid-xu3_defconfig +1 -0
index 4ec4e5871c5d..b8ebd56bf9d3 100644
@@ -34,6 +34,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_ADC=y
 CONFIG_ADC_EXYNOS=y
 CONFIG_DFU_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x5000000
configs/omap5_uevm_defconfig +1 -0
index 84d4e2b37cdc..9af25fdf9891 100644
@@ -29,6 +29,7 @@ CONFIG_SCSI_AHCI=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_CMD_TCA642X=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_CONS_INDEX=3
configs/opos6uldev_defconfig +1 -0
index 7dbeaf1044fb..cf5f52ccd874 100644
@@ -67,6 +67,7 @@ CONFIG_SYSCON=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_PWRSEQ=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/peach-pi_defconfig +1 -0
index f441d5eb9706..002d0969fe72 100644
@@ -37,6 +37,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/peach-pit_defconfig +1 -0
index f091d24f4f3a..33245efc55c6 100644
@@ -36,6 +36,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/pico-hobbit-imx6ul_defconfig +1 -0
index b5ac3a3b260e..0bfe0678a9c8 100644
@@ -44,6 +44,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/pico-hobbit-imx7d_defconfig +1 -0
index 59bc4249c7ed..24f69170a05e 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/pico-imx6ul_defconfig +1 -0
index f81b5a9692aa..366e3d381c59 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/pico-imx7d_defconfig +1 -0
index 3e870518610e..6ecd916ebd38 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/pico-pi-imx6ul_defconfig +1 -0
index d6c39e4f9de8..17b3ba328ea5 100644
@@ -44,6 +44,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
configs/pico-pi-imx7d_defconfig +1 -0
index 20a34eb5627e..9e6f0ffa5432 100644
@@ -46,6 +46,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/riotboard_defconfig +1 -0
index da08bb89186b..6b0d7e58532e 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/riotboard_spl_defconfig +1 -0
index 65ab90614fe9..d30fc2f4ca83 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
configs/smdk5250_defconfig +1 -0
index b9ab5192e929..bc34d21ca07a 100644
@@ -32,6 +32,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/smdk5420_defconfig +1 -0
index dc17e66a1729..6e555e562270 100644
@@ -27,6 +27,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/snow_defconfig +1 -0
index 43576f7fd7b0..2d34711dd887 100644
@@ -42,6 +42,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/spring_defconfig +1 -0
index 7ec9f674e561..7d4ae5ec08d4 100644
@@ -42,6 +42,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S5P=y
configs/stm32mp15_basic_defconfig +1 -0
index 6781adb81e73..88e1dfe96bc7 100644
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_STM32F7=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_STM32_SDMMC2=y
 CONFIG_PHY=y
 CONFIG_PHY_STM32_USBPHYC=y
configs/stm32mp15_trusted_defconfig +1 -0
index a050cee6918e..c416c8ca447c 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_I2C_STM32F7=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_STM32_SDMMC2=y
 CONFIG_PHY=y
 CONFIG_PHY_STM32_USBPHYC=y
configs/uniphier_ld4_sld8_defconfig +1 -0
index e69649f30915..3102ebf6507d 100644
@@ -39,6 +39,7 @@ CONFIG_GPIO_UNIPHIER=y
 CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/uniphier_v7_defconfig +1 -0
index 59ed7c2d74e4..75f8a7674ca9 100644
@@ -38,6 +38,7 @@ CONFIG_GPIO_UNIPHIER=y
 CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
configs/uniphier_v8_defconfig +1 -0
index b0c673c98e59..83f78776b7d2 100644
@@ -34,6 +34,7 @@ CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_UNIPHIER=y
 CONFIG_MMC_SDHCI=y
configs/vinco_defconfig +1 -0
index 5d929437bf35..745aa85f3b6d 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-vinco"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0
 CONFIG_SF_DEFAULT_SPEED=50000000
configs/vining_2000_defconfig +1 -0
index 5347ac8fe851..073ff4832968 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/warp7_bl33_defconfig +1 -0
index 6eaf152bace6..8290c5a4dc91 100644
@@ -29,6 +29,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
configs/warp7_defconfig +1 -0
index efd8860d28f3..0a0862ccfdcb 100644
@@ -38,6 +38,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
configs/warp_defconfig +1 -0
index df43a7986978..a37d76929692 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
 # CONFIG_NET is not set
 CONFIG_DFU_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
configs/xilinx_zynqmp_mini_emmc0_defconfig +1 -0
index d16ec756a99d..3c2ce615828c 100644
@@ -52,6 +52,7 @@ CONFIG_SPL_DM=y
 # CONFIG_DM_WARN is not set
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 # CONFIG_EFI_LOADER is not set
configs/xilinx_zynqmp_mini_emmc1_defconfig +1 -0
index 48b9b5d41d66..c347ef6eed34 100644
@@ -52,6 +52,7 @@ CONFIG_SPL_DM=y
 # CONFIG_DM_WARN is not set
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 # CONFIG_EFI_LOADER is not set
configs/xilinx_zynqmp_zc1275_revB_defconfig +1 -0
index aa44f0424337..5de861910cde 100644
@@ -37,6 +37,7 @@ CONFIG_CLK_ZYNQMP=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +1 -0
index bf141c5e168a..ce1ea089ce8d 100644
@@ -57,6 +57,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +1 -0
index 439f89e50f3c..877f5b230da3 100644
@@ -49,6 +49,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_MTD_DEVICE=y
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +1 -0
index 6f14234a590e..7cd1c905f8b1 100644
@@ -44,6 +44,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +1 -0
index f1970aadf417..e42d401b54ea 100644
@@ -43,6 +43,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_PHY_MARVELL=y
configs/xilinx_zynqmp_zcu100_revC_defconfig +1 -0
index cd7d2f5376d2..90163001da9f 100644
@@ -55,6 +55,7 @@ CONFIG_I2C_MUX_PCA954x=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +1 -0
index 371e6363db2f..62d23bf237c1 100644
@@ -70,6 +70,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_SDHCI=y
configs/xilinx_zynqmp_zcu102_revA_defconfig +1 -0
index a0fb6c3586cc..1fdee2fd384b 100644
@@ -71,6 +71,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu102_revB_defconfig +1 -0
index db7c093d5ebc..ccc72c52887e 100644
@@ -71,6 +71,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu104_revA_defconfig +1 -0
index eacf75d9f8e2..730640758a38 100644
@@ -56,6 +56,7 @@ CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu104_revC_defconfig +1 -0
index 1c9a6d6f1ec4..a4223ebdee54 100644
@@ -57,6 +57,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu106_revA_defconfig +1 -0
index 1b685ca04925..ed56ece40158 100644
@@ -66,6 +66,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xilinx_zynqmp_zcu111_revA_defconfig +1 -0
index 74106d7ea8fa..13816205caea 100644
@@ -58,6 +58,7 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SPI_FLASH=y
configs/xpress_defconfig +1 -0
index 2cbeeb390087..709a7ef90842 100644
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/xpress_spl_defconfig +1 -0
index cf4f0ed054a5..0026d60c2715 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
configs/zc5202_defconfig +1 -0
index 3c35bed1820c..8d8d172d2112 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=3
configs/zc5601_defconfig +1 -0
index 2f5de909ca2e..02f8da8fbaf6 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_ESDHC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_BUS=3
drivers/mmc/Kconfig +6 -0
index c34dd5d18790..e96e69370728 100644
@@ -78,6 +78,12 @@ config SUPPORT_EMMC_RPMB
          Enable support for reading, writing and programming the
          key for the Replay Protection Memory Block partition in eMMC.
 
+config SUPPORT_EMMC_BOOT
+       bool "Support some additional features of the eMMC boot partitions"
+       help
+         Enable support for eMMC boot partitions. This also enables
+         extensions within the mmc command.
+
 config MMC_IO_VOLTAGE
        bool "Support IO voltage configuration"
        help
include/configs/advantech_dms-ba16.h +0 -2
index 57edeee941e7..22d1e41bc8dc 100644
@@ -21,8 +21,6 @@
 #define CONFIG_LOADCMD "fatload"
 #define CONFIG_RFSPART "2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 #include "mx6_common.h"
 #include <linux/sizes.h>
 
include/configs/am57xx_evm.h +0 -0
index c14b010550fe..2c651aab178b 100644
@@ -63,8 +63,6 @@
 #define CONFIG_NET_RETRY_COUNT         10
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs longer aneg time at

1G */

include/configs/am57xx_evm.h +0 -2
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP
include/configs/apalis-tk1.h +0 -3
index 1d296ba51a05..9c8c8979f046 100644
@@ -18,9 +18,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
-/* SD/MMC support */
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-
 /* Environment in eMMC, before config block at the end of 1st "boot

sector" */
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \
CONFIG_TDX_CFG_BLOCK_OFFSET)

include/configs/apalis_imx6.h +0 -2
index 96169f55f08c..135a0d78287e 100644
@@ -46,8 +46,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-
 /*
  * SATA Configs
  */
include/configs/arndale.h +0 -3
index 06b02ce90a94..dd321c4748d0 100644
@@ -14,9 +14,6 @@
 #include "exynos5250-common.h"
 #include <configs/exynos5-common.h>
 
-/* SD/MMC configuration */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
include/configs/brppt1.h +0 -0
index ae9b75bb87ad..1d30d4e38f76 100644
@@ -31,11 +31,6 @@
 /*#define CONFIG_MACH_TYPE             3589*/
 #define CONFIG_MACH_TYPE               0xFFFFFFFF /* TODO: check with

kernel*/

include/configs/brppt1.h +0 -5
-/* MMC/SD IP block */
-#if defined(CONFIG_EMMC_BOOT)
- #define CONFIG_SUPPORT_EMMC_BOOT
-#endif /* CONFIG_EMMC_BOOT */
-
 /*
  * When we have NAND flash we expect to be making use of mtdparts,
  * both for ease of use in U-Boot and for passing information on to
include/configs/cl-som-imx7.h +0 -1
index 26d1a97891d8..4c93fc6cbea2 100644
@@ -153,7 +153,6 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2" /* USDHC1 */
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #endif
 
 /* USB Configs */
include/configs/clearfog.h +0 -4
index 9f8d3cc9e5e8..d8bd59cc070b 100644
@@ -26,10 +26,6 @@
  */
 #define CONFIG_SYS_MMC_BASE            MVEBU_SDIO_BASE
 
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
-#endif
-
 /* USB/EHCI configuration */
 #define CONFIG_EHCI_IS_TDI
 
include/configs/cm_t54.h +0 -1
index cda1b5528ffa..2387f864e32b 100644
@@ -41,7 +41,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* SATA Boot related defines */
 #define CONFIG_SPL_SATA_BOOT_DEVICE            0
include/configs/colibri_imx6.h +0 -2
index 803c9be0646b..acb79afb039c 100644
@@ -44,8 +44,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-
 /* Network */
 #define CONFIG_FEC_MXC
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
include/configs/colibri_imx7.h +0 -2
index 5a4b9801cb77..7dfc92c085b9 100644
@@ -35,8 +35,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       1
 #elif CONFIG_TARGET_COLIBRI_IMX7_EMMC
 #define CONFIG_SYS_FSL_USDHC_NUM       2
-
-#define CONFIG_SUPPORT_EMMC_BOOT
 #endif
 
 #undef CONFIG_BOOTM_PLAN9
include/configs/display5.h +0 -1
index 8ab47abfa85d..8829cbad913c 100644
@@ -83,7 +83,6 @@
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
include/configs/dra7xx_evm.h +0 -2
index f6be6595fe3c..aec70ee7182d 100644
@@ -96,8 +96,6 @@
 /* SPI SPL */
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x40000
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB xHCI HOST */
 #define CONFIG_USB_XHCI_OMAP
 
include/configs/dragonboard410c.h +0 -7
index cf021083ae28..7155ebac5c24 100644
@@ -31,13 +31,6 @@
  * it has to be done after each HCD reset */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
-/* Support all possible USB ethernet dongles */
-
-/* Extra Commands */
-/* Enable that for switching of boot partitions */
-/* Disabled by default as some sub-commands can brick eMMC */
-/*#define CONFIG_SUPPORT_EMMC_BOOT */
-
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
include/configs/edison.h +0 -1
index a6155ba5a8b9..218b50a1d9bb 100644
@@ -34,7 +34,6 @@
 #define CONFIG_ENV_SIZE                                (64 * 1024)
 #define CONFIG_ENV_OFFSET                      (3 * 1024 * 1024)
 #define CONFIG_ENV_OFFSET_REDUND               (6 * 1024 * 1024)
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* RTC */
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
include/configs/embestmx6boards.h +0 -1
index 858bed012c63..8bc7a3ad2e13 100644
@@ -76,7 +76,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 #define CONFIG_SYS_MMC_ENV_DEV         2       /* SDHC4 */
 #define CONFIG_ENV_OFFSET              (6 * 64 * 1024)
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 /* MarSBoard */
 #define CONFIG_FDTFILE "imx6q-marsboard.dtb"
include/configs/exynos5-common.h +0 -1
index db1fc934bbba..397bbf6d9d30 100644
@@ -44,7 +44,6 @@
 
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR    0x02020030
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* specific .lds file */
 
include/configs/ge_bx50v3.h +0 -3
index 196f114c60e8..0481ed06a91f 100644
@@ -19,9 +19,6 @@
 #define CONFIG_MXC_UART_BASE   UART3_BASE
 #define CONSOLE_DEV    "ttymxc2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
-
 #include "mx6_common.h"
 #include <linux/sizes.h>
 
include/configs/gw_ventana.h +0 -3
index 93608e5aec4d..02ceb4c8fc8b 100644
@@ -81,9 +81,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-/* eMMC Configs */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /*
  * SATA Configs
  */
include/configs/imx6dl-mamoj.h +0 -1
index 030dbedce81b..7605e145c2f3 100644
@@ -51,7 +51,6 @@
 
 /* MMC */
 #define CONFIG_SYS_MMC_ENV_DEV         2
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Ethernet */
 #define CONFIG_FEC_MXC_PHYADDR         1
include/configs/imx8mq_evk.h +0 -1
index 6094d1bf1800..35c1b65079e1 100644
@@ -225,7 +225,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 #define CONFIG_MXC_GPIO
include/configs/imx8qxp_mek.h +0 -1
index 312e30dc6c18..3259febdb94f 100644
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 #define USDHC1_BASE_ADDR                0x5B010000
 #define USDHC2_BASE_ADDR                0x5B020000
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
 
 #define CONFIG_ENV_OVERWRITE
 
include/configs/liteboard.h +0 -1
index a97ccb50b2ff..975f32474c4a 100644
@@ -24,7 +24,6 @@
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 #endif
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
include/configs/mt7623.h +0 -1
index e449364ad48a..5f67893f3127 100644
@@ -42,7 +42,6 @@
 
 /* MMC */
 #define MMC_SUPPORTS_TUNING
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* DRAM */
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
include/configs/mx6sabresd.h +0 -2
index 555942a2c2ab..ec1537541aea 100644
@@ -16,8 +16,6 @@
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 #define CONSOLE_DEV            "ttymxc0"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "mx6sabre_common.h"
 
 /* Falcon Mode */
include/configs/mx7dsabresd.h +0 -1
index 39d29de74468..77856a8f3a47 100644
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED           100000
 
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 #ifdef CONFIG_IMX_BOOTAUX
include/configs/mx7ulp_evk.h +0 -1
index b8dcaa10361d..5bd63929735e 100644
@@ -28,7 +28,6 @@
 #define IOMUXC_BASE_ADDR               IOMUXC1_RBASE
 
 #define CONFIG_FSL_USDHC
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 
 #define CONFIG_SYS_FSL_USDHC_NUM        1
 
include/configs/omap5_uevm.h +0 -1
index 66bd288040c1..0d8f945349dc 100644
@@ -39,7 +39,6 @@
 
 /* Enhance our eMMC support / experience. */
 #define CONFIG_HSMMC2_8BIT
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
 #define CONFIG_TCA642X
include/configs/opos6uldev.h +0 -3
index 70cf4665df37..e0c76ff43daa 100644
@@ -33,9 +33,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/pico-imx6ul.h +0 -1
index 050f69801b47..cd051bf263f8 100644
@@ -41,7 +41,6 @@
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/pico-imx7d.h +0 -1
index 0f6d6b789454..0fcecacc0e98 100644
@@ -58,7 +58,6 @@
        "bootmenu_1=Boot using PICO-Pi baseboard=" \
                "setenv fdtfile imx7d-pico-pi.dtb\0" \
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/stm32mp1.h +0 -1
index 737dfd6a5c2a..546d7bc88029 100644
@@ -78,7 +78,6 @@
 
 /*MMC SD*/
 #define CONFIG_SYS_MMC_MAX_DEVICE      3
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 
 /*****************************************************************************/

#ifdef CONFIG_DISTRO_DEFAULTS

include/configs/uniphier.h +0 -3
index 1e509ce9ad7b..3edff50a86be 100644
@@ -94,9 +94,6 @@
 #define CONFIG_SYS_NAND_DATA_BASE                      0x68000000
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS                  0
 
-/* SD/MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE +

0x01000000)

include/configs/vinco.h +0 -1
index ec22a30cda12..eebb3f7ca789 100644
@@ -43,7 +43,6 @@
 /* MMC */
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI                        0xfc000000
 #define CONFIG_SYS_MMC_CLK_OD          500000
include/configs/vining_2000.h +0 -1
index d3cbdc6f2e49..fd98c1417e70 100644
@@ -95,7 +95,6 @@
 #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 #ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SUPPORT_EMMC_BOOT
 #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 */
include/configs/warp.h +0 -1
index 9aa8a48d3d85..5345f5314d66 100644
@@ -23,7 +23,6 @@
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Watchdog */
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
include/configs/warp7.h +0 -1
index 043f2861b62d..82c483999031 100644
@@ -31,7 +31,6 @@
 
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
 #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
include/configs/xilinx_zynqmp.h +0 -4
index 91ae7088a50a..5759b44d2695 100644
@@ -47,10 +47,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_MAY_FAIL
 
-#if defined(CONFIG_MMC_SDHCI_ZYNQ)
-# define CONFIG_SUPPORT_EMMC_BOOT
-#endif
-
 #ifdef CONFIG_NAND_ARASAN
 # define CONFIG_SYS_MAX_NAND_DEVICE    1
 # define CONFIG_SYS_NAND_ONFI_DETECTION
include/configs/xpress.h +0 -1
index 08e0ca0c8f15..4cbf8aa5261d 100644
@@ -21,7 +21,6 @@
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
 
 /* I2C configs */
 #define CONFIG_SYS_I2C
include/configs/zc5202.h +0 -2
index 40d33f7830a5..77ff04754bc9 100644
@@ -12,8 +12,6 @@
 #define CONSOLE_DEV            "ttymxc1"
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "el6x_common.h"
 
 /* Ethernet */
include/configs/zc5601.h +0 -2
index b9673e2c0651..e4fe7a462d23 100644
@@ -13,8 +13,6 @@
 #define CONSOLE_DEV            "ttymxc1"
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p1"
 
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #include "el6x_common.h"
 
 /* Ethernet */
scripts/config_whitelist.txt +0 -2
index 5092c3fb4ce5..78ccef49fd11 100644
@@ -1940,7 +1940,6 @@ CONFIG_ST_SMI
 CONFIG_SUNXI_GPIO
 CONFIG_SUNXI_MAX_FB_SIZE
 CONFIG_SUPERH_ON_CHIP_R8A66597
-CONFIG_SUPPORT_EMMC_BOOT
 CONFIG_SUVD3
 CONFIG_SXNI855T
 CONFIG_SYSFLAGS_ADDR
--

2.17.1

#5 lore raw

PATCH 1/1 Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

In reply to Alex Kiernan
Quoted 75 lines · Alex Kiernan

This converts the following to Kconfig:
CONFIG_SUPPORT_EMMC_BOOT

---
Green travis build:

https://travis-ci.org/akiernan/u-boot/builds/521906850

Testing affected boards for configuration changes:

boards.cfg is up to date. Nothing to do.
Summary of 3 commits for 95 boards (4 threads, 1 job per thread) 01: Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx

     aarch64:  w+   xilinx_zynqmp_mini_emmc1 xilinx_zynqmp_mini_emmc0 xilinx_zynqmp_mini_qspi clearfog_gt_8k imx8qxp_mek xilinx_zynqmp_mini xilinx_zynqmp_mini_nand imx8mq_evk
         arm:  w+   cm_t54 cl-som-imx7 marsboard clearfog apalis_imx6 warp7 pico-hobbit-imx7d pico-pi-imx6ul dms-ba16 arndale riotboard pico-hobbit-imx6ul colibri_imx7 pico-imx7d xpress_spl opos6uldev warp7_bl33 imx6dl_mamoj ge_bx50v3 display5 mx7dsabresd_qspi display5_factory colibri_imx7_emmc gwventana_nand mx7dsabresd gwventana_gw5904 gwventana_emmc am57xx_hs_evm_usb omap5_uevm brppt1_spi xilinx_zynqmp_r5 vinco mx6sabresd warp riotboard_spl vining_2000 zc5601 zc5202 xpress pico-imx6ul dms-ba16-1g pico-pi-imx7d

02: configs: Resync with savedefconfig
03: Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

 README                                           | 3 ---
 configs/am57xx_evm_defconfig                     | 1 +
 configs/am57xx_hs_evm_defconfig                  | 1 +
 configs/am57xx_hs_evm_usb_defconfig              | 1 +
 configs/apalis-tk1_defconfig                     | 1 +
 configs/apalis_imx6_defconfig                    | 1 +
 configs/arndale_defconfig                        | 1 +
 configs/avnet_ultra96_rev1_defconfig             | 1 +
 configs/cl-som-imx7_defconfig                    | 1 +
 configs/clearfog_defconfig                       | 1 +
 configs/cm_t54_defconfig                         | 1 +
 configs/colibri_imx6_defconfig                   | 1 +
 configs/colibri_imx7_emmc_defconfig              | 1 +
 configs/display5_defconfig                       | 1 +
 configs/display5_factory_defconfig               | 1 +
 configs/dms-ba16-1g_defconfig                    | 1 +
 configs/dms-ba16_defconfig                       | 1 +
 configs/dra7xx_evm_defconfig                     | 1 +
 configs/dra7xx_hs_evm_defconfig                  | 1 +
 configs/dra7xx_hs_evm_usb_defconfig              | 1 +
 configs/edison_defconfig                         | 1 +
 configs/ge_bx50v3_defconfig                      | 1 +
 configs/gwventana_emmc_defconfig                 | 1 +
 configs/gwventana_gw5904_defconfig               | 1 +
 configs/gwventana_nand_defconfig                 | 1 +
 configs/imx6dl_mamoj_defconfig                   | 1 +
 configs/imx8mq_evk_defconfig                     | 1 +
 configs/imx8qxp_mek_defconfig                    | 1 +
 configs/liteboard_defconfig                      | 1 +
 configs/mt7623n_bpir2_defconfig                  | 1 +
 configs/mx6sabresd_defconfig                     | 1 +
 configs/mx7dsabresd_defconfig                    | 1 +
 configs/mx7dsabresd_qspi_defconfig               | 1 +
 configs/mx7ulp_evk_defconfig                     | 1 +
 configs/mx7ulp_evk_plugin_defconfig              | 1 +
 configs/odroid-xu3_defconfig                     | 1 +
 configs/omap5_uevm_defconfig                     | 1 +
 configs/opos6uldev_defconfig                     | 1 +
 configs/peach-pi_defconfig                       | 1 +
 configs/peach-pit_defconfig                      | 1 +
 configs/pico-hobbit-imx6ul_defconfig             | 1 +
 configs/pico-hobbit-imx7d_defconfig              | 1 +
 configs/pico-imx6ul_defconfig                    | 1 +
 configs/pico-imx7d_defconfig                     | 1 +
 configs/pico-pi-imx6ul_defconfig                 | 1 +
 configs/pico-pi-imx7d_defconfig                  | 1 +
 configs/riotboard_defconfig                      | 1 +
 configs/riotboard_spl_defconfig                  | 1 +
 configs/smdk5250_defconfig                       | 1 +
 configs/smdk5420_defconfig                       | 1 +
 configs/snow_defconfig                           | 1 +
 configs/spring_defconfig                         | 1 +
 configs/stm32mp15_basic_defconfig                | 1 +
 configs/stm32mp15_trusted_defconfig              | 1 +
 configs/uniphier_ld4_sld8_defconfig              | 1 +
 configs/uniphier_v7_defconfig                    | 1 +
Quoted 8 lines
 configs/uniphier_v8_defconfig                    | 1 +
 configs/vinco_defconfig                          | 1 +
 configs/vining_2000_defconfig                    | 1 +
 configs/warp7_bl33_defconfig                     | 1 +
 configs/warp7_defconfig                          | 1 +
 configs/warp_defconfig                           | 1 +
 configs/xilinx_zynqmp_mini_emmc0_defconfig       | 1 +
 configs/xilinx_zynqmp_mini_emmc1_defconfig       | 1 +

these 2 requires this option to be enabled.

Quoted 5 lines
 configs/xilinx_zynqmp_zc1275_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 +

these two.

Quoted 10 lines
 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
 configs/xilinx_zynqmp_zcu100_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu106_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu111_revA_defconfig      | 1 +

All of these boards have no EMMC that's why please don't enable this option for them.

Thanks,
Michal

#6 lore raw

PATCH 1/1 Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

Quoted 107 lines · Michal Simek
Quoted 75 lines · Alex Kiernan

This converts the following to Kconfig:
CONFIG_SUPPORT_EMMC_BOOT

---
Green travis build:

https://travis-ci.org/akiernan/u-boot/builds/521906850

Testing affected boards for configuration changes:

boards.cfg is up to date. Nothing to do.
Summary of 3 commits for 95 boards (4 threads, 1 job per thread) 01: Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx

     aarch64:  w+   xilinx_zynqmp_mini_emmc1 xilinx_zynqmp_mini_emmc0 xilinx_zynqmp_mini_qspi clearfog_gt_8k imx8qxp_mek xilinx_zynqmp_mini xilinx_zynqmp_mini_nand imx8mq_evk
         arm:  w+   cm_t54 cl-som-imx7 marsboard clearfog apalis_imx6 warp7 pico-hobbit-imx7d pico-pi-imx6ul dms-ba16 arndale riotboard pico-hobbit-imx6ul colibri_imx7 pico-imx7d xpress_spl opos6uldev warp7_bl33 imx6dl_mamoj ge_bx50v3 display5 mx7dsabresd_qspi display5_factory colibri_imx7_emmc gwventana_nand mx7dsabresd gwventana_gw5904 gwventana_emmc am57xx_hs_evm_usb omap5_uevm brppt1_spi xilinx_zynqmp_r5 vinco mx6sabresd warp riotboard_spl vining_2000 zc5601 zc5202 xpress pico-imx6ul dms-ba16-1g pico-pi-imx7d

02: configs: Resync with savedefconfig
03: Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

 README                                           | 3 ---
 configs/am57xx_evm_defconfig                     | 1 +
 configs/am57xx_hs_evm_defconfig                  | 1 +
 configs/am57xx_hs_evm_usb_defconfig              | 1 +
 configs/apalis-tk1_defconfig                     | 1 +
 configs/apalis_imx6_defconfig                    | 1 +
 configs/arndale_defconfig                        | 1 +
 configs/avnet_ultra96_rev1_defconfig             | 1 +
 configs/cl-som-imx7_defconfig                    | 1 +
 configs/clearfog_defconfig                       | 1 +
 configs/cm_t54_defconfig                         | 1 +
 configs/colibri_imx6_defconfig                   | 1 +
 configs/colibri_imx7_emmc_defconfig              | 1 +
 configs/display5_defconfig                       | 1 +
 configs/display5_factory_defconfig               | 1 +
 configs/dms-ba16-1g_defconfig                    | 1 +
 configs/dms-ba16_defconfig                       | 1 +
 configs/dra7xx_evm_defconfig                     | 1 +
 configs/dra7xx_hs_evm_defconfig                  | 1 +
 configs/dra7xx_hs_evm_usb_defconfig              | 1 +
 configs/edison_defconfig                         | 1 +
 configs/ge_bx50v3_defconfig                      | 1 +
 configs/gwventana_emmc_defconfig                 | 1 +
 configs/gwventana_gw5904_defconfig               | 1 +
 configs/gwventana_nand_defconfig                 | 1 +
 configs/imx6dl_mamoj_defconfig                   | 1 +
 configs/imx8mq_evk_defconfig                     | 1 +
 configs/imx8qxp_mek_defconfig                    | 1 +
 configs/liteboard_defconfig                      | 1 +
 configs/mt7623n_bpir2_defconfig                  | 1 +
 configs/mx6sabresd_defconfig                     | 1 +
 configs/mx7dsabresd_defconfig                    | 1 +
 configs/mx7dsabresd_qspi_defconfig               | 1 +
 configs/mx7ulp_evk_defconfig                     | 1 +
 configs/mx7ulp_evk_plugin_defconfig              | 1 +
 configs/odroid-xu3_defconfig                     | 1 +
 configs/omap5_uevm_defconfig                     | 1 +
 configs/opos6uldev_defconfig                     | 1 +
 configs/peach-pi_defconfig                       | 1 +
 configs/peach-pit_defconfig                      | 1 +
 configs/pico-hobbit-imx6ul_defconfig             | 1 +
 configs/pico-hobbit-imx7d_defconfig              | 1 +
 configs/pico-imx6ul_defconfig                    | 1 +
 configs/pico-imx7d_defconfig                     | 1 +
 configs/pico-pi-imx6ul_defconfig                 | 1 +
 configs/pico-pi-imx7d_defconfig                  | 1 +
 configs/riotboard_defconfig                      | 1 +
 configs/riotboard_spl_defconfig                  | 1 +
 configs/smdk5250_defconfig                       | 1 +
 configs/smdk5420_defconfig                       | 1 +
 configs/snow_defconfig                           | 1 +
 configs/spring_defconfig                         | 1 +
 configs/stm32mp15_basic_defconfig                | 1 +
 configs/stm32mp15_trusted_defconfig              | 1 +
 configs/uniphier_ld4_sld8_defconfig              | 1 +
 configs/uniphier_v7_defconfig                    | 1 +
Quoted 8 lines
 configs/uniphier_v8_defconfig                    | 1 +
 configs/vinco_defconfig                          | 1 +
 configs/vining_2000_defconfig                    | 1 +
 configs/warp7_bl33_defconfig                     | 1 +
 configs/warp7_defconfig                          | 1 +
 configs/warp_defconfig                           | 1 +
 configs/xilinx_zynqmp_mini_emmc0_defconfig       | 1 +
 configs/xilinx_zynqmp_mini_emmc1_defconfig       | 1 +

these 2 requires this option to be enabled.

Quoted 5 lines
 configs/xilinx_zynqmp_zc1275_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 +

these two.

Quoted 10 lines
 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
 configs/xilinx_zynqmp_zcu100_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu106_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu111_revA_defconfig      | 1 +
Quoted 3 lines

All of these boards have no EMMC that's why please don't enable this option for them.

Picking the first of those, with buildman run across this branch, looking at the build for the upstream branch point 7d9940674247 ("Merge tag 'pull-24apr19' of git://git.denx.de/u-boot-dm"), it's defined there:

$ fgrep CONFIG_SUPPORT_EMMC_BOOT
01_of_03_g7d994067424776b6184872b82fcaf4c0b95528f9_Merge-tag-\'pull-24ap/xilinx_zynqmp_zc1751_xm018_dc4/u-boot.cfg
#define CONFIG_SUPPORT_EMMC_BOOT

I can drop it, but that would be a change that this changeset introduces where it was intended to be exactly the same before and after - right now they all seem to get it because they define CONFIG_MMC_SDHCI_ZYNQ which triggers:

#if defined(CONFIG_MMC_SDHCI_ZYNQ)

# define CONFIG_SUPPORT_EMMC_BOOT
#endif

in include/configs/xilinx_zynqmp.h

Happy to drop it if you can let me know exactly which configs I should change - this is the list that buildman think has it in master:

xilinx_zynqmp_mini_emmc0
xilinx_zynqmp_mini_emmc1
xilinx_zynqmp_zc1275_revB
xilinx_zynqmp_zc1751_xm015_dc1
xilinx_zynqmp_zc1751_xm017_dc3
xilinx_zynqmp_zc1751_xm018_dc4
xilinx_zynqmp_zc1751_xm019_dc5
xilinx_zynqmp_zcu100_revC
xilinx_zynqmp_zcu102_rev1_0
xilinx_zynqmp_zcu102_revA
xilinx_zynqmp_zcu102_revB
xilinx_zynqmp_zcu104_revA
xilinx_zynqmp_zcu104_revC
xilinx_zynqmp_zcu106_revA
xilinx_zynqmp_zcu111_revA

Signature · 1 line
Alex Kiernan
#7 lore raw

PATCH 1/1 Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

Quoted 126 lines · Alex Kiernan
Quoted 107 lines · Michal Simek
Quoted 75 lines · Alex Kiernan

This converts the following to Kconfig:
CONFIG_SUPPORT_EMMC_BOOT

---
Green travis build:

https://travis-ci.org/akiernan/u-boot/builds/521906850

Testing affected boards for configuration changes:

boards.cfg is up to date. Nothing to do.
Summary of 3 commits for 95 boards (4 threads, 1 job per thread) 01: Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx

     aarch64:  w+   xilinx_zynqmp_mini_emmc1 xilinx_zynqmp_mini_emmc0 xilinx_zynqmp_mini_qspi clearfog_gt_8k imx8qxp_mek xilinx_zynqmp_mini xilinx_zynqmp_mini_nand imx8mq_evk
         arm:  w+   cm_t54 cl-som-imx7 marsboard clearfog apalis_imx6 warp7 pico-hobbit-imx7d pico-pi-imx6ul dms-ba16 arndale riotboard pico-hobbit-imx6ul colibri_imx7 pico-imx7d xpress_spl opos6uldev warp7_bl33 imx6dl_mamoj ge_bx50v3 display5 mx7dsabresd_qspi display5_factory colibri_imx7_emmc gwventana_nand mx7dsabresd gwventana_gw5904 gwventana_emmc am57xx_hs_evm_usb omap5_uevm brppt1_spi xilinx_zynqmp_r5 vinco mx6sabresd warp riotboard_spl vining_2000 zc5601 zc5202 xpress pico-imx6ul dms-ba16-1g pico-pi-imx7d

02: configs: Resync with savedefconfig
03: Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

 README                                           | 3 ---
 configs/am57xx_evm_defconfig                     | 1 +
 configs/am57xx_hs_evm_defconfig                  | 1 +
 configs/am57xx_hs_evm_usb_defconfig              | 1 +
 configs/apalis-tk1_defconfig                     | 1 +
 configs/apalis_imx6_defconfig                    | 1 +
 configs/arndale_defconfig                        | 1 +
 configs/avnet_ultra96_rev1_defconfig             | 1 +
 configs/cl-som-imx7_defconfig                    | 1 +
 configs/clearfog_defconfig                       | 1 +
 configs/cm_t54_defconfig                         | 1 +
 configs/colibri_imx6_defconfig                   | 1 +
 configs/colibri_imx7_emmc_defconfig              | 1 +
 configs/display5_defconfig                       | 1 +
 configs/display5_factory_defconfig               | 1 +
 configs/dms-ba16-1g_defconfig                    | 1 +
 configs/dms-ba16_defconfig                       | 1 +
 configs/dra7xx_evm_defconfig                     | 1 +
 configs/dra7xx_hs_evm_defconfig                  | 1 +
 configs/dra7xx_hs_evm_usb_defconfig              | 1 +
 configs/edison_defconfig                         | 1 +
 configs/ge_bx50v3_defconfig                      | 1 +
 configs/gwventana_emmc_defconfig                 | 1 +
 configs/gwventana_gw5904_defconfig               | 1 +
 configs/gwventana_nand_defconfig                 | 1 +
 configs/imx6dl_mamoj_defconfig                   | 1 +
 configs/imx8mq_evk_defconfig                     | 1 +
 configs/imx8qxp_mek_defconfig                    | 1 +
 configs/liteboard_defconfig                      | 1 +
 configs/mt7623n_bpir2_defconfig                  | 1 +
 configs/mx6sabresd_defconfig                     | 1 +
 configs/mx7dsabresd_defconfig                    | 1 +
 configs/mx7dsabresd_qspi_defconfig               | 1 +
 configs/mx7ulp_evk_defconfig                     | 1 +
 configs/mx7ulp_evk_plugin_defconfig              | 1 +
 configs/odroid-xu3_defconfig                     | 1 +
 configs/omap5_uevm_defconfig                     | 1 +
 configs/opos6uldev_defconfig                     | 1 +
 configs/peach-pi_defconfig                       | 1 +
 configs/peach-pit_defconfig                      | 1 +
 configs/pico-hobbit-imx6ul_defconfig             | 1 +
 configs/pico-hobbit-imx7d_defconfig              | 1 +
 configs/pico-imx6ul_defconfig                    | 1 +
 configs/pico-imx7d_defconfig                     | 1 +
 configs/pico-pi-imx6ul_defconfig                 | 1 +
 configs/pico-pi-imx7d_defconfig                  | 1 +
 configs/riotboard_defconfig                      | 1 +
 configs/riotboard_spl_defconfig                  | 1 +
 configs/smdk5250_defconfig                       | 1 +
 configs/smdk5420_defconfig                       | 1 +
 configs/snow_defconfig                           | 1 +
 configs/spring_defconfig                         | 1 +
 configs/stm32mp15_basic_defconfig                | 1 +
 configs/stm32mp15_trusted_defconfig              | 1 +
 configs/uniphier_ld4_sld8_defconfig              | 1 +
 configs/uniphier_v7_defconfig                    | 1 +
Quoted 8 lines
 configs/uniphier_v8_defconfig                    | 1 +
 configs/vinco_defconfig                          | 1 +
 configs/vining_2000_defconfig                    | 1 +
 configs/warp7_bl33_defconfig                     | 1 +
 configs/warp7_defconfig                          | 1 +
 configs/warp_defconfig                           | 1 +
 configs/xilinx_zynqmp_mini_emmc0_defconfig       | 1 +
 configs/xilinx_zynqmp_mini_emmc1_defconfig       | 1 +

these 2 requires this option to be enabled.

Quoted 5 lines
 configs/xilinx_zynqmp_zc1275_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 +

these two.

Quoted 10 lines
 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
 configs/xilinx_zynqmp_zcu100_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu104_revC_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu106_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu111_revA_defconfig      | 1 +
Quoted 3 lines

All of these boards have no EMMC that's why please don't enable this option for them.

Picking the first of those, with buildman run across this branch, looking at the build for the upstream branch point 7d9940674247 ("Merge tag 'pull-24apr19' of git://git.denx.de/u-boot-dm"), it's defined there:

$ fgrep CONFIG_SUPPORT_EMMC_BOOT
01_of_03_g7d994067424776b6184872b82fcaf4c0b95528f9_Merge-tag-\'pull-24ap/xilinx_zynqmp_zc1751_xm018_dc4/u-boot.cfg
#define CONFIG_SUPPORT_EMMC_BOOT

I can drop it, but that would be a change that this changeset introduces where it was intended to be exactly the same before and after - right now they all seem to get it because they define CONFIG_MMC_SDHCI_ZYNQ which triggers:

Quoted 9 lines

#if defined(CONFIG_MMC_SDHCI_ZYNQ)

# define CONFIG_SUPPORT_EMMC_BOOT
#endif

in include/configs/xilinx_zynqmp.h

Happy to drop it if you can let me know exactly which configs I should change - this is the list that buildman think has it in master:

If you want you can keep it like you have it now just to have the same behavior and in 2/2 please remove that option from these defconfigs.

xilinx_zynqmp_zc1275_revB
xilinx_zynqmp_zc1751_xm018_dc4
xilinx_zynqmp_zc1751_xm019_dc5
xilinx_zynqmp_zcu100_revC
xilinx_zynqmp_zcu102_rev1_0
xilinx_zynqmp_zcu102_revA
xilinx_zynqmp_zcu102_revB
xilinx_zynqmp_zcu104_revA
xilinx_zynqmp_zcu104_revC
xilinx_zynqmp_zcu106_revA
xilinx_zynqmp_zcu111_revA

Thanks,
Michal

#8 lore raw

PATCH 1/1 Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

In reply to Alex Kiernan
Quoted 10 lines · Alex Kiernan

This converts the following to Kconfig:
CONFIG_SUPPORT_EMMC_BOOT

 configs/edison_defconfig                         | 1 +
configs/edison_defconfig +0 -0
index 22fc84a41e38..b99906a4d144 100644

configs/edison_defconfig CONFIG_ENV_IS_IN_MMC=y · line 36

Quoted 7 lines
configs/edison_defconfig +1 -0
@@ -30,6 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CPU=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_RTC_MC146818=y
 CONFIG_USB_DWC3_GADGET=y
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#9 lore raw

PATCH 1/1 Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

Quoted 6 lines · Andy Shevchenko
Quoted 4 lines · Alex Kiernan

This converts the following to Kconfig:
CONFIG_SUPPORT_EMMC_BOOT

 configs/edison_defconfig                         | 1 +
Quoted 13 lines

configs/edison_defconfig CONFIG_ENV_IS_IN_MMC=y · line 36

Quoted 12 lines
configs/edison_defconfig +1 -0
index 22fc84a41e38..b99906a4d144 100644
@@ -30,6 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CPU=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_RTC_MC146818=y
 CONFIG_USB_DWC3_GADGET=y

Including

 include/configs/edison.h                         | 1 -
Quoted 1 line
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#10 lore raw

PATCH 1/1 Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

In reply to Alex Kiernan

Hi,

Quoted 16 lines · Alex Kiernan

This converts the following to Kconfig:
CONFIG_SUPPORT_EMMC_BOOT

---
Green travis build:

https://travis-ci.org/akiernan/u-boot/builds/521906850

Testing affected boards for configuration changes:

boards.cfg is up to date. Nothing to do.
Summary of 3 commits for 95 boards (4 threads, 1 job per thread) 01: Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx

     aarch64:  w+   xilinx_zynqmp_mini_emmc1 xilinx_zynqmp_mini_emmc0 xilinx_zynqmp_mini_qspi clearfog_gt_8k imx8qxp_mek xilinx_zynqmp_mini xilinx_zynqmp_mini_nand imx8mq_evk
         arm:  w+   cm_t54 cl-som-imx7 marsboard clearfog apalis_imx6 warp7 pico-hobbit-imx7d pico-pi-imx6ul dms-ba16 arndale riotboard pico-hobbit-imx6ul colibri_imx7 pico-imx7d xpress_spl opos6uldev warp7_bl33 imx6dl_mamoj ge_bx50v3 display5 mx7dsabresd_qspi display5_factory colibri_imx7_emmc gwventana_nand mx7dsabresd gwventana_gw5904 gwventana_emmc am57xx_hs_evm_usb omap5_uevm brppt1_spi xilinx_zynqmp_r5 vinco mx6sabresd warp riotboard_spl vining_2000 zc5601 zc5202 xpress pico-imx6ul dms-ba16-1g pico-pi-imx7d
Quoted 7 lines

02: configs: Resync with savedefconfig
03: Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

 configs/opos6uldev_defconfig                     | 1 +
 include/configs/opos6uldev.h                     | 3 ---

Regards,

Signature · 4 lines
Sébastien Szymanski
Software engineer, Armadeus Systems
Tel: +33 (0)9 72 29 41 44
Fax: +33 (0)9 72 28 79 26