From 874bf6e0e25389a9d43b5844855342595d58648e Mon Sep 17 00:00:00 2001 From: Kunihiko Hayashi Date: Tue, 20 Jun 2023 19:50:48 +0900 Subject: [PATCH] board_f: Relocate fdt even if GD_FLG_SKIP_RELOC is set In case of OF_SEPARATE (!OF_EMBED), the devicetree blob is placed after _end, and fdt_find_separate() always returns _end. There is a .bss section after _end and the section is cleared before relocation. When GD_FLG_SKIP_RELOC is set, relocation is skipped, so the blob is still in .bss section, but will be cleared. As a result, the devicetree become invalid. To avoid this issue, should relocate it regardless of GD_FLG_SKIP_RELOC in reloc_fdt(). Signed-off-by: Kunihiko Hayashi Reviewed-by: Simon Glass --- common/board_f.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 1688e27071..334d04af19 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -633,8 +633,6 @@ static int init_post(void) static int reloc_fdt(void) { if (!IS_ENABLED(CONFIG_OF_EMBED)) { - if (gd->flags & GD_FLG_SKIP_RELOC) - return 0; if (gd->new_fdt) { memcpy(gd->new_fdt, gd->fdt_blob, fdt_totalsize(gd->fdt_blob)); -- 2.39.5