diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/bootblock_common.h | 10 | ||||
| -rw-r--r-- | src/lib/bootblock.c | 18 |
2 files changed, 24 insertions, 4 deletions
diff --git a/src/include/bootblock_common.h b/src/include/bootblock_common.h index 2cecc3b645..b227cf47be 100644 --- a/src/include/bootblock_common.h +++ b/src/include/bootblock_common.h @@ -17,6 +17,7 @@ #define __BOOTBLOCK_COMMON_H #include <main_decl.h> +#include <stdint.h> /* * These are defined as weak no-ops that can be overridden by mainboard/SoC. @@ -27,5 +28,14 @@ void bootblock_mainboard_early_init(void); void bootblock_mainboard_init(void); void bootblock_soc_early_init(void); void bootblock_soc_init(void); +/* + * This is a the same as the bootblock main(), with the difference that it does + * not collect a timestamp. Instead it accepts the first timestamp as an + * argument. This can be used in cases where an earlier stamp is available + * Note that this function is designed to be entered from C code. + * This function assumes that the timer has already been initialized, so it + * does not call init_timer(). + */ +void bootblock_main_with_timestamp(uint64_t base_timestamp); #endif /* __BOOTBLOCK_COMMON_H */ diff --git a/src/lib/bootblock.c b/src/lib/bootblock.c index 658eea45c9..f16cb44df6 100644 --- a/src/lib/bootblock.c +++ b/src/lib/bootblock.c @@ -29,13 +29,11 @@ __attribute__((weak)) void bootblock_soc_early_init(void) { /* do nothing */ } __attribute__((weak)) void bootblock_soc_init(void) { /* do nothing */ } __attribute__((weak)) void bootblock_mainboard_init(void) { /* do nothing */ } -void main(void) +void bootblock_main_with_timestamp(uint64_t base_timestamp) { - init_timer(); - /* Initialize timestamps if we have TIMESTAMP region in memlayout.ld. */ if (IS_ENABLED(CONFIG_COLLECT_TIMESTAMPS) && _timestamp_size > 0) - timestamp_init(timestamp_get()); + timestamp_init(base_timestamp); bootblock_soc_early_init(); bootblock_mainboard_early_init(); @@ -50,3 +48,15 @@ void main(void) run_romstage(); } + +void main(void) +{ + uint64_t base_timestamp = 0; + + init_timer(); + + if (IS_ENABLED(CONFIG_COLLECT_TIMESTAMPS)) + base_timestamp = timestamp_get(); + + bootblock_main_with_timestamp(base_timestamp); +} |