boot: enable booting via EFI boot manager by default

If UEFI is enabled in U-Boot, we want it to conform to the UEFI
specification. This requires enabling the boot manager boot method.

Reported-by: E Shattow <lucent@gmail.com>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

diff --git a/boot/Kconfig b/boot/Kconfig
index 3d7aabd27d64fe5ef6a5deb9b0fc658b99baf408..d9a6c27005947e2de89abe53d314be8b339b62da 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -558,6 +558,16 @@ config BOOTMETH_EFILOADER
 
          This provides a way to try out standard boot on an existing boot flow.
 
+config BOOTMETH_EFI_BOOTMGR
+       bool "Bootdev support for EFI boot manager"
+       depends on EFI_BOOTMGR
+       select BOOTMETH_GLOBAL
+       default y
+       help
+         Enable booting via the UEFI boot manager. Based on the EFI variables
+         the EFI binary to be launched is determined. To set the EFI variables
+         use the eficonfig command.
+
 config BOOTMETH_VBE
        bool "Bootdev support for Verified Boot for Embedded"
        depends on FIT

diff --git a/boot/Makefile b/boot/Makefile
index f0a279cde161954e341a623b8b8415fe70ef0e55..84ccfeaecec49cfd7c29404b591bba40ba53149b 100644 (file)
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -34,8 +34,8 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_CROS) += bootm.o bootm_os.o bootmeth_cros.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o
 obj-$(CONFIG_$(SPL_TPL_)CEDIT) += cedit.o
+obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFI_BOOTMGR) += bootmeth_efi_mgr.o
 ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL
-obj-$(CONFIG_EFI_BOOTMGR) += bootmeth_efi_mgr.o
 obj-$(CONFIG_$(SPL_TPL_)EXPO) += bootflow_menu.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o
 endif

diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index a7c3e05c13a0f606d05e67ec52117163042c95dc..e13a6f9f4c3a1b9a890480a82c0c96cc98e907a2 100644 (file)
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -44,7 +44,6 @@ config EFI_BINARY_EXEC
 config EFI_BOOTMGR
        bool "UEFI Boot Manager"
        default y
-       select BOOTMETH_GLOBAL if BOOTSTD
        help
          Select this option if you want to select the UEFI binary to be booted
          via UEFI variables Boot####, BootOrder, and BootNext. You should also