diff options
| author | John Stultz <john.stultz@linaro.org> | 2019-08-16 22:33:20 +0000 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2020-04-09 20:25:15 +0000 |
| commit | d815622a6f7f24dfad9f7b77b8fe386d2cb1afa7 (patch) | |
| tree | 2da2724b0eaa96a82cbd5dd9f60336b489c7f1fa | |
| parent | ee05bdf893337a81efeadd90656a3fdda1ed77d7 (diff) | |
ANDROID: cuttlefish_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
[adelva: backport to 4.4-p for cuttlefish vmlinux detection
in extract-vmlinux, where the kernel needs to be a PE
executable for compatibility with 4.19 GKI]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I5c2e63701ae93277fcc3ddb36a39637237c65194
Signed-off-by: Alistair Delva <adelva@google.com>
| -rw-r--r-- | arch/arm64/configs/cuttlefish_defconfig | 2 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 171bbc6811da..b79bc15e0f4b 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -53,7 +53,6 @@ CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y CONFIG_ARM64_SW_TTBR0_PAN=y CONFIG_RANDOMIZE_BASE=y -# CONFIG_EFI is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_COMPAT=y CONFIG_PM_WAKELOCKS=y @@ -384,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/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index 637f0a2bc48d..70aba308cf02 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -51,6 +51,7 @@ CONFIG_X86_CPUID=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 # CONFIG_MTRR is not set +CONFIG_EFI=y CONFIG_HZ_100=y CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y @@ -424,6 +425,7 @@ CONFIG_PROC_KCORE=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_HUGETLBFS=y +# CONFIG_EFIVAR_FS is not set CONFIG_SDCARD_FS=y CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y |