[PATCH v4 3/3] board: remove capsule update support in set_dfu_alt_info()

[Wadim Egorov]

Am 27.02.25 um 05:35 schrieb Jonathan Humphreys:
> Now that capsule update sets the dfu_alt_info environment variable
> explicitly, there is no need to support it in the set_dfu_alt_info()
> function. Decouple SET_DFU_ALT_INFO from EFI_CAPSULE_FIRMWARE_FIT and
> EFI_CAPSULE_FIRMWARE_RAW. For many boards, this was the only use of
> set_dfu_alt_info() so remove the function entirely.
> 
> Fixes: a9e6f01a941f ("efi: Define set_dfu_alt_info() for boards with UEFI capsule update enabled")
> 
> Signed-off-by: Jonathan Humphreys <j-humphreys at ti.com>
> Signed-off-by: Michal Simek <michal.simek at amd.com>
> Reviewed-by: Mattijs Korpershoek <mkorpershoek at baylibre.com>
> Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org> # for board/libre-computer/*
> Reviewed-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>
> ---
>   board/beagle/beagleboneai64/beagleboneai64.c       |  8 --------
>   board/beagle/beagleplay/beagleplay.c               |  8 --------
>   board/libre-computer/aml-a311d-cc/aml-a311d-cc.c   |  2 --
>   board/libre-computer/aml-s805x-ac/aml-s805x-ac.c   |  2 --
>   board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c |  2 --
>   board/phytec/common/k3/board.c                     |  8 --------
>   board/ti/am62px/evm.c                              |  8 --------
>   board/ti/am62x/evm.c                               |  8 --------
>   board/ti/am64x/evm.c                               |  8 --------
>   board/ti/j721e/evm.c                               |  8 --------
>   board/ti/j784s4/evm.c                              |  8 --------
>   board/xilinx/common/board.h                        |  3 +++
>   board/xilinx/versal/board.c                        | 13 ++++---------
>   board/xilinx/zynq/board.c                          | 13 ++++---------
>   board/xilinx/zynqmp/zynqmp.c                       | 13 ++++---------
>   lib/efi_loader/Kconfig                             |  2 --
>   lib/efi_loader/efi_firmware.c                      |  5 -----
>   17 files changed, 15 insertions(+), 104 deletions(-)
> 
> diff --git a/board/beagle/beagleboneai64/beagleboneai64.c b/board/beagle/beagleboneai64/beagleboneai64.c
> index e8d07f1f95f..99eb8972cf3 100644
> --- a/board/beagle/beagleboneai64/beagleboneai64.c
> +++ b/board/beagle/beagleboneai64/beagleboneai64.c
> @@ -45,14 +45,6 @@ struct efi_capsule_update_info update_info = {
>   	.images = fw_images,
>   };
>   
> -#if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO)
> -void set_dfu_alt_info(char *interface, char *devstr)
> -{
> -	if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT))
> -		env_set("dfu_alt_info", update_info.dfu_string);
> -}
> -#endif
> -
>   int board_init(void)
>   {
>   	return 0;
> diff --git a/board/beagle/beagleplay/beagleplay.c b/board/beagle/beagleplay/beagleplay.c
> index fae69b37585..78635810585 100644
> --- a/board/beagle/beagleplay/beagleplay.c
> +++ b/board/beagle/beagleplay/beagleplay.c
> @@ -41,14 +41,6 @@ struct efi_capsule_update_info update_info = {
>   	.images = fw_images,
>   };
>   
> -#if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO)
> -void set_dfu_alt_info(char *interface, char *devstr)
> -{
> -	if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT))
> -		env_set("dfu_alt_info", update_info.dfu_string);
> -}
> -#endif
> -
>   int board_init(void)
>   {
>   	return 0;
> diff --git a/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c b/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c
> index e45cfd5d8a3..24363d21ab0 100644
> --- a/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c
> +++ b/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c
> @@ -31,8 +31,6 @@ void set_dfu_alt_info(char *interface, char *devstr)
>   {
>   	if (strcmp(interface, "ram") == 0)
>   		env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000");
> -	else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT))
> -		env_set("dfu_alt_info", update_info.dfu_string);
>   }
>   #endif
>   
> diff --git a/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c b/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c
> index 94cf5b4361f..42442f26acc 100644
> --- a/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c
> +++ b/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c
> @@ -38,8 +38,6 @@ void set_dfu_alt_info(char *interface, char *devstr)
>   {
>   	if (strcmp(interface, "ram") == 0)
>   		env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000");
> -	else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT))
> -		env_set("dfu_alt_info", update_info.dfu_string);
>   }
>   #endif
>   
> diff --git a/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c b/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c
> index f641db5a494..5223f1c8ab8 100644
> --- a/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c
> +++ b/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c
> @@ -31,8 +31,6 @@ void set_dfu_alt_info(char *interface, char *devstr)
>   {
>   	if (strcmp(interface, "ram") == 0)
>   		env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000");
> -	else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT))
> -		env_set("dfu_alt_info", update_info.dfu_string);
>   }
>   #endif
>   
> diff --git a/board/phytec/common/k3/board.c b/board/phytec/common/k3/board.c
> index 9d833456810..58859f279f1 100644
> --- a/board/phytec/common/k3/board.c
> +++ b/board/phytec/common/k3/board.c
> @@ -82,14 +82,6 @@ void configure_capsule_updates(void)
>   }
>   #endif
>   
> -#if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO)
> -void set_dfu_alt_info(char *interface, char *devstr)
> -{
> -	if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT))
> -		env_set("dfu_alt_info", update_info.dfu_string);
> -}
> -#endif
> -
>   #if IS_ENABLED(CONFIG_ENV_IS_IN_FAT) || IS_ENABLED(CONFIG_ENV_IS_IN_MMC)
>   int mmc_get_env_dev(void)
>   {

Reviewed-by: Wadim Egorov <w.egorov at phytec.de> # for 
board/phytec/common/k3/board.c