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. This fixes compilation on the dragonboard410c, 820c, and hmibsc boards. Fixes: 61a1a1b8ca73 ("mach-snapdragon: use PSCI sysreset driver") Signed-off-by: Caleb Connolly <caleb.conno...@linaro.org> --- arch/arm/Kconfig | 2 ++ configs/qcom_defconfig | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cf08fe63f1e7..32b80da9869a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1116,8 +1116,10 @@ config ARCH_SNAPDRAGON select BOARD_LATE_INIT 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 config ARCH_SOCFPGA diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig index 82bbdc996675..ba4d38d100e0 100644 --- a/configs/qcom_defconfig +++ b/configs/qcom_defconfig @@ -120,10 +120,8 @@ CONFIG_QCOM_COMMAND_DB=y 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 CONFIG_USB_XHCI_DWC3=y -- 2.48.1