shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: GKI: update arm64 gki_defconfig due to upstream changes

Browse Source 
Commit 424953cf3c ("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: 424953cf3c ("qcom_scm: hide Kconfig symbol")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2ba470f71727078b4f70185d76408304f8b8d66e
This commit is contained in:
Greg Kroah-Hartman
2021-10-10 12:26:40 +02:00
parent ae01864b87
commit 75e080794a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/configs/gki_defconfig
View File

@@ -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