diff mbox series

[Concept,20/32] boot: pxe: Use ctx->fdt in label_boot_fdtoverlay()

Message ID 20260109231151.4056804-21-sjg@u-boot.org
State New
Headers
Series boot: pxe: Refactor into separate load/setup phases |

Commit Message

Simon Glass Jan. 9, 2026, 11:11 p.m. UTC 
  From: Simon Glass <simon.glass@canonical.com>

Use ctx->fdt instead of re-mapping from the fdt_addr_r environment
variable. Since ctx->fdt is set after loading the FDT, it is available
for use by the overlay code.

This avoids a crash when the FDT is loaded via LMB allocation without
fdt_addr_r being set, and removes the dependency on the global
working_fdt variable.

Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
---

 boot/pxe_utils.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c
index c0ef524f3f1..05102914717 100644
--- a/boot/pxe_utils.c
+++ b/boot/pxe_utils.c
@@ -308,16 +308,11 @@  static void label_boot_fdtoverlay(struct pxe_context *ctx,
 				  struct pxe_label *label)
 {
 	char *fdtoverlay = label->fdtoverlays;
-	struct fdt_header *working_fdt;
 	char *fdtoverlay_addr_env;
 	ulong fdtoverlay_addr;
-	ulong fdt_addr;
 	int err;
 
-	/* Get the main fdt and map it */
-	fdt_addr = hextoul(env_get("fdt_addr_r"), NULL);
-	working_fdt = map_sysmem(fdt_addr, 0);
-	err = fdt_check_header(working_fdt);
+	err = fdt_check_header(ctx->fdt);
 	if (err)
 		return;
 
@@ -366,7 +361,7 @@  static void label_boot_fdtoverlay(struct pxe_context *ctx,
 		}
 
 		/* Resize main fdt */
-		fdt_shrink_to_minimum(working_fdt, 8192);
+		fdt_shrink_to_minimum(ctx->fdt, 8192);
 
 		blob = map_sysmem(fdtoverlay_addr, 0);
 		err = fdt_check_header(blob);
@@ -376,7 +371,7 @@  static void label_boot_fdtoverlay(struct pxe_context *ctx,
 			goto skip_overlay;
 		}
 
-		err = fdt_overlay_apply_verbose(working_fdt, blob);
+		err = fdt_overlay_apply_verbose(ctx->fdt, blob);
 		if (err) {
 			printf("Failed to apply overlay %s, skipping\n",
 			       overlayfile);