mach-snapdragon: always select SYSRESET_PSCI for ARCH_SNAPDRAGON

Since removing reset_cpu() in mach-snapdragon, all Qualcomm platforms
now depend on CONFIG_SYSRESET and will fail to build without it.

Move the dependency from qcom_defconfig to kconfig so that we use
SYSRESET for all platforms.

Fixes: 61a1a1b8ca73 ("mach-snapdragon: use PSCI sysreset driver")
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cf08fe6..32b80da 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1117,6 +1117,8 @@ config ARCH_SNAPDRAGON
        select OF_BOARD
        select SAVE_PREV_BL_FDT_ADDR
        select LINUX_KERNEL_IMAGE_HEADER if !ENABLE_ARM_SOC_BOOT0_HOOK
+       select SYSRESET
+       select SYSRESET_PSCI
        imply OF_UPSTREAM
        imply CMD_DM
 

diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig
index 82bbdc9..ba4d38d 100644 (file)
--- a/configs/qcom_defconfig
+++ b/configs/qcom_defconfig
@@ -121,8 +121,6 @@ CONFIG_QCOM_RPMH=y
 CONFIG_SPMI_MSM=y
 CONFIG_SYSINFO=y
 CONFIG_SYSINFO_SMBIOS=y
-CONFIG_SYSRESET=y
-CONFIG_SYSRESET_PSCI=y
 CONFIG_SYSRESET_QCOM_PSHOLD=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y