Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16b7ce5a authored by John Stultz's avatar John Stultz Committed by Alistair Delva
Browse files

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.9-q 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: default avatarJohn Stultz <john.stultz@linaro.org>
Change-Id: I5c2e63701ae93277fcc3ddb36a39637237c65194
Signed-off-by: default avatarAlistair Delva <adelva@google.com>
parent 1caf614f

arch/arm64/configs/cuttlefish_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ CONFIG_SETEND_EMULATION=y 
CONFIG_ARM64_SW_TTBR0_PAN=y

CONFIG_ARM64_LSE_ATOMICS=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
@@ -422,6 +421,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

arch/x86/configs/x86_64_cuttlefish_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ CONFIG_KSM=y 
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536

CONFIG_ZSMALLOC=y

# CONFIG_MTRR is not set

CONFIG_EFI=y

CONFIG_HZ_100=y

CONFIG_KEXEC=y

CONFIG_CRASH_DUMP=y
@@ -453,6 +454,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