[PATCH v2] cmd: pxe_utils: Limit fdtcontroladdr usage to non-fitImage

[Peter Hoyes]

On 14/12/2022 15:25, Marek Vasut wrote:
> On 12/14/22 16:23, Quentin Schulz wrote:
>> Hi Marek,
>
> Hi,
>
>> On 12/14/22 07:45, Marek Vasut wrote:
>>> Commit d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in 
>>> label_boot")
>>> forces '$fdtcontroladdr' DT address as a third parameter of bootm 
>>> command
>>> even if the PXE transfer pulls in a fitImage which contains 
>>> configuration
>>> node with its own DT that is preferrable to be passed to Linux. 
>>> Limit the
>>> $fdtcontroladdr fallback utilization to non-fitImages, since it is 
>>> highly
>>> likely a fitImage would come with its own DT, while single-file 
>>> images do
>>> need a separate DT.
>>>
>>
>> Reviewed-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>> Tested-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>>
>> Tested on top of an almost vanilla v2022.10 on Ringneck PX30, the FDT 
>> from the selected fitimage configuration (via #conf in kernel field 
>> in extlinux.conf) is taken into account.
>>
>> Not sure overriding the DT gotten from the fit image wasn't a 
>> use-case Peter wanted to support though.
>
> I am hoping to get feedback from Peter, but that kind of behavior 
> would be rather odd. If user wants to use fdtcontroladdr DT, then just 
> don't add DT fdt property into the configuration node entry in the 
> fitImage.

Reviewed-by: Peter Hoyes <peter.hoyes at arm.com>
Tested-by: Peter Hoyes <peter.hoyes at arm.com>

Tested with an fdtcontroladdr provided by a prior boot stage (TF-A) on 
an Arm FVP.

The implemented behavior works for me. We do not have any need to 
override the DT from a FIT image.

Thanks,

Peter