summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKangheui Won <khwon@chromium.org>2020-09-17 16:49:40 +1000
committerPatrick Georgi <pgeorgi@google.com>2020-09-22 07:00:34 +0000
commit18582237aca8051a6219093518a23ce943ba42ff (patch)
tree0946f25dc0329c635bab3229e8e41dd8fc79b8e7
parent4e2f5fd1418996b0a736f7109dfc257cbfe30db8 (diff)
src/lib/bootblock.c: make bootblock_main_with_timestamp public
bootblock_main_with_timestamp function allows to proceed with existing timestamp table. Apparently we never needed this, but Zork runs verstage in the PSP before bootblock. It'd be useful if we can grab timestamps for verstage from PSP and merge with coreboot timestamps. Making it non-static will enable us to do that. BUG=b:154142138, b:159220781 BRANCH=zork TEST=build firmware for zork Change-Id: I061c3fbb652c40bafa0a007aa75f2a82680f5e0a Signed-off-by: Kangheui Won <khwon@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/45468 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--src/include/bootblock_common.h2
-rw-r--r--src/lib/bootblock.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/include/bootblock_common.h b/src/include/bootblock_common.h
index 97ccf96629..da627d23d4 100644
--- a/src/include/bootblock_common.h
+++ b/src/include/bootblock_common.h
@@ -29,6 +29,8 @@ asmlinkage void bootblock_c_entry_bist(uint64_t base_timestamp, uint32_t bist);
asmlinkage void ap_bootblock_c_entry(void);
void bootblock_main_with_basetime(uint64_t base_timestamp);
+void bootblock_main_with_timestamp(uint64_t base_timestamp,
+ struct timestamp_entry *timestamps, size_t num_timestamps);
/* This is the argument structure passed from decompressor to bootblock. */
struct bootblock_arg {
diff --git a/src/lib/bootblock.c b/src/lib/bootblock.c
index 7ee246e459..1509c8cb59 100644
--- a/src/lib/bootblock.c
+++ b/src/lib/bootblock.c
@@ -23,7 +23,7 @@ __weak void bootblock_mainboard_init(void) { /* do nothing */ }
* entered from C code. This function assumes that the timer has already been
* initialized, so it does not call init_timer().
*/
-static void bootblock_main_with_timestamp(uint64_t base_timestamp,
+void bootblock_main_with_timestamp(uint64_t base_timestamp,
struct timestamp_entry *timestamps, size_t num_timestamps)
{
/* Initialize timestamps if we have TIMESTAMP region in memlayout.ld. */