commit 00f860f2847cc05f475ffb33440f1e07d12d61ca
author Simon Glass <sjg@chromium.org> Wed Aug 21 10:19:10 2024 -0600
committer Tom Rini <trini@konsulko.com> Mon Aug 26 14:05:38 2024 -0600
tree 38dc64c46fd5b6580da096a9f81f3ce865d4f751
parent 7f67b3715ef8a44fd242e4723793c31028f8f9bc

board_f: Move fdt_size to board

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

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index b53b51a..59fbaea 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -154,7 +154,6 @@
 	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)

common/board_f.c

diff --git a/common/board_f.c b/common/board_f.c
index 8f7c56e..046d9f4 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -575,12 +575,15 @@
 		 * 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);
 		}
 	}
 

include/asm-generic/global_data.h

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 8a1a4e2..325777d 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -227,10 +227,6 @@
 	 */
 	const void *fdt_blob;
 	/**
-	 * @fdt_size: space reserved for relocated device space
-	 */
-	unsigned long fdt_size;
-	/**
 	 * @fdt_src: Source of FDT
 	 */
 	enum fdt_source_t fdt_src;

include/board_f.h

diff --git a/include/board_f.h b/include/board_f.h
index 74fca6d..d9c793f 100644
--- a/include/board_f.h
+++ b/include/board_f.h
@@ -18,6 +18,10 @@
 	 * @new_fdt: relocated device tree
 	 */
 	void *new_fdt;
+	/**
+	 * @fdt_size: space reserved for relocated device space
+	 */
+	unsigned long fdt_size;
 };
 
 #endif

test/cmd/bdinfo.c

diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c
index 60adc4a..5913905 100644
--- a/test/cmd/bdinfo.c
+++ b/test/cmd/bdinfo.c
@@ -185,7 +185,6 @@
 	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));