[U-Boot] [PATCH] Convert CONFIG_FSL_USDHC to Kconfig
Peng Fan
peng.fan at nxp.com
Wed Aug 14 01:27:04 UTC 2019
> Subject: [PATCH] Convert CONFIG_FSL_USDHC to Kconfig
>
> This converts the following to Kconfig:
> CONFIG_FSL_USDHC
>
> Signed-off-by: Adam Ford <aford173 at gmail.com>
>
> diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c
> b/board/davinci/da8xxevm/omapl138_lcdk.c
> index 578d928443..94df37ab71 100644
> --- a/board/davinci/da8xxevm/omapl138_lcdk.c
> +++ b/board/davinci/da8xxevm/omapl138_lcdk.c
> @@ -226,10 +226,6 @@ int board_init(void)
> return 0;
> }
>
> -#ifdef CONFIG_DRIVER_TI_EMAC
> -
> -#endif /* CONFIG_DRIVER_TI_EMAC */
> -
This is not FSL SDHC related.
> #define CFG_MAC_ADDR_SPI_BUS 0
> #define CFG_MAC_ADDR_SPI_CS 0
> #define CFG_MAC_ADDR_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
> diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
> index b76c4c1b85..7b73265abd 100644
> --- a/configs/apalis_imx6_defconfig
> +++ b/configs/apalis_imx6_defconfig
> @@ -59,7 +59,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
> index 33e40cd7d3..18ef5d2dce 100644
> --- a/configs/aristainetos2_defconfig
> +++ b/configs/aristainetos2_defconfig
> @@ -35,7 +35,7 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_CMD_MTDPARTS=y
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_SPI_FLASH=y
> diff --git a/configs/aristainetos2b_defconfig
> b/configs/aristainetos2b_defconfig
> index 34a6cde1ee..1054c05d8c 100644
> --- a/configs/aristainetos2b_defconfig
> +++ b/configs/aristainetos2b_defconfig
> @@ -35,7 +35,7 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_CMD_MTDPARTS=y
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_SPI_FLASH=y
> diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
> index cb361daafb..4080a7b310 100644
> --- a/configs/aristainetos_defconfig
> +++ b/configs/aristainetos_defconfig
> @@ -35,7 +35,7 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_CMD_MTDPARTS=y
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_SPI_FLASH=y
> diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
> index ec042d7912..f8342ccb16 100644
> --- a/configs/cgtqmx6eval_defconfig
> +++ b/configs/cgtqmx6eval_defconfig
> @@ -55,7 +55,7 @@ CONFIG_DFU_MMC=y
> CONFIG_DFU_SF=y
> CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=20000000
> diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig
> index cad8f4bc5b..04d1042060 100644
> --- a/configs/cl-som-imx7_defconfig
> +++ b/configs/cl-som-imx7_defconfig
> @@ -51,7 +51,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb"
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=20000000
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 6f4fe45760..4c74c49309 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -57,7 +57,7 @@ CONFIG_DWC_AHSATA=y
> # CONFIG_DWC_AHSATA_AHCI is not set
> CONFIG_DM_KEYBOARD=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_SPI_FLASH=y
> diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
> index e184223773..4d6aa11b40 100644
> --- a/configs/colibri-imx6ull_defconfig
> +++ b/configs/colibri-imx6ull_defconfig
> @@ -52,7 +52,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_SYS_I2C_MXC=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
> index f792a9ef5c..6f8b63949c 100644
> --- a/configs/colibri_imx6_defconfig
> +++ b/configs/colibri_imx6_defconfig
> @@ -58,7 +58,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
> index 8e769cd70e..c1bee450f6 100644
> --- a/configs/colibri_imx7_defconfig
> +++ b/configs/colibri_imx7_defconfig
> @@ -52,7 +52,7 @@ CONFIG_DFU_NAND=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS_DT=y
> diff --git a/configs/colibri_imx7_emmc_defconfig
> b/configs/colibri_imx7_emmc_defconfig
> index 0c3a898aab..1a012d851e 100644
> --- a/configs/colibri_imx7_emmc_defconfig
> +++ b/configs/colibri_imx7_emmc_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000
> CONFIG_SECURE_BOOT=y
> CONFIG_TARGET_COLIBRI_IMX7=y
> CONFIG_TARGET_COLIBRI_IMX7_EMMC=y
> +CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
> CONFIG_IMX_RDC=y
> CONFIG_IMX_BOOTAUX=y
> # CONFIG_CMD_DEKBLOB is not set
> @@ -26,7 +27,6 @@ CONFIG_CRC32_VERIFY=y
> CONFIG_CMD_MEMTEST=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> -CONFIG_RANDOM_UUID=y
Why remove this?
> CONFIG_CMD_I2C=y
> CONFIG_CMD_MMC=y
> CONFIG_CMD_USB=y
> @@ -48,12 +48,11 @@ CONFIG_FASTBOOT_BUF_SIZE=0x10000000
> CONFIG_FASTBOOT_FLASH=y
> CONFIG_FASTBOOT_FLASH_MMC_DEV=0
> CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
> -CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig
> index 3022a187cc..8e749d9a03 100644
> --- a/configs/dh_imx6_defconfig
> +++ b/configs/dh_imx6_defconfig
> @@ -52,7 +52,7 @@ CONFIG_SYS_I2C_MXC=y
> CONFIG_MISC=y
> CONFIG_I2C_EEPROM=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/configs/display5_defconfig b/configs/display5_defconfig
> index 2275ee7d1b..3e8f1e9d7f 100644
> --- a/configs/display5_defconfig
> +++ b/configs/display5_defconfig
> @@ -67,7 +67,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_BOOTCOUNT_LIMIT=y
> CONFIG_BOOTCOUNT_BOOTLIMIT=3
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD_DEVICE=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_BUS=1
> diff --git a/configs/display5_factory_defconfig
> b/configs/display5_factory_defconfig
> index 40df91a59b..eb51d2e523 100644
> --- a/configs/display5_factory_defconfig
> +++ b/configs/display5_factory_defconfig
> @@ -65,7 +65,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DFU_MMC=y
> CONFIG_DFU_SF=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD_DEVICE=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_BUS=1
> diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
> index 91b6a7424f..fe23657107 100644
> --- a/configs/dms-ba16-1g_defconfig
> +++ b/configs/dms-ba16-1g_defconfig
> @@ -33,7 +33,7 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DWC_AHSATA=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=20000000
> diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
> index fbf1f89ece..a4c93a5805 100644
> --- a/configs/dms-ba16_defconfig
> +++ b/configs/dms-ba16_defconfig
> @@ -32,7 +32,7 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DWC_AHSATA=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=20000000
> diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig
> index 54197f7541..735165916a 100644
> --- a/configs/ge_bx50v3_defconfig
> +++ b/configs/ge_bx50v3_defconfig
> @@ -43,7 +43,7 @@ CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/configs/gwventana_emmc_defconfig
> b/configs/gwventana_emmc_defconfig
> index 70b663a526..5d869c08e1 100644
> --- a/configs/gwventana_emmc_defconfig
> +++ b/configs/gwventana_emmc_defconfig
> @@ -36,7 +36,6 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="Ventana > "
> CONFIG_CMD_BOOTZ=y
> -CONFIG_CMD_SPL_NAND_OFS=0x1100000
Why remove this?
> CONFIG_CMD_SPL_WRITE_SIZE=0x20000
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_GPIO=y
> @@ -64,7 +63,7 @@ CONFIG_DM=y
> CONFIG_DWC_AHSATA=y
> CONFIG_SUPPORT_EMMC_RPMB=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD_DEVICE=y
> CONFIG_PHYLIB=y
> CONFIG_E1000=y
> diff --git a/configs/gwventana_gw5904_defconfig
> b/configs/gwventana_gw5904_defconfig
> index 96acfff385..df3d35acc4 100644
> --- a/configs/gwventana_gw5904_defconfig
> +++ b/configs/gwventana_gw5904_defconfig
> @@ -36,7 +36,6 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="Ventana > "
> CONFIG_CMD_BOOTZ=y
> -CONFIG_CMD_SPL_NAND_OFS=0x1100000
Ditto.
> CONFIG_CMD_SPL_WRITE_SIZE=0x20000
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_GPIO=y
> @@ -64,7 +63,7 @@ CONFIG_DM=y
> CONFIG_DWC_AHSATA=y
> CONFIG_SUPPORT_EMMC_RPMB=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD_DEVICE=y
> CONFIG_PHYLIB=y
> CONFIG_MV88E61XX_SWITCH=y
> diff --git a/configs/gwventana_nand_defconfig
> b/configs/gwventana_nand_defconfig
> index e511fd3cb3..a0d38ae97b 100644
> --- a/configs/gwventana_nand_defconfig
> +++ b/configs/gwventana_nand_defconfig
> @@ -66,7 +66,7 @@ CONFIG_DM=y
> CONFIG_DWC_AHSATA=y
> CONFIG_SUPPORT_EMMC_RPMB=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> diff --git a/configs/imx6dl_icore_nand_defconfig
> b/configs/imx6dl_icore_nand_defconfig
> index b86b9e8773..6eb7c7ab3a 100644
> --- a/configs/imx6dl_icore_nand_defconfig
> +++ b/configs/imx6dl_icore_nand_defconfig
> @@ -39,7 +39,7 @@ CONFIG_CMD_UBI=y
> CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> diff --git a/configs/imx6dl_mamoj_defconfig
> b/configs/imx6dl_mamoj_defconfig
> index dbf230c7d6..44486cbfa3 100644
> --- a/configs/imx6dl_mamoj_defconfig
> +++ b/configs/imx6dl_mamoj_defconfig
> @@ -32,7 +32,7 @@ CONFIG_FASTBOOT_FLASH=y
> CONFIG_FASTBOOT_FLASH_MMC_DEV=2
> CONFIG_SYS_I2C_MXC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> diff --git a/configs/imx6q_icore_nand_defconfig
> b/configs/imx6q_icore_nand_defconfig
> index 4ea0803ab5..fc990a8add 100644
> --- a/configs/imx6q_icore_nand_defconfig
> +++ b/configs/imx6q_icore_nand_defconfig
> @@ -40,7 +40,7 @@ CONFIG_CMD_UBI=y
> CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig
> index b95c9783a4..e9f920f118 100644
> --- a/configs/imx6q_logic_defconfig
> +++ b/configs/imx6q_logic_defconfig
> @@ -4,7 +4,6 @@ CONFIG_SYS_TEXT_BASE=0x17800000
> CONFIG_SPL_GPIO_SUPPORT=y
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> CONFIG_SPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SYS_MALLOC_F_LEN=0x2000
Why drop this?
> CONFIG_TARGET_MX6LOGICPD=y
> CONFIG_SPL_MMC_SUPPORT=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> @@ -68,7 +67,7 @@ CONFIG_SPL_OF_TRANSLATE=y
> CONFIG_PCF8575_GPIO=y
> CONFIG_LED=y
> CONFIG_LED_GPIO=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> diff --git a/configs/imx6qdl_icore_mipi_defconfig
> b/configs/imx6qdl_icore_mipi_defconfig
> index 268c909882..5442ce7db4 100644
> --- a/configs/imx6qdl_icore_mipi_defconfig
> +++ b/configs/imx6qdl_icore_mipi_defconfig
> @@ -44,7 +44,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-mipi"
> CONFIG_OF_LIST="imx6q-icore-mipi imx6dl-icore-mipi"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_SMSC=y
> CONFIG_FEC_MXC=y
> diff --git a/configs/imx6qdl_icore_mmc_defconfig
> b/configs/imx6qdl_icore_mmc_defconfig
> index 353582a6c7..c7544c68c8 100644
> --- a/configs/imx6qdl_icore_mmc_defconfig
> +++ b/configs/imx6qdl_icore_mmc_defconfig
> @@ -14,7 +14,6 @@ CONFIG_DEBUG_UART_BASE=0x021f0000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_SPL_LIBDISK_SUPPORT=y
> # CONFIG_CMD_BMODE is not set
> -CONFIG_CMD_NANDBCB=y
> CONFIG_DEBUG_UART=y
> CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> @@ -55,7 +54,7 @@ CONFIG_BOOTCOUNT_LIMIT=y
> CONFIG_BOOTCOUNT_BOOTLIMIT=3
> CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> diff --git a/configs/imx6qdl_icore_nand_defconfig
> b/configs/imx6qdl_icore_nand_defconfig
> index 4672563ff9..fc990a8add 100644
> --- a/configs/imx6qdl_icore_nand_defconfig
> +++ b/configs/imx6qdl_icore_nand_defconfig
> @@ -8,7 +8,6 @@ CONFIG_TARGET_MX6Q_ENGICAM=y
> CONFIG_SPL_SERIAL_SUPPORT=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_SPL=y
> -CONFIG_SYS_MALLOC_F_LEN=0x2000
Ditto.
> # CONFIG_CMD_BMODE is not set
> CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> @@ -41,7 +40,7 @@ CONFIG_CMD_UBI=y
> CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> diff --git a/configs/imx6qdl_icore_rqs_defconfig
> b/configs/imx6qdl_icore_rqs_defconfig
> index 712c79f54e..9f0cc0ffed 100644
> --- a/configs/imx6qdl_icore_rqs_defconfig
> +++ b/configs/imx6qdl_icore_rqs_defconfig
> @@ -41,7 +41,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-rqs"
> CONFIG_OF_LIST="imx6q-icore-rqs imx6dl-icore-rqs"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> diff --git a/configs/imx6ul_geam_mmc_defconfig
> b/configs/imx6ul_geam_mmc_defconfig
> index 8a7b1ad6d5..620d979342 100644
> --- a/configs/imx6ul_geam_mmc_defconfig
> +++ b/configs/imx6ul_geam_mmc_defconfig
> @@ -38,7 +38,7 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_SMSC=y
> CONFIG_FEC_MXC=y
> diff --git a/configs/imx6ul_geam_nand_defconfig
> b/configs/imx6ul_geam_nand_defconfig
> index d24027cd69..94d43fdd04 100644
> --- a/configs/imx6ul_geam_nand_defconfig
> +++ b/configs/imx6ul_geam_nand_defconfig
> @@ -41,7 +41,7 @@ CONFIG_CMD_UBI=y
> CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam"
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> diff --git a/configs/imx6ul_isiot_emmc_defconfig
> b/configs/imx6ul_isiot_emmc_defconfig
> index 584d766262..f0f53bada7 100644
> --- a/configs/imx6ul_isiot_emmc_defconfig
> +++ b/configs/imx6ul_isiot_emmc_defconfig
> @@ -38,7 +38,7 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-emmc"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_SMSC=y
> CONFIG_FEC_MXC=y
> diff --git a/configs/imx6ul_isiot_nand_defconfig
> b/configs/imx6ul_isiot_nand_defconfig
> index 80f7cb3e03..05e0498a5e 100644
> --- a/configs/imx6ul_isiot_nand_defconfig
> +++ b/configs/imx6ul_isiot_nand_defconfig
> @@ -41,7 +41,7 @@ CONFIG_CMD_UBI=y
> CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-nand"
> CONFIG_ENV_IS_IN_NAND=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig
> index 87b25e6e1d..578e7010e5 100644
> --- a/configs/kp_imx6q_tpc_defconfig
> +++ b/configs/kp_imx6q_tpc_defconfig
> @@ -34,7 +34,7 @@ CONFIG_CMD_EXT4_WRITE=y
> # CONFIG_ISO_PARTITION is not set
> # CONFIG_EFI_PARTITION is not set
> CONFIG_ENV_IS_IN_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_ATHEROS=y
> CONFIG_FEC_MXC=y
> diff --git a/configs/liteboard_defconfig b/configs/liteboard_defconfig
> index 456f1e3fa9..03a0e88635 100644
> --- a/configs/liteboard_defconfig
> +++ b/configs/liteboard_defconfig
> @@ -39,7 +39,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_DM_ETH=y
> CONFIG_MII=y
> diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
> index f6e351f50a..27f1e09922 100644
> --- a/configs/marsboard_defconfig
> +++ b/configs/marsboard_defconfig
> @@ -21,7 +21,7 @@ CONFIG_CMD_CACHE=y
> CONFIG_CMD_EXT4_WRITE=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DM=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=20000000
> diff --git a/configs/mccmon6_nor_defconfig
> b/configs/mccmon6_nor_defconfig
> index cd78c5cb33..66f49c0e54 100644
> --- a/configs/mccmon6_nor_defconfig
> +++ b/configs/mccmon6_nor_defconfig
> @@ -28,7 +28,7 @@
> CONFIG_MTDPARTS_DEFAULT="mtdparts=8000000.nor:32m at 0x0(mccmon6
> -image.nor),256k at 0x
> CONFIG_ENV_IS_IN_FLASH=y
> CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> CONFIG_DM=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_MTD_NOR_FLASH=y
> CONFIG_MTD_DEVICE=y
> diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig
> index 17947860ee..501eaf6942 100644
> --- a/configs/mccmon6_sd_defconfig
> +++ b/configs/mccmon6_sd_defconfig
> @@ -29,7 +29,7 @@
> CONFIG_MTDPARTS_DEFAULT="mtdparts=8000000.nor:32m at 0x0(mccmon6
> -image.nor),256k at 0x
> CONFIG_ENV_IS_IN_FLASH=y
> CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> CONFIG_DM=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_MTD_NOR_FLASH=y
> CONFIG_MTD_DEVICE=y
> diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
> index 9fc443c386..3d73734609 100644
> --- a/configs/mx6cuboxi_defconfig
> +++ b/configs/mx6cuboxi_defconfig
> @@ -35,7 +35,7 @@ CONFIG_ENV_IS_IN_MMC=y
> CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> CONFIG_DM=y
> CONFIG_DWC_AHSATA=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> CONFIG_DM_THERMAL=y
> diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig
> index 866e0b5baa..4675c9d33c 100644
> --- a/configs/mx6dlarm2_defconfig
> +++ b/configs/mx6dlarm2_defconfig
> @@ -26,7 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MII=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> diff --git a/configs/mx6dlarm2_lpddr2_defconfig
> b/configs/mx6dlarm2_lpddr2_defconfig
> index 98ae70e026..cdca47e06d 100644
> --- a/configs/mx6dlarm2_lpddr2_defconfig
> +++ b/configs/mx6dlarm2_lpddr2_defconfig
> @@ -26,7 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MII=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig
> index ebb48c3aa3..d20e3dbbe1 100644
> --- a/configs/mx6memcal_defconfig
> +++ b/configs/mx6memcal_defconfig
> @@ -36,6 +36,7 @@ CONFIG_CMD_MEMTEST=y
> CONFIG_CMD_CACHE=y
> # CONFIG_NET is not set
> # CONFIG_MMC is not set
> +CONFIG_FSL_USDHC=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_MANUFACTURER="FSL"
> diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig
> index 8056e53da1..5f2b40f4a1 100644
> --- a/configs/mx6qarm2_defconfig
> +++ b/configs/mx6qarm2_defconfig
> @@ -26,7 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MII=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> diff --git a/configs/mx6qarm2_lpddr2_defconfig
> b/configs/mx6qarm2_lpddr2_defconfig
> index 27c215f6f7..3ca42d7344 100644
> --- a/configs/mx6qarm2_lpddr2_defconfig
> +++ b/configs/mx6qarm2_lpddr2_defconfig
> @@ -26,7 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MII=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> diff --git a/configs/mx6qsabrelite_defconfig
> b/configs/mx6qsabrelite_defconfig
> index 65e9c4f117..379407ab43 100644
> --- a/configs/mx6qsabrelite_defconfig
> +++ b/configs/mx6qsabrelite_defconfig
> @@ -35,7 +35,7 @@ CONFIG_DM=y
> CONFIG_DWC_AHSATA=y
> CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=25000000
> diff --git a/configs/mx6sabreauto_defconfig
> b/configs/mx6sabreauto_defconfig
> index 02f972af0d..516aac1f14 100644
> --- a/configs/mx6sabreauto_defconfig
> +++ b/configs/mx6sabreauto_defconfig
> @@ -62,7 +62,7 @@ CONFIG_DFU_MMC=y
> CONFIG_DFU_SF=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_DM_SPI_FLASH=y
> diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
> index 9400805831..2c88fe67c2 100644
> --- a/configs/mx6sabresd_defconfig
> +++ b/configs/mx6sabresd_defconfig
> @@ -74,7 +74,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=2
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig
> index 643cad4a65..e614ef29ea 100644
> --- a/configs/mx6slevk_defconfig
> +++ b/configs/mx6slevk_defconfig
> @@ -34,7 +34,7 @@ CONFIG_DM=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=20000000
> diff --git a/configs/mx6slevk_spinor_defconfig
> b/configs/mx6slevk_spinor_defconfig
> index 3dada9961a..6ade0ef142 100644
> --- a/configs/mx6slevk_spinor_defconfig
> +++ b/configs/mx6slevk_spinor_defconfig
> @@ -34,7 +34,7 @@ CONFIG_DM=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=20000000
> diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig
> index 63a7a74b0a..9b3f2252de 100644
> --- a/configs/mx6slevk_spl_defconfig
> +++ b/configs/mx6slevk_spl_defconfig
> @@ -43,7 +43,7 @@ CONFIG_DM=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=20000000
> diff --git a/configs/mx6sllevk_defconfig b/configs/mx6sllevk_defconfig
> index 81f5fa5e76..7efe321b88 100644
> --- a/configs/mx6sllevk_defconfig
> +++ b/configs/mx6sllevk_defconfig
> @@ -30,7 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX6=y
> CONFIG_DM_PMIC=y
> diff --git a/configs/mx6sllevk_plugin_defconfig
> b/configs/mx6sllevk_plugin_defconfig
> index 565dc890a7..4e6f1ed554 100644
> --- a/configs/mx6sllevk_plugin_defconfig
> +++ b/configs/mx6sllevk_plugin_defconfig
> @@ -31,7 +31,7 @@ CONFIG_ENV_IS_IN_MMC=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX6=y
> CONFIG_DM_PMIC=y
> diff --git a/configs/mx6sxsabreauto_defconfig
> b/configs/mx6sxsabreauto_defconfig
> index 11c2a82779..fa9853def6 100644
> --- a/configs/mx6sxsabreauto_defconfig
> +++ b/configs/mx6sxsabreauto_defconfig
> @@ -34,7 +34,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_PCA953X=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_DM_SPI_FLASH=y
> diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
> index 135961a0c4..c5fabf9950 100644
> --- a/configs/mx6sxsabresd_defconfig
> +++ b/configs/mx6sxsabresd_defconfig
> @@ -38,7 +38,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_BUS=1
> diff --git a/configs/mx6sxsabresd_spl_defconfig
> b/configs/mx6sxsabresd_spl_defconfig
> index 21c936648c..82093af750 100644
> --- a/configs/mx6sxsabresd_spl_defconfig
> +++ b/configs/mx6sxsabresd_spl_defconfig
> @@ -47,7 +47,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> CONFIG_PCI=y
> diff --git a/configs/mx6ul_14x14_evk_defconfig
> b/configs/mx6ul_14x14_evk_defconfig
> index 1d777b5fb2..c848c530a8 100644
> --- a/configs/mx6ul_14x14_evk_defconfig
> +++ b/configs/mx6ul_14x14_evk_defconfig
> @@ -44,7 +44,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/configs/mx6ul_9x9_evk_defconfig
> b/configs/mx6ul_9x9_evk_defconfig
> index 1014bd8a02..274fec0e58 100644
> --- a/configs/mx6ul_9x9_evk_defconfig
> +++ b/configs/mx6ul_9x9_evk_defconfig
> @@ -44,7 +44,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/configs/mx6ull_14x14_evk_defconfig
> b/configs/mx6ull_14x14_evk_defconfig
> index f4681a630c..2528ba8061 100644
> --- a/configs/mx6ull_14x14_evk_defconfig
> +++ b/configs/mx6ull_14x14_evk_defconfig
> @@ -30,7 +30,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_74X164=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig
> b/configs/mx6ull_14x14_evk_plugin_defconfig
> index 6fb30ce4f1..f71a495183 100644
> --- a/configs/mx6ull_14x14_evk_plugin_defconfig
> +++ b/configs/mx6ull_14x14_evk_plugin_defconfig
> @@ -31,7 +31,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_74X164=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
> index 45901f041f..1107507b51 100644
> --- a/configs/mx7dsabresd_defconfig
> +++ b/configs/mx7dsabresd_defconfig
> @@ -48,7 +48,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y
> CONFIG_MMC_IO_VOLTAGE=y
> CONFIG_MMC_UHS_SUPPORT=y
> CONFIG_MMC_HS200_SUPPORT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SPI_FLASH_EON=y
> CONFIG_PHYLIB=y
> diff --git a/configs/mx7dsabresd_qspi_defconfig
> b/configs/mx7dsabresd_qspi_defconfig
> index 2f566984d5..b8ced1994a 100644
> --- a/configs/mx7dsabresd_qspi_defconfig
> +++ b/configs/mx7dsabresd_qspi_defconfig
> @@ -48,7 +48,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y
> CONFIG_MMC_IO_VOLTAGE=y
> CONFIG_MMC_UHS_SUPPORT=y
> CONFIG_MMC_HS200_SUPPORT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_DM_SPI_FLASH=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig
> index d4eba65ac0..df854436a0 100644
> --- a/configs/mx7ulp_evk_defconfig
> +++ b/configs/mx7ulp_evk_defconfig
> @@ -22,7 +22,7 @@ CONFIG_IMX_RGPIO2P=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7ULP=y
> CONFIG_DM_REGULATOR=y
> diff --git a/configs/mx7ulp_evk_plugin_defconfig
> b/configs/mx7ulp_evk_plugin_defconfig
> index ae8d4b4d39..b2451adce7 100644
> --- a/configs/mx7ulp_evk_plugin_defconfig
> +++ b/configs/mx7ulp_evk_plugin_defconfig
> @@ -21,7 +21,7 @@ CONFIG_IMX_RGPIO2P=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7ULP=y
> CONFIG_DM_REGULATOR=y
> diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
> index c50e79aba8..11bee9b550 100644
> --- a/configs/nitrogen6dl2g_defconfig
> +++ b/configs/nitrogen6dl2g_defconfig
> @@ -37,7 +37,7 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=25000000
> diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
> index 85a8a8d708..141289f174 100644
> --- a/configs/nitrogen6dl_defconfig
> +++ b/configs/nitrogen6dl_defconfig
> @@ -37,7 +37,7 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=25000000
> diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
> index 5a2df361fd..841418350b 100644
> --- a/configs/nitrogen6q2g_defconfig
> +++ b/configs/nitrogen6q2g_defconfig
> @@ -39,7 +39,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DWC_AHSATA=y
> CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=25000000
> diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
> index fdc0f2b03f..e0af34c8a7 100644
> --- a/configs/nitrogen6q_defconfig
> +++ b/configs/nitrogen6q_defconfig
> @@ -39,7 +39,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DWC_AHSATA=y
> CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=25000000
> diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
> index 230b12f7e6..53eb96a986 100644
> --- a/configs/nitrogen6s1g_defconfig
> +++ b/configs/nitrogen6s1g_defconfig
> @@ -37,7 +37,7 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=25000000
> diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
> index 72e590a4fe..e60c237857 100644
> --- a/configs/nitrogen6s_defconfig
> +++ b/configs/nitrogen6s_defconfig
> @@ -37,7 +37,7 @@ CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_USB_FUNCTION_FASTBOOT=y
> CONFIG_FASTBOOT_BUF_ADDR=0x12000000
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=25000000
> diff --git a/configs/novena_defconfig b/configs/novena_defconfig
> index 93374282a6..c928b258b1 100644
> --- a/configs/novena_defconfig
> +++ b/configs/novena_defconfig
> @@ -49,7 +49,7 @@ CONFIG_DM=y
> CONFIG_DWC_AHSATA=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig
> index 14e15b03b2..a14a139298 100644
> --- a/configs/opos6uldev_defconfig
> +++ b/configs/opos6uldev_defconfig
> @@ -70,7 +70,7 @@ CONFIG_DM_I2C=y
> CONFIG_SYS_I2C_MXC=y
> CONFIG_PWRSEQ=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig
> index b33b0c4028..0fbfc61754 100644
> --- a/configs/ot1200_defconfig
> +++ b/configs/ot1200_defconfig
> @@ -32,7 +32,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DM=y
> CONFIG_DWC_AHSATA=y
> CONFIG_CMD_PCA953X=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_BUS=2
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig
> index 82ee6d0fc6..2999b57096 100644
> --- a/configs/ot1200_spl_defconfig
> +++ b/configs/ot1200_spl_defconfig
> @@ -42,7 +42,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DM=y
> CONFIG_DWC_AHSATA=y
> CONFIG_CMD_PCA953X=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_BUS=2
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig
> index f7e5faa27e..44aa70d656 100644
> --- a/configs/pcm058_defconfig
> +++ b/configs/pcm058_defconfig
> @@ -43,7 +43,7 @@ CONFIG_CMD_UBI=y
> # CONFIG_SPL_PARTITION_UUIDS is not set
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_DM=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig
> index f710d0dece..6787439e43 100644
> --- a/configs/pfla02_defconfig
> +++ b/configs/pfla02_defconfig
> @@ -42,7 +42,7 @@
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:-(nand);spi2.0:1024k(b
> ootloader),64k
> CONFIG_CMD_UBI=y
> # CONFIG_SPL_PARTITION_UUIDS is not set
> CONFIG_DM=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> diff --git a/configs/phycore_pcl063_defconfig
> b/configs/phycore_pcl063_defconfig
> index cf43b43924..91fdd5c53b 100644
> --- a/configs/phycore_pcl063_defconfig
> +++ b/configs/phycore_pcl063_defconfig
> @@ -35,7 +35,7 @@ CONFIG_OF_CONTROL=y
> CONFIG_DEFAULT_DEVICE_TREE="imx6ul-phycore-segin"
> CONFIG_DM_I2C_GPIO=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_MTD=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> diff --git a/configs/phycore_pcl063_ull_defconfig
> b/configs/phycore_pcl063_ull_defconfig
> index ff0cd6c3aa..4b9bb36984 100644
> --- a/configs/phycore_pcl063_ull_defconfig
> +++ b/configs/phycore_pcl063_ull_defconfig
> @@ -30,7 +30,7 @@ CONFIG_OF_CONTROL=y
> CONFIG_DEFAULT_DEVICE_TREE="imx6ull-phycore-segin"
> CONFIG_DM_I2C_GPIO=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_FEC_MXC=y
> diff --git a/configs/pico-hobbit-imx6ul_defconfig
> b/configs/pico-hobbit-imx6ul_defconfig
> index 55f25d5c24..7395598599 100644
> --- a/configs/pico-hobbit-imx6ul_defconfig
> +++ b/configs/pico-hobbit-imx6ul_defconfig
> @@ -46,7 +46,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> diff --git a/configs/pico-hobbit-imx7d_defconfig
> b/configs/pico-hobbit-imx7d_defconfig
> index 263f8f29a0..3869eb70cc 100644
> --- a/configs/pico-hobbit-imx7d_defconfig
> +++ b/configs/pico-hobbit-imx7d_defconfig
> @@ -51,14 +51,14 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
> CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> -CONFIG_DM_USB=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> CONFIG_USB=y
> +CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_MXC_USB_OTG_HACTIVE=y
> CONFIG_USB_GADGET=y
> diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig
> index 03452635e9..ad29af1b71 100644
> --- a/configs/pico-imx6ul_defconfig
> +++ b/configs/pico-imx6ul_defconfig
> @@ -48,7 +48,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> diff --git a/configs/pico-imx7d_bl33_defconfig
> b/configs/pico-imx7d_bl33_defconfig
> index 7c559cfec4..a2cddfcf4f 100644
> --- a/configs/pico-imx7d_bl33_defconfig
> +++ b/configs/pico-imx7d_bl33_defconfig
> @@ -43,14 +43,14 @@ CONFIG_NET_RANDOM_ETHADDR=y
> CONFIG_DFU_MMC=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> -CONFIG_DM_USB=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> CONFIG_CONS_INDEX=4
> CONFIG_USB=y
> +CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_MXC_USB_OTG_HACTIVE=y
> CONFIG_USB_GADGET=y
> @@ -64,4 +64,3 @@ CONFIG_USB_ETH_CDC=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> -CONFIG_OPTEE_TZDRAM_SIZE=0x2000000
> diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
> index 09b81e485e..3d45872a84 100644
> --- a/configs/pico-imx7d_defconfig
> +++ b/configs/pico-imx7d_defconfig
> @@ -51,14 +51,14 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
> CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> -CONFIG_DM_USB=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> CONFIG_USB=y
> +CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_MXC_USB_OTG_HACTIVE=y
> CONFIG_USB_GADGET=y
> diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig
> index 2e23c7b491..1a8a4541c6 100644
> --- a/configs/pico-pi-imx6ul_defconfig
> +++ b/configs/pico-pi-imx6ul_defconfig
> @@ -46,7 +46,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
> index 7689242716..b864b537c3 100644
> --- a/configs/pico-pi-imx7d_defconfig
> +++ b/configs/pico-pi-imx7d_defconfig
> @@ -51,14 +51,14 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
> CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> -CONFIG_DM_USB=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> CONFIG_USB=y
> +CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_MXC_USB_OTG_HACTIVE=y
> CONFIG_USB_GADGET=y
> diff --git a/configs/platinum_picon_defconfig
> b/configs/platinum_picon_defconfig
> index 4cc4954e84..886ddacba2 100644
> --- a/configs/platinum_picon_defconfig
> +++ b/configs/platinum_picon_defconfig
> @@ -48,7 +48,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),51
> 2k(env1),512k(env2),495M(ubi0),14M(res0),2M(res1),512k(res2),512k(res3),-(
> ubi1)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> diff --git a/configs/platinum_titanium_defconfig
> b/configs/platinum_titanium_defconfig
> index 1410bf8c8d..2367a17dd1 100644
> --- a/configs/platinum_titanium_defconfig
> +++ b/configs/platinum_titanium_defconfig
> @@ -48,7 +48,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:14M(spl),2M(uboot),51
> 2k(env1),512k(env2),-(ubi)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
> index 0b6304eb4d..8938b39c7f 100644
> --- a/configs/riotboard_defconfig
> +++ b/configs/riotboard_defconfig
> @@ -22,7 +22,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_DM=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=20000000
> diff --git a/configs/riotboard_spl_defconfig b/configs/riotboard_spl_defconfig
> index 427bd9dae3..cf3647a8f1 100644
> --- a/configs/riotboard_spl_defconfig
> +++ b/configs/riotboard_spl_defconfig
> @@ -32,7 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_DM=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=20000000
> diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig
> index 40ca954487..0b690f1ae7 100644
> --- a/configs/secomx6quq7_defconfig
> +++ b/configs/secomx6quq7_defconfig
> @@ -26,7 +26,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> diff --git a/configs/sksimx6_defconfig b/configs/sksimx6_defconfig
> index 748b13ea84..7bc687f64d 100644
> --- a/configs/sksimx6_defconfig
> +++ b/configs/sksimx6_defconfig
> @@ -33,7 +33,7 @@ CONFIG_CMD_CACHE=y
> CONFIG_CMD_EXT4_WRITE=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_DM=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
> index 88fbbf4bc0..f5859038be 100644
> --- a/configs/tbs2910_defconfig
> +++ b/configs/tbs2910_defconfig
> @@ -50,7 +50,7 @@ CONFIG_DM_I2C=y
> CONFIG_SYS_I2C_MXC=y
> CONFIG_DM_KEYBOARD=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> CONFIG_PCI=y
> diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig
> index 2816f66c8e..86d1da3324 100644
> --- a/configs/titanium_defconfig
> +++ b/configs/titanium_defconfig
> @@ -34,7 +34,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
>
> CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:16M(uboot),512k(env1)
> ,512k(env2),-(ubi)"
> CONFIG_CMD_UBI=y
> CONFIG_ENV_IS_IN_NAND=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_NAND=y
> CONFIG_NAND_MXS=y
> CONFIG_PHYLIB=y
> diff --git a/configs/tqma6dl_mba6_mmc_defconfig
> b/configs/tqma6dl_mba6_mmc_defconfig
> index 887f938c70..4f2d4141c8 100644
> --- a/configs/tqma6dl_mba6_mmc_defconfig
> +++ b/configs/tqma6dl_mba6_mmc_defconfig
> @@ -32,7 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=50000000
> diff --git a/configs/tqma6dl_mba6_spi_defconfig
> b/configs/tqma6dl_mba6_spi_defconfig
> index 6abefa3bdd..9ad9ea3c2d 100644
> --- a/configs/tqma6dl_mba6_spi_defconfig
> +++ b/configs/tqma6dl_mba6_spi_defconfig
> @@ -33,7 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=50000000
> diff --git a/configs/tqma6q_mba6_mmc_defconfig
> b/configs/tqma6q_mba6_mmc_defconfig
> index 67aae058ae..36b4b3cae8 100644
> --- a/configs/tqma6q_mba6_mmc_defconfig
> +++ b/configs/tqma6q_mba6_mmc_defconfig
> @@ -31,7 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=50000000
> diff --git a/configs/tqma6q_mba6_spi_defconfig
> b/configs/tqma6q_mba6_spi_defconfig
> index 6ecba56ea2..21bc3fab75 100644
> --- a/configs/tqma6q_mba6_spi_defconfig
> +++ b/configs/tqma6q_mba6_spi_defconfig
> @@ -32,7 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=50000000
> diff --git a/configs/tqma6s_mba6_mmc_defconfig
> b/configs/tqma6s_mba6_mmc_defconfig
> index d291d0fd98..0a8cc6d171 100644
> --- a/configs/tqma6s_mba6_mmc_defconfig
> +++ b/configs/tqma6s_mba6_mmc_defconfig
> @@ -32,7 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=50000000
> diff --git a/configs/tqma6s_mba6_spi_defconfig
> b/configs/tqma6s_mba6_spi_defconfig
> index b5acd0e856..e02b8a5c10 100644
> --- a/configs/tqma6s_mba6_spi_defconfig
> +++ b/configs/tqma6s_mba6_spi_defconfig
> @@ -33,7 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=50000000
> diff --git a/configs/tqma6s_wru4_mmc_defconfig
> b/configs/tqma6s_wru4_mmc_defconfig
> index f2a8376111..03e893044b 100644
> --- a/configs/tqma6s_wru4_mmc_defconfig
> +++ b/configs/tqma6s_wru4_mmc_defconfig
> @@ -59,7 +59,7 @@ CONFIG_LED_STATUS_BIT5=5
> CONFIG_LED_STATUS_STATE5=2
> CONFIG_LED_STATUS_CMD=y
> CONFIG_PCA9551_LED=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> CONFIG_USB=y
> diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig
> index 259ffee043..ea6da7aa65 100644
> --- a/configs/udoo_defconfig
> +++ b/configs/udoo_defconfig
> @@ -29,7 +29,7 @@ CONFIG_ENV_IS_IN_MMC=y
> CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> CONFIG_DM=y
> CONFIG_DWC_AHSATA=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig
> index 4f00e48110..597f557f7b 100644
> --- a/configs/udoo_neo_defconfig
> +++ b/configs/udoo_neo_defconfig
> @@ -28,7 +28,7 @@ CONFIG_CMD_CACHE=y
> CONFIG_CMD_TIME=y
> CONFIG_CMD_EXT4_WRITE=y
> CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> diff --git a/configs/variscite_dart6ul_defconfig
> b/configs/variscite_dart6ul_defconfig
> index 55f4ff59d2..cb1b17c424 100644
> --- a/configs/variscite_dart6ul_defconfig
> +++ b/configs/variscite_dart6ul_defconfig
> @@ -30,7 +30,7 @@ CONFIG_OF_CONTROL=y
> CONFIG_DEFAULT_DEVICE_TREE="imx6ull-dart-6ul"
> CONFIG_DM_I2C_GPIO=y
> CONFIG_SYS_I2C_MXC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_FEC_MXC=y
> diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig
> index 6b9691ad3e..19e0a911e7 100644
> --- a/configs/vining_2000_defconfig
> +++ b/configs/vining_2000_defconfig
> @@ -42,14 +42,14 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_RPMB=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> -CONFIG_PWM_IMX=y
> CONFIG_PCI=y
> CONFIG_DM_PCI=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX6=y
> +CONFIG_PWM_IMX=y
> CONFIG_SPECIFY_CONSOLE_INDEX=y
> CONFIG_DM_SERIAL=y
> CONFIG_MXC_UART=y
> diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
> index c4a9624f4b..f07ec5f651 100644
> --- a/configs/wandboard_defconfig
> +++ b/configs/wandboard_defconfig
> @@ -54,7 +54,7 @@ CONFIG_SYS_I2C_MXC_I2C1=y
> CONFIG_SYS_I2C_MXC_I2C2=y
> CONFIG_SYS_I2C_MXC_I2C3=y
> CONFIG_DM_MMC=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig
> index 0f28d5881d..80accfb509 100644
> --- a/configs/warp7_bl33_defconfig
> +++ b/configs/warp7_bl33_defconfig
> @@ -4,6 +4,9 @@ CONFIG_SYS_TEXT_BASE=0x87800000
> CONFIG_SECURE_BOOT=y
> CONFIG_TARGET_WARP7=y
> CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
> +CONFIG_FIT=y
> +CONFIG_FIT_SIGNATURE=y
> +CONFIG_FIT_VERBOSE=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp7/imximage.cfg"
> CONFIG_BOUNCE_BUFFER=y
> CONFIG_HUSH_PARSER=y
> @@ -30,7 +33,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> CONFIG_DM_PMIC=y
> @@ -41,6 +44,7 @@ CONFIG_DM_REGULATOR_FIXED=y
> CONFIG_DM_REGULATOR_GPIO=y
> CONFIG_SPECIFY_CONSOLE_INDEX=y
> CONFIG_DM_SERIAL=y
> +CONFIG_OPTEE=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> @@ -54,11 +58,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> -CONFIG_OPTEE=y
> -CONFIG_OPTEE_TZDRAM_BASE=0x9e000000
> -CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
> -CONFIG_FIT=y
> -CONFIG_FIT_SIGNATURE=y
> -CONFIG_FIT_VERBOSE=y
> -CONFIG_OF_LIBFDT=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> +CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
> +CONFIG_OPTEE_TZDRAM_BASE=0x9e000000
> diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
> index 11f16cf47d..a022454976 100644
> --- a/configs/warp7_defconfig
> +++ b/configs/warp7_defconfig
> @@ -39,7 +39,7 @@ CONFIG_DM_GPIO=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> CONFIG_DM_PMIC=y
> diff --git a/configs/warp_defconfig b/configs/warp_defconfig
> index 0f911a9669..7a6ea6f8c6 100644
> --- a/configs/warp_defconfig
> +++ b/configs/warp_defconfig
> @@ -30,7 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y
> # CONFIG_NET is not set
> CONFIG_DFU_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> diff --git a/configs/xpress_defconfig b/configs/xpress_defconfig
> index 64fed1dc72..70cdd792b7 100644
> --- a/configs/xpress_defconfig
> +++ b/configs/xpress_defconfig
> @@ -26,7 +26,7 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> CONFIG_USB=y
> diff --git a/configs/xpress_spl_defconfig b/configs/xpress_spl_defconfig
> index c203353f58..913d577bcd 100644
> --- a/configs/xpress_spl_defconfig
> +++ b/configs/xpress_spl_defconfig
> @@ -37,7 +37,7 @@ CONFIG_CMD_FAT=y
> CONFIG_CMD_FS_GENERIC=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SUPPORT_EMMC_BOOT=y
> -CONFIG_FSL_ESDHC_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_MII=y
> CONFIG_USB=y
> diff --git a/configs/zc5202_defconfig b/configs/zc5202_defconfig
> index 1aee743590..2b539f21be 100644
> --- a/configs/zc5202_defconfig
> +++ b/configs/zc5202_defconfig
> @@ -35,7 +35,7 @@ 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_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_BUS=3
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/configs/zc5601_defconfig b/configs/zc5601_defconfig
> index f361ad93a8..fd208e7752 100644
> --- a/configs/zc5601_defconfig
> +++ b/configs/zc5601_defconfig
> @@ -34,7 +34,7 @@ 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_IMX=y
> +CONFIG_FSL_USDHC=y
> CONFIG_SPI_FLASH=y
> CONFIG_SF_DEFAULT_BUS=3
> CONFIG_SF_DEFAULT_MODE=0
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
> index c6812f6517..b758b250f5 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -694,6 +694,13 @@ config FSL_ESDHC_IMX
> This selects support for the i.MX eSDHC (Enhanced Secure Digital Host
> Controller) found on numerous Freescale/NXP SoCs.
>
> +config FSL_USDHC
> + bool "Freescale/NXP i.MX uSDHC controller support"
> + depends on MX6 || MX7 ||ARCH_MX7ULP || IMX8
> + select FSL_ESDHC_IMX
> + help
> + This enables the Ultra Secured Digital Host Controller enhancements
> +
> endmenu
>
> config SYS_FSL_ERRATUM_ESDHC111
> diff --git a/include/configs/advantech_dms-ba16.h
> b/include/configs/advantech_dms-ba16.h
> index a037349162..1298859812 100644
> --- a/include/configs/advantech_dms-ba16.h
> +++ b/include/configs/advantech_dms-ba16.h
> @@ -39,7 +39,6 @@
> #define CONFIG_LBA48
>
> /* MMC Configs */
> -#define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
>
> /* USB Configs */
> diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
> index 32623c263a..6eb8395162 100644
> --- a/include/configs/apalis-imx8.h
> +++ b/include/configs/apalis-imx8.h
> @@ -15,7 +15,6 @@
>
> #undef CONFIG_BOOTM_NETBSD
>
> -#define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> #define USDHC1_BASE_ADDR 0x5b010000
> #define USDHC2_BASE_ADDR 0x5b020000
> diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
> index 974571df43..4eceb10e8f 100644
> --- a/include/configs/apalis_imx6.h
> +++ b/include/configs/apalis_imx6.h
> @@ -42,7 +42,6 @@
> #define CONFIG_SYS_MXC_I2C3_SPEED 400000
>
> /* MMC Configs */
> -#define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> #define CONFIG_SYS_FSL_USDHC_NUM 3
>
> diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
> index 4c93fc6cbe..8ae9eb5a7b 100644
> --- a/include/configs/cl-som-imx7.h
> +++ b/include/configs/cl-som-imx7.h
> @@ -147,7 +147,6 @@
> #define CONFIG_ENV_SECT_SIZE (64 * 1024)
>
> /* MMC Config*/
> -#define CONFIG_FSL_USDHC
> #ifdef CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
>
> diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
> index 2469066849..6f3c34d1ad 100644
> --- a/include/configs/colibri-imx8x.h
> +++ b/include/configs/colibri-imx8x.h
> @@ -15,7 +15,6 @@
>
> #undef CONFIG_BOOTM_NETBSD
>
> -#define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> #define USDHC1_BASE_ADDR 0x5b010000
> #define USDHC2_BASE_ADDR 0x5b020000
> diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
> index 147f801353..aee9f2f1d0 100644
> --- a/include/configs/colibri_imx6.h
> +++ b/include/configs/colibri_imx6.h
> @@ -40,7 +40,6 @@
> #define CONFIG_SYS_MXC_I2C3_SPEED 400000
>
> /* MMC Configs */
> -#define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> #define CONFIG_SYS_FSL_USDHC_NUM 2
>
> diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
> index fb1b899d71..4f99805ee2 100644
> --- a/include/configs/dart_6ul.h
> +++ b/include/configs/dart_6ul.h
> @@ -55,7 +55,6 @@
> #define CONFIG_MXC_UART_BASE UART1_BASE
>
> /* MMC Configs */
> -#define CONFIG_FSL_USDHC
>
> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
> #define CONFIG_SUPPORT_EMMC_BOOT
> diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
> index 7d2e573846..c3a17b010c 100644
> --- a/include/configs/dh_imx6.h
> +++ b/include/configs/dh_imx6.h
> @@ -49,7 +49,6 @@
> #define CONFIG_ARP_TIMEOUT 200UL
>
> /* MMC Configs */
> -#define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> #define CONFIG_SYS_FSL_USDHC_NUM 3
> #define CONFIG_SYS_MMC_ENV_DEV 2 /* 1 = SDHC3, 2 = SDHC4
> (eMMC) */
> diff --git a/include/configs/display5.h b/include/configs/display5.h
> index 1d3334ff12..e3f90a6279 100644
> --- a/include/configs/display5.h
> +++ b/include/configs/display5.h
> @@ -77,7 +77,6 @@
> #endif
>
> /* MMC Configs */
> -#define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> #define CONFIG_SYS_FSL_USDHC_NUM 2
>
> diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
> index 16e4136fa9..c2113439c3 100644
> --- a/include/configs/imx8mq_evk.h
> +++ b/include/configs/imx8mq_evk.h
> @@ -216,7 +216,6 @@
> #define CONFIG_IMX_BOOTAUX
>
> #define CONFIG_CMD_MMC
> -#define CONFIG_FSL_USDHC
>
> #define CONFIG_SYS_FSL_USDHC_NUM 2
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
> index 8fdf677573..5a9fd57060 100644
> --- a/include/configs/imx8qm_mek.h
> +++ b/include/configs/imx8qm_mek.h
> @@ -47,7 +47,6 @@
> #undef CONFIG_CMD_CRC32
> #undef CONFIG_BOOTM_NETBSD
>
> -#define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> #define USDHC1_BASE_ADDR 0x5B010000
> #define USDHC2_BASE_ADDR 0x5B020000
> diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
> index c1f193487e..02c4e9f8f6 100644
> --- a/include/configs/imx8qxp_mek.h
> +++ b/include/configs/imx8qxp_mek.h
> @@ -46,7 +46,6 @@
> #undef CONFIG_CMD_CRC32
> #undef CONFIG_BOOTM_NETBSD
>
> -#define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> #define USDHC1_BASE_ADDR 0x5B010000
> #define USDHC2_BASE_ADDR 0x5B020000
> diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
> index dbae276121..2435ebbc7f 100644
> --- a/include/configs/kp_imx6q_tpc.h
> +++ b/include/configs/kp_imx6q_tpc.h
> @@ -39,7 +39,6 @@
> #define CONFIG_SYS_I2C_SPEED 100000
>
> /* MMC Configs */
> -#define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> #define CONFIG_SYS_FSL_USDHC_NUM 2
> #define CONFIG_SYS_MMC_ENV_DEV 1 /* 0 = SDHC2, 1 = SDHC4
> (eMMC) */
> diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
> index 2b8ce9d71d..f6c0e21d07 100644
> --- a/include/configs/mx6_common.h
> +++ b/include/configs/mx6_common.h
> @@ -55,7 +55,6 @@
> #define CONFIG_SYS_MAXARGS 32
>
> /* MMC */
> -#define CONFIG_FSL_USDHC
>
> /* Secure boot (HAB) support */
> #ifdef CONFIG_SECURE_BOOT
> diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
> index 4f822ef9a0..70dda35eb0 100644
> --- a/include/configs/mx7_common.h
> +++ b/include/configs/mx7_common.h
> @@ -40,7 +40,6 @@
> #define CONFIG_MXC_UART
>
> /* MMC */
> -#define CONFIG_FSL_USDHC
>
> #define CONFIG_ARMV7_SECURE_BASE 0x00900000
>
> diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
> index 2af5a4fe3e..763a46b47f 100644
> --- a/include/configs/mx7ulp_evk.h
> +++ b/include/configs/mx7ulp_evk.h
> @@ -27,8 +27,6 @@
> #define IRAM_BASE_ADDR OCRAM_0_BASE
> #define IOMUXC_BASE_ADDR IOMUXC1_RBASE
>
> -#define CONFIG_FSL_USDHC
> -
> #define CONFIG_SYS_FSL_USDHC_NUM 1
>
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
> index 8fef250ac4..943fca9377 100644
> --- a/include/configs/pcl063.h
> +++ b/include/configs/pcl063.h
> @@ -31,7 +31,6 @@
> #define CONFIG_MXC_UART_BASE UART1_BASE
>
> /* MMC Configs */
> -#define CONFIG_FSL_USDHC
>
> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
>
> diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
> index 0f1a010b4e..650caaa573 100644
> --- a/include/configs/pcl063_ull.h
> +++ b/include/configs/pcl063_ull.h
> @@ -37,7 +37,6 @@
> #define CONFIG_MXC_UART_BASE UART1_BASE
>
> /* MMC Configs */
> -#define CONFIG_FSL_USDHC
>
> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
> #define CONFIG_SUPPORT_EMMC_BOOT
> diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
> index 216932046b..cc6d920637 100644
> --- a/include/configs/s32v234evb.h
> +++ b/include/configs/s32v234evb.h
> @@ -65,7 +65,6 @@
> #define CONFIG_ENV_OVERWRITE
> #define CONFIG_SYS_UART_PORT (1)
>
> -#define CONFIG_FSL_USDHC
> #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC_BASE_ADDR
> #define CONFIG_SYS_FSL_ESDHC_NUM 1
>
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 53db749a65..816e910772 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -625,7 +625,6 @@ CONFIG_FSL_SGMII_RISER
> CONFIG_FSL_SPI_INTERFACE
> CONFIG_FSL_TBCLK_EXTRA_DIV
> CONFIG_FSL_TRUST_ARCH_v1
> -CONFIG_FSL_USDHC
> CONFIG_FSL_VIA
> CONFIG_FSMC_NAND_BASE
> CONFIG_FSMTDBLK
Regards,
Peng.
> --
> 2.17.1
More information about the U-Boot
mailing list