diff mbox series

[Concept,14/26] boot: pxe: Add the FDT to the files list when parsing

Message ID 20260110202906.187370-15-sjg@u-boot.org
State New
Headers
Series boot: pxe: Add three-phase API and fix memory leaks |

Commit Message

Simon Glass Jan. 10, 2026, 8:28 p.m. UTC 
  From: Simon Glass <simon.glass@canonical.com>

When parsing an fdt directive, add the path to the files list with type
PFT_FDT.

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

 boot/pxe_parse.c |  6 +++++-
 test/boot/pxe.c  | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/boot/pxe_parse.c b/boot/pxe_parse.c
index 7dac5c94759..bcbe0495cbb 100644
--- a/boot/pxe_parse.c
+++ b/boot/pxe_parse.c
@@ -625,8 +625,12 @@  static int parse_label(char **c, struct pxe_menu *cfg)
 			}
 			break;
 		case T_FDT:
-			if (!label->fdt)
+			if (!label->fdt) {
 				err = parse_sliteral(c, &label->fdt);
+				if (err < 0)
+					break;
+				err = label_add_file(label, label->fdt, PFT_FDT);
+			}
 			break;
 		case T_FDTDIR:
 			if (!label->fdtdir)
diff --git a/test/boot/pxe.c b/test/boot/pxe.c
index 0751228dc99..2d690141349 100644
--- a/test/boot/pxe.c
+++ b/test/boot/pxe.c
@@ -190,15 +190,17 @@  static int pxe_test_parse_norun(struct unit_test_state *uts)
 	ut_asserteq_str("/initrd.img", label->initrd);
 	ut_asserteq_str("/dtb/board.dtb", label->fdt);
 	ut_assertnull(label->fdtdir);
-	ut_asserteq(4, label->files.count);
+	ut_asserteq(5, label->files.count);
 	ut_asserteq_str("/vmlinuz",
 			alist_get(&label->files, 0, struct pxe_file)->path);
 	ut_asserteq_str("/initrd.img",
 			alist_get(&label->files, 1, struct pxe_file)->path);
-	ut_asserteq_str("/dtb/overlay1.dtbo",
+	ut_asserteq_str("/dtb/board.dtb",
 			alist_get(&label->files, 2, struct pxe_file)->path);
-	ut_asserteq_str("/dtb/overlay2.dtbo",
+	ut_asserteq_str("/dtb/overlay1.dtbo",
 			alist_get(&label->files, 3, struct pxe_file)->path);
+	ut_asserteq_str("/dtb/overlay2.dtbo",
+			alist_get(&label->files, 4, struct pxe_file)->path);
 	ut_asserteq_str("Booting default Linux kernel", label->say);
 	ut_asserteq(0, label->ipappend);
 	ut_asserteq(0, label->attempted);
@@ -306,7 +308,7 @@  static int pxe_test_parse_norun(struct unit_test_state *uts)
 	 * environment, and verify overlay files can be loaded.
 	 */
 	label = list_first_entry(&cfg->labels, struct pxe_label, list);
-	ut_asserteq(4, label->files.count);
+	ut_asserteq(5, label->files.count);
 
 	/* Set environment variables for file loading */
 	ut_assertok(env_set_hex("kernel_addr_r", PXE_KERNEL_ADDR));
@@ -325,15 +327,15 @@  static int pxe_test_parse_norun(struct unit_test_state *uts)
 	ut_asserteq(PXE_KERNEL_ADDR, ctx.kern_addr);
 	ut_asserteq(PXE_FDT_ADDR, ctx.fdt_addr);
 
-	/* Verify overlays were loaded to valid addresses (indices 2 and 3) */
-	ut_assert(alist_get(&label->files, 2,
-			    struct pxe_file)->addr >= PXE_OVERLAY_ADDR);
+	/* Verify overlays were loaded to valid addresses (indices 3 and 4) */
 	ut_assert(alist_get(&label->files, 3,
 			    struct pxe_file)->addr >= PXE_OVERLAY_ADDR);
+	ut_assert(alist_get(&label->files, 4,
+			    struct pxe_file)->addr >= PXE_OVERLAY_ADDR);
 
 	/* Second overlay should be at a higher address than the first */
-	ut_assert(alist_get(&label->files, 3, struct pxe_file)->addr >
-		  alist_get(&label->files, 2, struct pxe_file)->addr);
+	ut_assert(alist_get(&label->files, 4, struct pxe_file)->addr >
+		  alist_get(&label->files, 3, struct pxe_file)->addr);
 
 	/* Verify no more console output */
 	ut_assert_console_end();