From dbdc9c6aefbf5f90777584ab2f914b34ddfc23e5 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 12 Nov 2023 08:27:50 -0700 Subject: [PATCH] fdt: Move ft_verify_fdt() before the final fixups Move this check before the FDT fixups so that we can use a livetree after this point. Signed-off-by: Simon Glass --- boot/image-fdt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/boot/image-fdt.c b/boot/image-fdt.c index 3e007d2b89..2b166c0ff9 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -639,6 +639,10 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, if (fdt_initrd(blob, *initrd_start, *initrd_end)) goto err; + if (!ft_verify_fdt(blob)) + goto err; + + /* after here we are using a livetree */ if (!of_live_active() && CONFIG_IS_ENABLED(EVENT)) { struct event_ft_fixup fixup; @@ -667,9 +671,6 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, if (lmb) lmb_reserve(lmb, map_to_sysmem(blob), of_size); - if (!ft_verify_fdt(blob)) - goto err; - #if defined(CONFIG_ARCH_KEYSTONE) if (IS_ENABLED(CONFIG_OF_BOARD_SETUP)) ft_board_setup_ex(blob, gd->bd); -- 2.39.5