| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: John Stultz <john.stultz@linaro.org> |
| Date: Fri, 16 Aug 2019 22:33:20 +0000 |
| Subject: ANDROID: gki_defconfig: Minimally enable EFI |
| |
| HiKey/HiKey960 need UEFI support to boot but don't need much of |
| the other options that default on when enabling EFI. |
| |
| Bug: 140204135 |
| Signed-off-by: John Stultz <john.stultz@linaro.org> |
| Change-Id: I5c2e63701ae93277fcc3ddb36a39637237c65194 |
| --- |
| arch/arm64/configs/gki_defconfig | 4 +++- |
| arch/x86/configs/gki_defconfig | 2 ++ |
| 2 files changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig |
| index 2773a84fd939..006692f065d4 100644 |
| --- a/arch/arm64/configs/gki_defconfig |
| +++ b/arch/arm64/configs/gki_defconfig |
| @@ -46,7 +46,7 @@ CONFIG_SWP_EMULATION=y |
| CONFIG_CP15_BARRIER_EMULATION=y |
| CONFIG_SETEND_EMULATION=y |
| CONFIG_RANDOMIZE_BASE=y |
| -# CONFIG_EFI is not set |
| +# CONFIG_DMI is not set |
| CONFIG_PM_WAKELOCKS=y |
| CONFIG_PM_WAKELOCKS_LIMIT=0 |
| # CONFIG_PM_WAKELOCKS_GC is not set |
| @@ -64,6 +64,7 @@ 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_ARM64_CRYPTO=y |
| CONFIG_CRYPTO_AES_ARM64=y |
| CONFIG_KPROBES=y |
| @@ -382,6 +383,7 @@ CONFIG_MSDOS_FS=y |
| CONFIG_VFAT_FS=y |
| CONFIG_TMPFS=y |
| CONFIG_TMPFS_POSIX_ACL=y |
| +# CONFIG_EFIVAR_FS is not set |
| CONFIG_SDCARD_FS=y |
| CONFIG_PSTORE=y |
| CONFIG_PSTORE_CONSOLE=y |
| diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig |
| index a1b2121bde8b..ed8296e953ed 100644 |
| --- a/arch/x86/configs/gki_defconfig |
| +++ b/arch/x86/configs/gki_defconfig |
| @@ -36,6 +36,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y |
| CONFIG_PROFILING=y |
| CONFIG_SMP=y |
| CONFIG_NR_CPUS=32 |
| +CONFIG_EFI=y |
| CONFIG_PM_WAKELOCKS=y |
| CONFIG_PM_WAKELOCKS_LIMIT=0 |
| # CONFIG_PM_WAKELOCKS_GC is not set |
| @@ -308,6 +309,7 @@ CONFIG_MSDOS_FS=y |
| CONFIG_VFAT_FS=y |
| CONFIG_TMPFS=y |
| CONFIG_TMPFS_POSIX_ACL=y |
| +# CONFIG_EFIVAR_FS is not set |
| CONFIG_SDCARD_FS=y |
| CONFIG_PSTORE=y |
| CONFIG_PSTORE_CONSOLE=y |
