From 35e3991d914c7b7b6bbe4609ab614ee77a0e5fd4 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 21 May 2020 16:26:03 -0400 Subject: [PATCH] Convert CONFIG_CMD_MMC to Kconfig This converts the following to Kconfig: CONFIG_CMD_MMC Signed-off-by: Tom Rini --- configs/bcm7260_defconfig | 1 + configs/bcm7445_defconfig | 1 + configs/gurnard_defconfig | 1 + configs/imx8mq_evk_defconfig | 1 + configs/imx8mq_phanbell_defconfig | 1 + configs/ls1021aiot_qspi_defconfig | 1 + configs/ls1021aiot_sdcard_defconfig | 1 + configs/pico-imx8mq_defconfig | 1 + configs/s32v234evb_defconfig | 1 + include/configs/bcmstb.h | 1 - include/configs/imx8mq_evk.h | 2 -- include/configs/imx8mq_phanbell.h | 2 -- include/configs/ls1021aiot.h | 1 - include/configs/pico-imx8mq.h | 2 -- include/configs/s32v234evb.h | 1 - include/configs/snapper9g45.h | 1 - 16 files changed, 9 insertions(+), 10 deletions(-) diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig index afb59ec884..d467e62dee 100644 --- a/configs/bcm7260_defconfig +++ b/configs/bcm7260_defconfig @@ -13,6 +13,7 @@ CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot>" +CONFIG_CMD_MMC=y CONFIG_EFI_PARTITION=y CONFIG_OF_PRIOR_STAGE=y CONFIG_ENV_IS_IN_MMC=y diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig index 0ae0595903..2c71a5efed 100644 --- a/configs/bcm7445_defconfig +++ b/configs/bcm7445_defconfig @@ -14,6 +14,7 @@ CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot>" +CONFIG_CMD_MMC=y CONFIG_CMD_SF_TEST=y CONFIG_CMD_SPI=y CONFIG_OF_PRIOR_STAGE=y diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig index a5d51ce610..7e394d9aec 100644 --- a/configs/gurnard_defconfig +++ b/configs/gurnard_defconfig @@ -16,6 +16,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y # CONFIG_CMD_LOADS is not set +CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_PART=y CONFIG_CMD_USB=y diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index 1504ecbbd6..7472bad9e6 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y CONFIG_CMD_CACHE=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT2=y diff --git a/configs/imx8mq_phanbell_defconfig b/configs/imx8mq_phanbell_defconfig index 651940ccf6..045d204897 100644 --- a/configs/imx8mq_phanbell_defconfig +++ b/configs/imx8mq_phanbell_defconfig @@ -21,6 +21,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y CONFIG_CMD_CACHE=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT2=y diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig index dba33e2a9b..cb73a04b35 100644 --- a/configs/ls1021aiot_qspi_defconfig +++ b/configs/ls1021aiot_qspi_defconfig @@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y diff --git a/configs/ls1021aiot_sdcard_defconfig b/configs/ls1021aiot_sdcard_defconfig index fc6df70db7..10b6930914 100644 --- a/configs/ls1021aiot_sdcard_defconfig +++ b/configs/ls1021aiot_sdcard_defconfig @@ -17,6 +17,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8 CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig index 2d68fe152c..470fd3a355 100644 --- a/configs/pico-imx8mq_defconfig +++ b/configs/pico-imx8mq_defconfig @@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_BOOTM_NETBSD is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y CONFIG_CMD_CACHE=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT2=y diff --git a/configs/s32v234evb_defconfig b/configs/s32v234evb_defconfig index 99720a9193..78450c23d6 100644 --- a/configs/s32v234evb_defconfig +++ b/configs/s32v234evb_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0xc0000000 CONFIG_SYS_MEMTEST_END=0xc7c00000 +CONFIG_CMD_MMC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index e58a9510de..5f6bf62524 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -130,7 +130,6 @@ extern phys_addr_t prior_stage_fdt_address; #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 -#define CONFIG_CMD_MMC /* * Flash configuration. diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 632c4eaf77..94183269cd 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -202,8 +202,6 @@ #define CONFIG_IMX_BOOTAUX -#define CONFIG_CMD_MMC - #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 4fa48c0578..72edbc74ec 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -193,8 +193,6 @@ #define CONFIG_IMX_BOOTAUX -#define CONFIG_CMD_MMC - #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 3eff1be023..6e94a2a4c9 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -120,7 +120,6 @@ /* * MMC */ -#define CONFIG_CMD_MMC /* SATA */ #define CONFIG_SCSI_AHCI_PLAT diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index a2f80cdd67..f4da38a7db 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -174,8 +174,6 @@ #define CONFIG_IMX_BOOTAUX -#define CONFIG_CMD_MMC - #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index ba0e506fa0..5821d21688 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -68,7 +68,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC_BASE_ADDR #define CONFIG_SYS_FSL_ESDHC_NUM 1 -#define CONFIG_CMD_MMC /* #define CONFIG_CMD_EXT2 EXT2 Support */ #if 0 diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 9b95054308..be36e9f586 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -101,7 +101,6 @@ /* Command line configuration */ #define CONFIG_CMD_MII -#define CONFIG_CMD_MMC #define CONFIG_CMD_CACHE #endif /* __CONFIG_H */ -- 2.39.5