vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spl: fit: rework the FDT load hack

Browse Source 
U-Boot proper expects its FDT to be right after its binary image; the
"full" FIT image loader thus adopts an hack to relocate it, ignoring
the specified load address.

Rework the current form of the hack to:

- support the 'sandbox' environment with a sysmem-aware memcpy;
- use the ALIGN() macro instead of raw alignment logic;
- align the FDT to 8-byte boundary as per FDT specifications;
- fix the debug print (which was reporting the source address for the
  relocation instead of the destination one).

Signed-off-by: Francesco Valla <francesco@valla.it>
This commit is contained in:
Francesco Valla
2026-06-17 14:16:41 -06:00
committed by Tom Rini
parent 2a70a7e225
commit fffbb6f428
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/spl/spl_fit.c
+7 -6
View File
@@ -1000,14 +1000,15 @@ int spl_load_fit_image(struct spl_image_info *spl_image,
&fit_uname_config, IH_ARCH_DEFAULT, IH_TYPE_FLATDT,
-1, FIT_LOAD_OPTIONAL, &dt_data, &dt_len);
if (ret >= 0) {
spl_image->fdt_addr = (void *)dt_data;
if (spl_image->os == IH_OS_U_BOOT) {
/* HACK: U-Boot expects FDT at a specific address */
fdt_hack = spl_image->load_addr + spl_image->size;
fdt_hack = (fdt_hack + 3) & ~3;
debug("Relocating FDT to %p\n", spl_image->fdt_addr);
memcpy((void *)fdt_hack, spl_image->fdt_addr, dt_len);
fdt_hack = ALIGN(spl_image->load_addr + spl_image->size, 8);
debug("Relocating FDT to %p\n", (void *)fdt_hack);
memcpy(map_sysmem(fdt_hack, dt_len),
map_sysmem(dt_data, 0), dt_len);
spl_image->fdt_addr = (void *)fdt_hack;
} else {
spl_image->fdt_addr = (void *)dt_data;
}
}