Use the efi malloc fallback on all efi based systems.

Signed-off-by: Chali Anis <chalian...@gmail.com>
---
 arch/arm/configs/efi_v8_defconfig | 1 +
 arch/x86/configs/efi_defconfig    | 1 +
 efi/payload/Kconfig               | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/configs/efi_v8_defconfig 
b/arch/arm/configs/efi_v8_defconfig
index 
607ab44e473f6ad910c1944f2828b6255e5ade10..3afcdd6ed7f5cc711f2a1f7cbe1a6e84de902817
 100644
--- a/arch/arm/configs/efi_v8_defconfig
+++ b/arch/arm/configs/efi_v8_defconfig
@@ -263,4 +263,5 @@ CONFIG_FS_RATP=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_DIGEST_SHA1_ARM64_CE=y
 CONFIG_DIGEST_SHA256_ARM64_CE=y
+CONFIG_MALLOC_EFI=y
 # CONFIG_MISSING_FIRMWARE_ERROR is not set
diff --git a/arch/x86/configs/efi_defconfig b/arch/x86/configs/efi_defconfig
index 
1dd823af40ea6c27a6b4409edb4f3bea2bf896f0..884a6de0d41a20e47497ce170404150fbf787382
 100644
--- a/arch/x86/configs/efi_defconfig
+++ b/arch/x86/configs/efi_defconfig
@@ -97,3 +97,4 @@ CONFIG_FS_EFIVARFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
+CONFIG_MALLOC_EFI=y
diff --git a/efi/payload/Kconfig b/efi/payload/Kconfig
index 
47238208c527e8a6ab0e7f18a86dfb9a8ab79716..b1e4c373a17776a40f218ebc104fa7e23ec1c57a
 100644
--- a/efi/payload/Kconfig
+++ b/efi/payload/Kconfig
@@ -2,9 +2,10 @@
 
 config EFI_HANDOVER_PROTOCOL
        bool "EFI Handover protocol"
-       def_bool X86
+       def_bool !EFI_PAYLOAD_BOOTM
 
 config EFI_PAYLOAD_BOOTM
        bool "EFI bootm protocol"
-       depends on !EFI_HANDOVER_PROTOCOL
+       def_bool EFI_PAYLOAD
        select BOOTM_FITIMAGE
+       select MALLOC_EFI

-- 
2.34.1


Reply via email to