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 /lib/trace.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 'lib/trace.c')
| -rw-r--r-- | lib/trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/trace.c b/lib/trace.c index 505a31806ce..54f0bf2f578 100644 --- a/lib/trace.c +++ b/lib/trace.c @@ -53,7 +53,7 @@ static inline uintptr_t __attribute__((no_instrument_function)) if (gd->flags & GD_FLG_RELOC) offset -= gd->relocaddr; else - offset -= CONFIG_SYS_TEXT_BASE; + offset -= CONFIG_TEXT_BASE; #endif return offset / FUNC_SITE_SIZE; } @@ -123,7 +123,7 @@ static void __attribute__((no_instrument_function)) add_textbase(void) if (hdr->ftrace_count < hdr->ftrace_size) { struct trace_call *rec = &hdr->ftrace[hdr->ftrace_count]; - rec->func = CONFIG_SYS_TEXT_BASE; + rec->func = CONFIG_TEXT_BASE; rec->caller = 0; rec->flags = FUNCF_TEXTBASE; } |