colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

board_f: Move new_bloblist 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:12 -06:00
committed by Tom Rini
parent 8941972854
commit e821897622
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/board_f.c
View File

@@ -627,8 +627,8 @@ static int reserve_bloblist(void)
/* Align to a 4KB boundary for easier reading of addresses */
gd->start_addr_sp = ALIGN_DOWN(gd->start_addr_sp -
CONFIG_BLOBLIST_SIZE_RELOC, 0x1000);
gd->new_bloblist = map_sysmem(gd->start_addr_sp,
CONFIG_BLOBLIST_SIZE_RELOC);
gd->boardf->new_bloblist = map_sysmem(gd->start_addr_sp,
CONFIG_BLOBLIST_SIZE_RELOC);
#endif
return 0;
@@ -704,10 +704,11 @@ static int reloc_bloblist(void)
debug("Not relocating bloblist\n");
return 0;
}
if (gd->new_bloblist) {
if (gd->boardf->new_bloblist) {
debug("Copying bloblist from %p to %p, size %x\n",
gd->bloblist, gd->new_bloblist, gd->bloblist->total_size);
return bloblist_reloc(gd->new_bloblist,
gd->bloblist, gd->boardf->new_bloblist,
gd->bloblist->total_size);
return bloblist_reloc(gd->boardf->new_bloblist,
CONFIG_BLOBLIST_SIZE_RELOC);
}
#endif

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

@@ -395,10 +395,6 @@ struct global_data {
* @bloblist: blob list information
*/
struct bloblist_hdr *bloblist;
/**
* @new_bloblist: relocated blob list information
*/
struct bloblist_hdr *new_bloblist;
#endif
#if CONFIG_IS_ENABLED(HANDOFF)
/**

4
include/board_f.h
View File

@@ -26,6 +26,10 @@ struct board_f {
* @new_bootstage: relocated boot stage information
*/
struct bootstage_data *new_bootstage;
/**
* @new_bloblist: relocated blob list information
*/
struct bloblist_hdr *new_bloblist;
};
#endif