Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-26 23:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

board_f: Move fdt_size to board

Browse source 
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>
This commit is contained in:
Simon Glass 2024-08-21 10:19:10 -06:00 • committed by Tom Rini
parent 6abd992ada
commit 5019d3282c
5 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/bdinfo.c
View file

@ -154,7 +154,6 @@ static int bdinfo_print_all(struct bd_info *bd)
if (IS_ENABLED(CONFIG_CMD_NET)) if (IS_ENABLED(CONFIG_CMD_NET))
print_eth(); print_eth();
bdinfo_print_num_l("fdt_blob", (ulong)map_to_sysmem(gd->fdt_blob)); 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)) if (IS_ENABLED(CONFIG_VIDEO))
show_video_info(); show_video_info();
#if CONFIG_IS_ENABLED(MULTI_DTB_FIT) #if CONFIG_IS_ENABLED(MULTI_DTB_FIT)

11
common/board_f.c
View file

@ -575,12 +575,15 @@ static int reserve_fdt(void)
* section, then it will be relocated with other data. * section, then it will be relocated with other data.
*/ */
if (gd->fdt_blob) { 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->start_addr_sp = reserve_stack_aligned(
gd->boardf->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size); 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", debug("Reserving %lu Bytes for FDT at: %08lx\n",
gd->fdt_size, gd->start_addr_sp); gd->boardf->fdt_size, gd->start_addr_sp);
} }
} }

4
include/asm-generic/global_data.h
View file

@ -226,10 +226,6 @@ struct global_data {
* @fdt_blob: U-Boot's own device tree, NULL if none * @fdt_blob: U-Boot's own device tree, NULL if none
*/ */
const void *fdt_blob; const void *fdt_blob;
/**
* @fdt_size: space reserved for relocated device space
*/
unsigned long fdt_size;
/** /**
* @fdt_src: Source of FDT * @fdt_src: Source of FDT
*/ */

4
include/board_f.h
View file

@ -18,6 +18,10 @@ struct board_f {
* @new_fdt: relocated device tree * @new_fdt: relocated device tree
*/ */
void *new_fdt; void *new_fdt;
/**
* @fdt_size: space reserved for relocated device space
*/
unsigned long fdt_size;
}; };
#endif #endif

1
test/cmd/bdinfo.c
View file

@ -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_assert(map_to_sysmem(gd->fdt_blob) == env_get_hex("fdtcontroladdr", 0x1234));
ut_assertok(test_num_l(uts, "fdt_blob", ut_assertok(test_num_l(uts, "fdt_blob",
(ulong)map_to_sysmem(gd->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)) if (IS_ENABLED(CONFIG_VIDEO))
ut_assertok(test_video_info(uts)); ut_assertok(test_video_info(uts));