Default SPL_MMC_SUPPORT to false when ROCKCHIP_SPL_BACK_TO_BROM is enabled.
Signed-off-by: Sandy Patterson apatterson@sightlogix.com ---
Changes in v2: - Rebase after "Kconfig: Move CONFIG_SPL_..._SUPPORT to Kconfig." - Remove all the refactoring in the configs. - Split enabling featuring in rock2 into separate commit.
arch/arm/mach-rockchip/Kconfig | 3 +++ configs/rock2_defconfig | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 1aac3c8..8a5d62a 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -42,6 +42,9 @@ config ROCKCHIP_SPL_BACK_TO_BROM SPL will return to the boot rom, which will then load the U-Boot binary to keep going on.
+config SPL_MMC_SUPPORT + default y if !ROCKCHIP_SPL_BACK_TO_BROM + source "arch/arm/mach-rockchip/rk3036/Kconfig" source "arch/arm/mach-rockchip/rk3288/Kconfig" source "arch/arm/mach-rockchip/rk3399/Kconfig" diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index b1294f0..e34d8b3 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -10,7 +10,7 @@ CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_SPL_MMC_SUPPORT=y +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y CONFIG_SPL_PINCTRL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_HUSH_PARSER=y