The commit 0debfe4801bb ("mach-snapdragon: Kconfig: changes / additions to
support SPL") auto selects options that may not be applicable to all
platforms. This results in warning messages during make xxx_defconfig
and/or waiting for user input for on/off or values for certain configs.
So auto select options based on the enabled configs in xxx_defconfig.
Fixes: 0debfe4801bb ("mach-snapdragon: Kconfig: changes / additions to support
SPL")
Signed-off-by: Varadarajan Narayanan <[email protected]>
---
arch/arm/Kconfig | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f307340e3aa..51d60ef65fe 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1147,8 +1147,8 @@ config ARCH_SNAPDRAGON
select SPMI
select BOARD_LATE_INIT
select OF_BOARD
- select SAVE_PREV_BL_FDT_ADDR if !ENABLE_ARM_SOC_BOOT0_HOOK
- select LINUX_KERNEL_IMAGE_HEADER if !ENABLE_ARM_SOC_BOOT0_HOOK
+ select SAVE_PREV_BL_FDT_ADDR if !ENABLE_ARM_SOC_BOOT0_HOOK && !SPL
+ select LINUX_KERNEL_IMAGE_HEADER if !ENABLE_ARM_SOC_BOOT0_HOOK && !SPL
select SYSRESET
select SYSRESET_PSCI if !SPL
select ANDROID_BOOT_IMAGE_IGNORE_BLOB_ADDR
@@ -1161,12 +1161,12 @@ config ARCH_SNAPDRAGON
select ENABLE_ARM_SOC_BOOT0_HOOK if SPL
select SPL_DM if SPL
select SPL_DM_GPIO if SPL
- select SPL_DM_PMIC if SPL
- select SPL_DM_USB_GADGET if SPL
+ select SPL_DM_PMIC if SPL && DM_PMIC
+ select SPL_DM_USB_GADGET if SPL && USB
select SPL_ENV_SUPPORT if SPL
select SPL_EVENT if SPL
select SPL_GPIO if SPL
- select SPL_HAS_BSS_LINKER_SECTION if SPL
+ select SPL_HAS_BSS_LINKER_SECTION if SPL && SPL_SEPARATE_BSS
select SPL_LIBCOMMON_SUPPORT if SPL
select SPL_LIBDISK_SUPPORT if SPL
select SPL_LIBGENERIC_SUPPORT if SPL
@@ -1181,7 +1181,7 @@ config ARCH_SNAPDRAGON
select SPL_SPMI_MSM if SPL
select SPL_SPRINTF if SPL
select SPL_STRTO if SPL
- select SPL_USB_GADGET if SPL
+ select SPL_USB_GADGET if SPL && USB
imply SPL_MMC if SPL
imply OF_UPSTREAM
imply CMD_DM
--
2.34.1
