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

[Mike Looijmans]

On 12-03-2025 09:37, Michal Simek wrote:
>
>
> On 3/11/25 10:32, Mike Looijmans wrote:
>> On 11-03-2025 09:03, Michal Simek wrote:
>>>
>>>
>>> On 3/11/25 08:01, 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>
>>>> ---
>>>>
>>>>   include/configs/zynq-common.h | 6 ++++++
>>>>   1 file changed, 6 insertions(+)
>>>>
>>>> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
>>>> index 37c77aa1611..ad872c9d922 100644
>>>> --- a/include/configs/zynq-common.h
>>>> +++ b/include/configs/zynq-common.h
>>>> @@ -48,6 +48,9 @@
>>>>   #define BOOTENV
>>>>   #else
>>>>   +/* 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)
>>>>   #else
>>>> @@ -167,6 +170,9 @@
>>>>       BOOT_TARGET_DEVICES_DHCP(func)
>>>>     #include <config_distro_bootcmd.h>
>>>> +
>>>> +#endif /* BOOTENV */
>>>> +
>>>>   #endif /* CONFIG_XPL_BUILD */
>>>>     /* Default environment */
>>>
>>> Why are you sending this again?
>>
>> Sorry, forgot to mention. Sending it in a single batch shows why I want 
>> this change... The first one got out because I forgot to say "-n" to 
>> patman, but it was fine as it is, so I didn't recall it.
>
> pretty much this should be v2 and you should reply to origin one that it 
> should be ignored.
>
> And in connection to the patch itself.
>
> I think you should do it a little bit differently not to have complicated if 
> else if endif endif structure.
>
> What about just this?
>
> #ifdef CONFIG_XPL_BUILD
> #define BOOTENV
> #endif
>
> #ifndef BOOTENV
>
> #endif
>
That will make things cleaner, yes. Also avoids the "#ifdef CONFIG_XPL_BUILD" 
in topic-miami.h

I'll create a v2.

-- 
Mike Looijmans
System Expert

TOPIC Embedded Products B.V.
Materiaalweg 4, 5681 RJ Best
The Netherlands

T: +31 (0) 499 33 69 69
E: mike.looijmans at topic.nl
W: www.topic.nl