[PATCH] xilinx: zynqmp: Remove conditional check for bootmenu_default variable

[Michal Simek]

On 10/2/24 13:15, Michal Simek wrote:
> From: John Vicky Vykuntapu <johnvicky.vykuntapu at amd.com>
> 
> As per bootmenu support added default boot options to CC on AMD CCs and
> default to SOM on others.
> However, if no secondary boot device is enabled in the design,it should
> be the default boot option for SOM when combined with AMD CCs because it
> only contains SOM peripherals.
> To address this issue, The conditional check for the bootmenu_default
> variable was removed, and it has always been set to SOM as the default
> boot option.
> In this way, users can choose preferred boot options from the bootmenu
> based on the boot devices configured in the design for AMD CCs.
> 
> Fixes: 61bf0fa8663d ("xilinx: zynqmp: Add bootmenu support")
> Signed-off-by: John Vicky Vykuntapu <johnvicky.vykuntapu at amd.com>
> Signed-off-by: Michal Simek <michal.simek at amd.com>
> ---
> 
>   board/xilinx/zynqmp/zynqmp_kria.env | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/board/xilinx/zynqmp/zynqmp_kria.env b/board/xilinx/zynqmp/zynqmp_kria.env
> index d0e431ebb46f..927f398c3c38 100644
> --- a/board/xilinx/zynqmp/zynqmp_kria.env
> +++ b/board/xilinx/zynqmp/zynqmp_kria.env
> @@ -51,8 +51,7 @@ som_mmc_boot=setenv boot_targets mmc0 && run distro_bootcmd
>   
>   # To disable bootmenu set enable_bootmenu=0
>   enable_bootmenu=1
> -check_cc_for_default_boot=if test ${card1_name} = SCK-KV-G || test ${card1_name} = SCK-KR-G || test ${card1_name} = SCK-KD-G; then setenv bootmenu_default 1; else setenv bootmenu_default 0; fi
> -som_bootmenu=if test ${enable_bootmenu} = 1; then run check_cc_for_default_boot; bootmenu; else run som_mmc_boot; fi
> +som_bootmenu=if test ${enable_bootmenu} = 1; then bootmenu; else run som_mmc_boot; fi
>   
>   k26_starter=SMK-K26-XCL2G
>   k24_starter=SMK-K24-XCL2G

Applied.
M