Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-21 20:34:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fdt: Move ft_verify_fdt() before the final fixups

Browse source 
Move this check before the FDT fixups so that we can use a livetree
after this point.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-11-12 08:27:50 -07:00 • committed by Tom Rini
parent 79e9727f15
commit dbdc9c6aef
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
boot/image-fdt.c
View file

@ -639,6 +639,10 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob,
if (fdt_initrd(blob, *initrd_start, *initrd_end)) if (fdt_initrd(blob, *initrd_start, *initrd_end))
goto err; goto err;
if (!ft_verify_fdt(blob))
goto err;
/* after here we are using a livetree */
if (!of_live_active() && CONFIG_IS_ENABLED(EVENT)) { if (!of_live_active() && CONFIG_IS_ENABLED(EVENT)) {
struct event_ft_fixup fixup; struct event_ft_fixup fixup;
@ -667,9 +671,6 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob,
if (lmb) if (lmb)
lmb_reserve(lmb, map_to_sysmem(blob), of_size); lmb_reserve(lmb, map_to_sysmem(blob), of_size);
if (!ft_verify_fdt(blob))
goto err;
#if defined(CONFIG_ARCH_KEYSTONE) #if defined(CONFIG_ARCH_KEYSTONE)
if (IS_ENABLED(CONFIG_OF_BOARD_SETUP)) if (IS_ENABLED(CONFIG_OF_BOARD_SETUP))
ft_board_setup_ex(blob, gd->bd); ft_board_setup_ex(blob, gd->bd);