From: Simon Glass <sjg@chromium.org>
Date: Mon, 6 Feb 2023 00:53:23 +0000 (-0700)
Subject: Correct SPL uses of CMD_BOOTEFI_BOOTMGR
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=c9696b177d431a82b4928febce4e8b885dddd972;p=u-boot.git

Correct SPL uses of CMD_BOOTEFI_BOOTMGR

This converts 3 usages of this option to the non-SPL form, since there is
no SPL_CMD_BOOTEFI_BOOTMGR defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---

diff --git a/boot/Makefile b/boot/Makefile
index 0db4672b05..5424b6fafc 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -30,8 +30,9 @@ obj-$(CONFIG_$(SPL_TPL_)QFW) += bootmeth_qfw.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o
 ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL
-obj-$(CONFIG_$(SPL_TPL_)CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o
+obj-$(CONFIG_CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o
 obj-$(CONFIG_$(SPL_TPL_)EXPO) += bootflow_menu.o
+obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o
 endif
 
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o