summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-11-23 18:20:18 +0300
committerTom Rini <trini@konsulko.com>2019-11-23 18:20:18 +0300
commit601c2879f8b9b20c8215858db862cde8ba65fd72 (patch)
tree2746ade5d974a6ffb9b044ef821cce07cde231e2
parent47b48fe186ad26740f97016d93e991f51447ddd6 (diff)
parentb7cdecfc196686ffae34b6849fc8b5b7ef62237a (diff)
downloadu-boot-601c2879f8b9b20c8215858db862cde8ba65fd72.tar.xz
Merge tag 'efi-2020-01-rc4-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-01-rc4 (2) Use CONFIG_EFI_LOADER=n for ARM11 except for the Raspberry Pi and the Raspberry Pi Zero.
-rw-r--r--configs/rpi_0_w_defconfig1
-rw-r--r--configs/rpi_defconfig1
-rw-r--r--lib/efi_loader/Kconfig2
3 files changed, 3 insertions, 1 deletions
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