[PATCH v2 1/2] xilinx: Allow alternative boot strategies in zynq-common.h

[Michal Simek]

On 3/12/25 16:36, Mike Looijmans wrote:
> Allow config headers that include zynq-common.h to provide their own
> (distro) boot strategies. This is implemented by skipping the section
> when BOOT_ENV has already been defined.
> 
> Signed-off-by: Mike Looijmans <mike.looijmans at topic.nl>
> 
> ---
> 
> Changes in v2:
> Avoid #ifdef nesting (as suggested by MS)
> 
>   include/configs/zynq-common.h | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index 37c77aa1611..7bf58d3b2f7 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -46,7 +46,10 @@
>   
>   #ifdef CONFIG_XPL_BUILD
>   #define BOOTENV
> -#else
> +#endif
> +
> +/* Only use this section if no BOOTENV has been configured yet */
> +#ifndef BOOTENV
>   
>   #ifdef CONFIG_CMD_MMC
>   #define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
> @@ -167,7 +170,8 @@
>   	BOOT_TARGET_DEVICES_DHCP(func)
>   
>   #include <config_distro_bootcmd.h>
> -#endif /* CONFIG_XPL_BUILD */
> +
> +#endif /* BOOTENV */
>   
>   /* Default environment */
>   #ifndef CFG_EXTRA_ENV_SETTINGS

Applied.
M