This value is only really used before relocation. There is not much use to showing its value in bdinfo, so drop it. Move it to the new boardf struct.
Signed-off-by: Simon Glass sjg@chromium.org ---
cmd/bdinfo.c | 1 - common/board_f.c | 11 +++++++---- include/asm-generic/global_data.h | 4 ---- include/board_f.h | 4 ++++ test/cmd/bdinfo.c | 1 - 5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index b53b51acca4..59fbaea498b 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -154,7 +154,6 @@ static int bdinfo_print_all(struct bd_info *bd) if (IS_ENABLED(CONFIG_CMD_NET)) print_eth(); bdinfo_print_num_l("fdt_blob", (ulong)map_to_sysmem(gd->fdt_blob)); - bdinfo_print_num_l("fdt_size", (ulong)gd->fdt_size); if (IS_ENABLED(CONFIG_VIDEO)) show_video_info(); #if CONFIG_IS_ENABLED(MULTI_DTB_FIT) diff --git a/common/board_f.c b/common/board_f.c index 2125eb5ca50..71194cccdb5 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -574,12 +574,15 @@ static int reserve_fdt(void) * section, then it will be relocated with other data. */ if (gd->fdt_blob) { - gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob), 32); + gd->boardf->fdt_size = + ALIGN(fdt_totalsize(gd->fdt_blob), 32);
- gd->start_addr_sp = reserve_stack_aligned(gd->fdt_size); - gd->boardf->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size); + gd->start_addr_sp = reserve_stack_aligned( + gd->boardf->fdt_size); + gd->boardf->new_fdt = map_sysmem(gd->start_addr_sp, + gd->boardf->fdt_size); debug("Reserving %lu Bytes for FDT at: %08lx\n", - gd->fdt_size, gd->start_addr_sp); + gd->boardf->fdt_size, gd->start_addr_sp); } }
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index bd053f77f6c..81becbac2ad 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -225,10 +225,6 @@ struct global_data { * @fdt_blob: U-Boot's own device tree, NULL if none */ const void *fdt_blob; - /** - * @fdt_size: space reserved for relocated device space - */ - unsigned long fdt_size; /** * @fdt_src: Source of FDT */ diff --git a/include/board_f.h b/include/board_f.h index 74fca6df75c..d9c793fbeb1 100644 --- a/include/board_f.h +++ b/include/board_f.h @@ -18,6 +18,10 @@ struct board_f { * @new_fdt: relocated device tree */ void *new_fdt; + /** + * @fdt_size: space reserved for relocated device space + */ + unsigned long fdt_size; };
#endif diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 60adc4aa960..591390560b7 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -185,7 +185,6 @@ static int bdinfo_test_all(struct unit_test_state *uts) ut_assert(map_to_sysmem(gd->fdt_blob) == env_get_hex("fdtcontroladdr", 0x1234)); ut_assertok(test_num_l(uts, "fdt_blob", (ulong)map_to_sysmem(gd->fdt_blob))); - ut_assertok(test_num_l(uts, "fdt_size", (ulong)gd->fdt_size));
if (IS_ENABLED(CONFIG_VIDEO)) ut_assertok(test_video_info(uts));