aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2019-11-13 13:38:37 -0800
committerMark Salyzyn <salyzyn@google.com>2019-11-26 15:50:42 +0000
commit8331ce00073074134a283a72a5731cb4689a28e6 (patch)
tree3eae04b09ad62e02f47253ce00d079cf23b32342
parentcd403ef6a75c38bc126b1b7f2362ab6426062df0 (diff)
ANDROID: gki_defconfig: FW_CACHE to no
Set the default for FW_CACHE to n to match Android expectations. Signed-off-by: Mark Salyzyn <salyzyn@google.com> Bug: 32180327 Bug: 137566496 Change-Id: I86a28040be07fb2f30125d28f7f379798727785c
-rw-r--r--arch/arm64/configs/gki_defconfig1
-rw-r--r--arch/x86/configs/gki_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index f22c8c4cd429..7e8270a54d62 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -205,6 +205,7 @@ CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCIE_KIRIN=y
CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
+# CONFIG_FW_CACHE is not set
# CONFIG_ALLOW_DEV_COREDUMP is not set
CONFIG_DEBUG_DEVRES=y
CONFIG_ZRAM=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 8d68d9c8ecdd..24108dc5be76 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -181,6 +181,7 @@ CONFIG_RFKILL=y
CONFIG_PCI=y
CONFIG_FW_LOADER_USER_HELPER=y
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
+# CONFIG_FW_CACHE is not set
# CONFIG_ALLOW_DEV_COREDUMP is not set
CONFIG_DEBUG_DEVRES=y
CONFIG_OF=y