Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass <sjg@chromium.org>
@@ -21,6 +21,9 @@ config SPL_LIBDISK_SUPPORT
config SPL_LIBGENERIC_SUPPORT
default y
+config SPL_MMC_SUPPORT
+ default y
+
choice
prompt "OMAP3 board select"
optional
prompt "OMAP4 board select"
prompt "OMAP5 board select"
@@ -12,6 +12,9 @@ config SPL_LIBDISK_SUPPORT
config SYS_BOARD
default "zynqmp"
@@ -81,6 +81,9 @@ config SPL_LIBCOMMON_SUPPORT
source "board/chipspark/popmetal_rk3288/Kconfig"
source "board/firefly/firefly-rk3288/Kconfig"
@@ -9,6 +9,9 @@ config SPL_LIBDISK_SUPPORT
+ default y if DM_MMC
config TARGET_SOCFPGA_ARRIA5
bool
select TARGET_SOCFPGA_GEN5
@@ -6,6 +6,9 @@ config SPL_LIBCOMMON_SUPPORT
+ default y if !ARCH_UNIPHIER_64BIT
config SYS_CONFIG_NAME
default "uniphier"
+ default y if ZYNQ_SDHCI
default "zynq"
# Note only one of these may be selected at a time! But hidden choices are
# not supported by Kconfig
config SUNXI_GEN_SUN4I
@@ -27,3 +27,6 @@ config SPL_LIBDISK_SUPPORT
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y
CONFIG_SPL_I2C_SUPPORT=y
+# CONFIG_SPL_MMC_SUPPORT is not set
CONFIG_MACH_SUN5I=y
CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
# CONFIG_MMC is not set
@@ -2,6 +2,7 @@ CONFIG_PPC=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
CONFIG_MPC85xx=y
CONFIG_TARGET_P1_P2_RDB_PC=y
CONFIG_TARGET_P1022DS=y
CONFIG_TARGET_T102XRDB=y
CONFIG_TARGET_T102XQDS=y
CONFIG_TARGET_T104XRDB=y
CONFIG_TARGET_T208XQDS=y
CONFIG_TARGET_T208XRDB=y
CONFIG_TARGET_T4240QDS=y
CONFIG_TARGET_T4240RDB=y
@@ -7,6 +7,7 @@ CONFIG_SPL_EXT_SUPPORT=y
CONFIG_SPL_FAT_SUPPORT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_SERIES=y
CONFIG_SHC_ICT=y
CONFIG_SHC_NETBOOT=y
CONFIG_SHC_SDBOOT=y
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
CONFIG_BOOTDELAY=3
CONFIG_BAV_VERSION=1
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
CONFIG_BAV_VERSION=2
@@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
CONFIG_BOOTDELAY=-2
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
CONFIG_SPI_BOOT=y
CONFIG_VERSION_VARIABLE=y
@@ -7,6 +7,7 @@ CONFIG_TARGET_CGTQMX6EVAL=y
CONFIG_SPL_EXT_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ROCKCHIP_RK3288=y
CONFIG_TARGET_CHROMEBOOK_JERRY=y
CONFIG_ROCKCHIP_FAST_SPL=y
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_CLEARFOG=y
CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_TARGET_CM_FX6=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
CONFIG_HUSH_PARSER=y
@@ -6,6 +6,7 @@ CONFIG_SPL_EXT_SUPPORT=y
@@ -7,6 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DEFAULT_DEVICE_TREE="am335x-draco"
CONFIG_TARGET_GW_VENTANA=y
CONFIG_SPL_STACK_R_ADDR=0x18000000
CONFIG_DM_SERIAL=y
@@ -3,6 +3,7 @@ CONFIG_TARGET_LS1021AQDS=y
CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
@@ -3,6 +3,7 @@ CONFIG_TARGET_LS1021ATWR=y
CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
@@ -3,6 +3,7 @@ CONFIG_TARGET_LS1043AQDS=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-duart"
@@ -3,6 +3,7 @@ CONFIG_TARGET_LS1043ARDB=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb"
@@ -7,6 +7,7 @@ CONFIG_TARGET_MX6CUBOXI=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
@@ -7,6 +7,7 @@ CONFIG_TARGET_MX6SABRESD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"
@@ -7,6 +7,7 @@ CONFIG_TARGET_MX6SLEVK=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6SL"
@@ -7,6 +7,7 @@ CONFIG_TARGET_MX6SXSABRESD=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
@@ -7,6 +7,7 @@ CONFIG_TARGET_MX6UL_14X14_EVK=y
@@ -7,6 +7,7 @@ CONFIG_TARGET_MX6UL_9X9_EVK=y
@@ -8,6 +8,7 @@ CONFIG_SPL_EXT_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
CONFIG_SYS_EXTRA_OPTIONS="REV1"
CONFIG_SYS_EXTRA_OPTIONS="REV3"
@@ -7,6 +7,7 @@ CONFIG_TARGET_PCM058=y
@@ -7,6 +7,7 @@ CONFIG_TARGET_PLATINUM_PICON=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
@@ -7,6 +7,7 @@ CONFIG_TARGET_PLATINUM_TITANIUM=y
CONFIG_DEFAULT_DEVICE_TREE="am335x-pxm50"
CONFIG_DEFAULT_DEVICE_TREE="am335x-rut"
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC"
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC"
CONFIG_BOOTDELAY=1