diff options
| author | Simon Glass <sjg@chromium.org> | 2024-08-21 10:19:12 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-08-26 14:05:38 -0600 |
| commit | e821897622a13d41c80993510be56e7011d1c43a (patch) | |
| tree | 5b8b89d679ac6f02c231da9cd6b8e963e5912dea | |
| parent | 894197285407ae5782597cdd9c79eca8518246ed (diff) | |
board_f: Move new_bloblist to boardf
This value is only used before relocation. Move it to the new boardf
struct.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/board_f.c | 11 | ||||
| -rw-r--r-- | include/asm-generic/global_data.h | 4 | ||||
| -rw-r--r-- | include/board_f.h | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/common/board_f.c b/common/board_f.c index 0c24e3ae618..eb74bfa428a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -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 diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 915dad503a2..544195391bd 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -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) /** diff --git a/include/board_f.h b/include/board_f.h index 1eba236a961..05aa51510c2 100644 --- a/include/board_f.h +++ b/include/board_f.h @@ -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 |