diff options
| author | Simon Glass <[email protected]> | 2024-12-01 07:42:35 -0700 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-12-02 07:40:39 -0600 |
| commit | 924a5e4e41e99cefabc465c82ffd91374d38a1e7 (patch) | |
| tree | 0237d567a27505d6cb19cef0b3142ef738b5fca9 /common | |
| parent | 03e57244bc260da9b9839d387cc5eb691f88b5bd (diff) | |
Revert "global_data: Drop spl_handoff"
This breaks chromebook_coral which says:
Video: No video mode configured in FSP!
This reverts commit 2e9313179a846b581c0fc3f6a49e19f3d343efa8.
Signed-off-by: Simon Glass <[email protected]>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 12 | ||||
| -rw-r--r-- | common/init/handoff.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/common/board_f.c b/common/board_f.c index 98dc2591e1d..939697d13d8 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -305,6 +305,17 @@ static int setup_mon_len(void) return 0; } +static int setup_spl_handoff(void) +{ +#if CONFIG_IS_ENABLED(HANDOFF) + gd->spl_handoff = bloblist_find(BLOBLISTT_U_BOOT_SPL_HANDOFF, + sizeof(struct spl_handoff)); + debug("Found SPL hand-off info %p\n", gd->spl_handoff); +#endif + + return 0; +} + __weak int arch_cpu_init(void) { return 0; @@ -880,6 +891,7 @@ static const init_fnc_t init_sequence_f[] = { initf_bootstage, /* uses its own timer, so does not need DM */ event_init, bloblist_maybe_init, + setup_spl_handoff, #if defined(CONFIG_CONSOLE_RECORD_INIT_F) console_record_init, #endif diff --git a/common/init/handoff.c b/common/init/handoff.c index 86c020ee0b9..a7cd065fb38 100644 --- a/common/init/handoff.c +++ b/common/init/handoff.c @@ -5,7 +5,6 @@ * Copyright 2018 Google, Inc */ -#include <bloblist.h> #include <handoff.h> #include <asm/global_data.h> @@ -39,14 +38,3 @@ void handoff_load_dram_banks(struct spl_handoff *ho) bd->bi_dram[i].size = ho->ram_bank[i].size; } } - -struct spl_handoff *handoff_get(void) -{ - struct spl_handoff *handoff; - - handoff = bloblist_find(BLOBLISTT_U_BOOT_SPL_HANDOFF, - sizeof(struct spl_handoff)); - debug("Found SPL hand-off info %p\n", handoff); - - return handoff; -} |