efi_loader: rename BOOTEFI_BOOTMGR to EFI_BOOTMGR

At this point, EFI boot manager interfaces is fully independent from
bootefi command. So just rename the configuration parameter.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/boot/Makefile b/boot/Makefile
index a47e00274622a456b941fb7d66519b8b9a4426f5..f0a279cde161954e341a623b8b8415fe70ef0e55 100644 (file)
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -35,7 +35,7 @@ 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
 ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL
-obj-$(CONFIG_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o
+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/cmd/Kconfig b/cmd/Kconfig
index 150fa37a50a7d3bda8befa95dbcc780e178ddcd3..62d2ae3d3f1bd3397ae47a38fdd043a2c3a423d2 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -395,7 +395,7 @@ config CMD_BOOTEFI_BINARY
 
 config CMD_BOOTEFI_BOOTMGR
        bool "UEFI Boot Manager command"
-       depends on BOOTEFI_BOOTMGR
+       depends on EFI_BOOTMGR
        default y
        help
          Select this option to enable the 'bootmgr' subcommand of 'bootefi'.
@@ -2153,7 +2153,7 @@ config CMD_EFIDEBUG
 config CMD_EFICONFIG
        bool "eficonfig - provide menu-driven uefi variables maintenance interface"
        default y if !HAS_BOARD_SIZE_LIMIT
-       depends on BOOTEFI_BOOTMGR
+       depends on EFI_BOOTMGR
        select MENU
        help
          Enable the 'eficonfig' command which provides the menu-driven UEFI

diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index aa8523797efbc261aabf547609d0fe3152932a41..a3a7556ea4a5b6b6dde2056b625b180e803c0502 100644 (file)
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -1414,7 +1414,7 @@ static __maybe_unused int do_efi_test_bootmgr(struct cmd_tbl *cmdtp, int flag,
 }
 
 static struct cmd_tbl cmd_efidebug_test_sub[] = {
-#ifdef CONFIG_BOOTEFI_BOOTMGR
+#ifdef CONFIG_EFI_BOOTMGR
        U_BOOT_CMD_MKENT(bootmgr, CONFIG_SYS_MAXARGS, 1, do_efi_test_bootmgr,
                         "", ""),
 #endif
@@ -1608,7 +1608,7 @@ U_BOOT_LONGHELP(efidebug,
        "  - show UEFI memory map\n"
        "efidebug tables\n"
        "  - show UEFI configuration tables\n"
-#ifdef CONFIG_BOOTEFI_BOOTMGR
+#ifdef CONFIG_EFI_BOOTMGR
        "efidebug test bootmgr\n"
        "  - run simple bootmgr for test\n"
 #endif

diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index 64f2f1cdd16129204b89b6cb069154e9649ca855..db5571de1d9506447de48640baefec097e48c7c0 100644 (file)
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -41,7 +41,7 @@ config EFI_BINARY_EXEC
          You may enable CMD_BOOTEFI_BINARY so that you can use bootefi
          command to do that.
 
-config BOOTEFI_BOOTMGR
+config EFI_BOOTMGR
        bool "UEFI Boot Manager"
        default y
        select BOOTMETH_GLOBAL if BOOTSTD

diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index f0a31b4ad5096759d099ee71f24ce560710fcd21..fcb0af7e7d6dc426757042715642998ee5c04a87 100644 (file)
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -49,7 +49,7 @@ targets += initrddump.o
 endif
 
 obj-$(CONFIG_CMD_BOOTEFI_HELLO) += helloworld_efi.o
-obj-$(CONFIG_BOOTEFI_BOOTMGR) += efi_bootmgr.o
+obj-$(CONFIG_EFI_BOOTMGR) += efi_bootmgr.o
 obj-$(CONFIG_EFI_BINARY_EXEC) += efi_bootbin.o
 obj-y += efi_boottime.o
 obj-y += efi_helper.o

diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c
index 104f49deef2af577f9a63c87c14ba35cc508bcb3..fa54dde661c8b6b71ee7f6610c7df5ed023f33e5 100644 (file)
--- a/test/boot/bootflow.c
+++ b/test/boot/bootflow.c
@@ -374,7 +374,7 @@ static int bootflow_system(struct unit_test_state *uts)
 {
        struct udevice *bootstd, *dev;
 
-       if (!IS_ENABLED(CONFIG_BOOTEFI_BOOTMGR))
+       if (!IS_ENABLED(CONFIG_EFI_BOOTMGR))
                return -EAGAIN;
        ut_assertok(uclass_first_device_err(UCLASS_BOOTSTD, &bootstd));
        ut_assertok(device_bind(bootstd, DM_DRIVER_GET(bootmeth_efi_mgr),