cmd: pxe_utils: Limit fdtcontroladdr usage to non-fitImage
RFC PATCH 1/1 cmd: pxe_utils: Limit fdtcontroladdr usage to non-fitImage
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.
---
Cc: Peter Hoyes <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Simon Glass <[email protected]>
--- boot/pxe_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
boot/pxe_utils.c +1 -1
@@ -724,7 +724,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)if (!bootm_argv[3 ]) bootm_argv[3 ] =env_get ("fdt_addr" ); -if (!bootm_argv[3 ]) +if (!bootm_argv[3 ] &&genimg_get_format (buf) !=IMAGE_FORMAT_FIT ) bootm_argv[3 ] =env_get ("fdtcontroladdr" );if (bootm_argv[3 ]) {
Signature · 1 line
2.35.1
Quoted 11 lines · Marek Vasut
Commit
d5ba6188dfb("cmd:pxe_utils: Check fdtcontroladdr inlabel_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.Fixes d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot")Signed-off-by Marek Vasut <[email protected]>
Quoted 7 lines
---
Cc: Peter Hoyes <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Simon Glass <[email protected]>--- boot/pxe_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
I'd suggest adding an explicit comment in the code too, so it is easier to understand when this gets refactored later.
Quoted 20 lines · Simon Glass
Quoted 11 lines · Marek Vasut
Commit
d5ba6188dfb("cmd:pxe_utils: Check fdtcontroladdr inlabel_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.Fixes d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot")Signed-off-by Marek Vasut <[email protected]>Quoted 7 lines
---
Cc: Peter Hoyes <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Simon Glass <[email protected]>--- boot/pxe_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 4 lines
Reviewed-by Simon Glass <[email protected]>I'd suggest adding an explicit comment in the code too, so it is easier to understand when this gets refactored later.
I sent a fixed version of this patch, can you add this RB to it too ?
Regarding comment in the code, there is already one massive comment explaining it just above, see the pxe_utils.c content in the sources.
Hi Marek,
Quoted 24 lines · Marek Vasut
Quoted 22 lines · Simon Glass
Quoted 11 lines · Marek Vasut
Commit
d5ba6188dfb("cmd:pxe_utils: Check fdtcontroladdr inlabel_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.Fixes d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot")Signed-off-by Marek Vasut <[email protected]>Quoted 7 lines
---
Cc: Peter Hoyes <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Simon Glass <[email protected]>--- boot/pxe_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Reviewed-by Simon Glass <[email protected]>
Quoted 7 lines
Quoted 2 lines
I'd suggest adding an explicit comment in the code too, so it is easier to understand when this gets refactored later.
I sent a fixed version of this patch, can you add this RB to it too ?
Regarding comment in the code, there is already one massive comment explaining it just above, see the
pxe_utils.ccontent in the sources.
" * Scenario 3: If there is an fdtcontroladdr specified, pass it along to
* bootm, and adjust argc appropriately."
But are you not changing that? So update the comment?
Regards,
Simon