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

board_f: Move new_bootstage to boardf

Browse source 
This value is only used before relocation. 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:11 -06:00 • committed by Tom Rini
parent 5019d3282c
commit 8941972854
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/board_f.c
View file

@ -596,7 +596,7 @@ static int reserve_bootstage(void)
int size = bootstage_get_size();
gd->start_addr_sp = reserve_stack_aligned(size);
gd->new_bootstage = map_sysmem(gd->start_addr_sp, size);
gd->boardf->new_bootstage = map_sysmem(gd->start_addr_sp, size);
debug("Reserving %#x Bytes for bootstage at: %08lx\n", size,
gd->start_addr_sp);
#endif
@ -686,9 +686,8 @@ static int reloc_bootstage(void)
#ifdef CONFIG_BOOTSTAGE
if (gd->flags & GD_FLG_SKIP_RELOC)
return 0;
if (gd->new_bootstage) {
bootstage_relocate(gd->new_bootstage);
}
if (gd->boardf->new_bootstage)
bootstage_relocate(gd->boardf->new_bootstage);
#endif
return 0;

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

@ -335,10 +335,6 @@ struct global_data {
* @bootstage: boot stage information
*/
struct bootstage_data *bootstage;
/**
* @new_bootstage: relocated boot stage information
*/
struct bootstage_data *new_bootstage;
#endif
#ifdef CONFIG_LOG
/**

4
include/board_f.h
View file

@ -22,6 +22,10 @@ struct board_f {
* @fdt_size: space reserved for relocated device space
*/
unsigned long fdt_size;
/**
* @new_bootstage: relocated boot stage information
*/
struct bootstage_data *new_bootstage;
};
#endif