From b7cdecfc196686ffae34b6849fc8b5b7ef62237a Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 20 Nov 2019 18:48:02 +0100 Subject: [PATCH] efi_loader: default EFI_LOADER=n on ARM11 Some of the ARM11 boards have tight limits on the size of U-Boots. Hence use EFI_LOADER=n as default on ARM11. Set EFI_LOADER=y for the Raspberry Pi and Raspberry Pi Zero as these boards have sufficient storage on the SD card. Suggested-by: Tom Rini Signed-off-by: Heinrich Schuchardt --- configs/rpi_0_w_defconfig | 1 + configs/rpi_defconfig | 1 + lib/efi_loader/Kconfig | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig index 52f15ce3e4..3e63e93e34 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig @@ -43,3 +43,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_EFI_LOADER=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index a7ccab1710..9cb66961aa 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -43,3 +43,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_EFI_LOADER=y diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 7984d6f42d..21ef440341 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -10,7 +10,7 @@ config EFI_LOADER depends on !EFI_STUB || !X86_64 || EFI_STUB_64BIT # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT - default y + default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 select LIB_UUID select HAVE_BLOCK_DEVICE select REGEX -- GitLab