diff options
| author | Tom Rini <trini@konsulko.com> | 2023-11-07 18:33:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-07 18:33:09 -0500 |
| commit | 1e4d9dd871512e1955e45ac1c3095fb063c0d07c (patch) | |
| tree | 3770d9ca70d5f8447a25bdabe03c7c60f4fd29aa /lib/efi_loader | |
| parent | 3af0e9556c968fc2c40e3778d8f1e668a90af92e (diff) | |
| parent | d7f592da6ee90b11cea4d2ad4d0f39d6d26fc3b6 (diff) | |
Merge branch '2023-11-07-assorted-big-cleanups' into next
- Merge in changes such that CONFIG_CMDLINE can be disabled and merge
in a series that starts to remove <common.h> usage.
Diffstat (limited to 'lib/efi_loader')
| -rw-r--r-- | lib/efi_loader/Kconfig | 6 | ||||
| -rw-r--r-- | lib/efi_loader/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 4ccd26f94a9..547dfd76ef5 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -32,14 +32,14 @@ config EFI_LOADER if EFI_LOADER -config CMD_BOOTEFI_BOOTMGR +config BOOTEFI_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. This enables the - 'bootefi bootmgr' command. + via UEFI variables Boot####, BootOrder, and BootNext. You should also + normally enable CMD_BOOTEFI_BOOTMGR so that the command is available. choice prompt "Store for non-volatile UEFI variables" diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index 8d31fc61c60..0a2cb6e3c47 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -42,7 +42,7 @@ targets += initrddump.o endif obj-$(CONFIG_CMD_BOOTEFI_HELLO) += helloworld_efi.o -obj-$(CONFIG_CMD_BOOTEFI_BOOTMGR) += efi_bootmgr.o +obj-$(CONFIG_BOOTEFI_BOOTMGR) += efi_bootmgr.o obj-y += efi_boottime.o obj-y += efi_helper.o obj-$(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) += efi_capsule.o |