diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-31 14:43:04 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-31 14:43:04 -0400 |
| commit | a90afc6730e6c67ad37f4c98a02891a93b4ff971 (patch) | |
| tree | 724c085433631e142a56c052d667139cba29b4a6 /arch/x86/lib/relocate.c | |
| parent | 6f38d91158e7e4199753b79e0a25c1a65175aba4 (diff) | |
| parent | 77bec9e3d8bd2dc307447b92a3d5cefd693a62ad (diff) | |
Merge branch '2022-10-31-vbe-implement-the-full-firmware-flow'
To quote Simon:
This series provides an implementation of VBE from TPL through to U-Boot
proper, using VBE to load the relevant firmware stages. It buils a single
image.bin file containing all the phases:
TPL - initial phase, loads VPL using binman symbols
VPL - main firmware phase, loads SPL using VBE parameters
SPL - loads U-Boot proper using VBE parameters
U-Boot - final firmware phase, where OS booting is processed
This series does not include the OS-booting phase. That will be the
subject of a future series.
The implementation is entirely handled by sandbox. It should be possible
to enable this on a real board without much effort, but that is also the
subject of a future series.
Diffstat (limited to 'arch/x86/lib/relocate.c')
| -rw-r--r-- | arch/x86/lib/relocate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index 9060d19d46a..5b1b420a643 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -162,10 +162,10 @@ int do_elf_reloc_fixups(void) if (re_src == re_end) panic("No relocation data"); -#ifdef CONFIG_SYS_TEXT_BASE - text_base = CONFIG_SYS_TEXT_BASE; +#ifdef CONFIG_TEXT_BASE + text_base = CONFIG_TEXT_BASE; #else - panic("No CONFIG_SYS_TEXT_BASE"); + panic("No CONFIG_TEXT_BASE"); #endif #if CONFIG_IS_ENABLED(X86_64) do_elf_reloc_fixups64(text_base, size, re_src, re_end); |