[PATCH v2 036/169] Correct SPL uses of CMD_BOOTEFI_BOOTMGR

[Heinrich Schuchardt]

On 2/6/23 01:53, Simon Glass wrote:
> 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 at chromium.org>
> ---
> 
> (no changes since v1)
> 
>   boot/Makefile  | 2 +-
>   cmd/bootmenu.c | 4 ++--
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/boot/Makefile b/boot/Makefile
> index 69c31adb77d..73b5b19816b 100644
> --- a/boot/Makefile
> +++ b/boot/Makefile
> @@ -29,7 +29,7 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFILOADER) += bootmeth_efi.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_)BOOTSTD) += bootflow_menu.o
>   endif
>   
> diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
> index 3236ca5d799..422ab411252 100644
> --- a/cmd/bootmenu.c
> +++ b/cmd/bootmenu.c
> @@ -223,7 +223,7 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu,
>   	return 1;
>   }
>   
> -#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG))
> +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG))

There is no reason whatsoever for using different macros for the two 
options.

>   /**
>    * prepare_uefi_bootorder_entry() - generate the uefi bootmenu entries
>    *
> @@ -343,7 +343,7 @@ static struct bootmenu_data *bootmenu_create(int delay)
>   	if (ret < 0)
>   		goto cleanup;
>   
> -#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG))
> +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG))


ditto

Best regards

Heinrich

>   	if (i < MAX_COUNT - 1) {
>   		efi_status_t efi_ret;
>