| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Todd Kjos <tkjos@google.com> |
| Date: Wed, 6 Nov 2019 10:47:49 -0800 |
| Subject: ANDROID: gki_defconfig: enable FW_LOADER configs |
| |
| Enabled the two configs: |
| CONFIG_FW_LOADER_USER_HELPER |
| CONFIG_FW_LOADER_USER_HELPER_FALLBACK |
| |
| Bug: 135666008 |
| Change-Id: Ief331a33b61a704d8719c5f8b2c17824c0ef53d2 |
| Signed-off-by: Todd Kjos <tkjos@google.com> |
| --- |
| arch/arm64/configs/gki_defconfig | 2 ++ |
| arch/x86/configs/gki_defconfig | 2 ++ |
| 2 files changed, 4 insertions(+) |
| |
| diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig |
| index 441e6228082f..4c4a83cb4e76 100644 |
| --- a/arch/arm64/configs/gki_defconfig |
| +++ b/arch/arm64/configs/gki_defconfig |
| @@ -202,6 +202,8 @@ CONFIG_RFKILL=y |
| CONFIG_PCI=y |
| CONFIG_PCI_HOST_GENERIC=y |
| CONFIG_PCIE_KIRIN=y |
| +CONFIG_FW_LOADER_USER_HELPER=y |
| +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y |
| # 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 dc8c330bd775..ec9655cce5c4 100644 |
| --- a/arch/x86/configs/gki_defconfig |
| +++ b/arch/x86/configs/gki_defconfig |
| @@ -178,6 +178,8 @@ CONFIG_MAC80211=y |
| # CONFIG_MAC80211_RC_MINSTREL is not set |
| CONFIG_RFKILL=y |
| CONFIG_PCI=y |
| +CONFIG_FW_LOADER_USER_HELPER=y |
| +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y |
| # CONFIG_ALLOW_DEV_COREDUMP is not set |
| CONFIG_DEBUG_DEVRES=y |
| CONFIG_OF=y |
