From 75e080794aab9d141f4155a77640780c2ad8ca81 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 10 Oct 2021 12:26:40 +0200 Subject: [PATCH] ANDROID: GKI: update arm64 gki_defconfig due to upstream changes Commit 424953cf3c66 ("qcom_scm: hide Kconfig symbol") caused the ordering of the config options to be moved around a bit. This trips the Android build system saying that the configuration files are not correct, so fix this up by moving the sections into the place that they are expected to be now. This is only an issue with the arm64 GKI configuration, x86 is fine. Fixes: 424953cf3c66 ("qcom_scm: hide Kconfig symbol") Signed-off-by: Greg Kroah-Hartman Change-Id: I2ba470f71727078b4f70185d76408304f8b8d66e --- arch/arm64/configs/gki_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 2b17fd68e24b..ef373b1a99a5 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -79,11 +79,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_ARM_SCPI_CPUFREQ=y CONFIG_ARM_SCMI_CPUFREQ=y -CONFIG_ARM_SCMI_PROTOCOL=y -# CONFIG_ARM_SCMI_POWER_DOMAIN is not set -CONFIG_ARM_SCPI_PROTOCOL=y -# CONFIG_ARM_SCPI_POWER_DOMAIN is not set -# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set CONFIG_VIRTUALIZATION=y CONFIG_KVM=y CONFIG_CRYPTO_SHA2_ARM64_CE=y @@ -287,6 +282,11 @@ CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_FW_CACHE is not set # CONFIG_SUN50I_DE2_BUS is not set # CONFIG_SUNXI_RSB is not set +CONFIG_ARM_SCMI_PROTOCOL=y +# CONFIG_ARM_SCMI_POWER_DOMAIN is not set +CONFIG_ARM_SCPI_PROTOCOL=y +# CONFIG_ARM_SCPI_POWER_DOMAIN is not set +# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set CONFIG_GNSS=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=16