Leroy P Leahy (leroy.p.leahy@intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15125
-gerrit
commit 84e8952d9326c7d809f9ab1ef3636f8a48e2f3fb Author: Lee Leahy leroy.p.leahy@intel.com Date: Sun Jun 5 17:20:17 2016 -0700
lib: Add asmlinkage attribute to bootblock_main_with_timestamp
Add asmlinkage to bootblock_main_with_timestamp so that it may be called directly from the assembly code.
TEST=Build for Amenia and Galileo Gen2
Change-Id: Iefb8e5c1ddce2ec495b9272966b595d5adcebc1c Signed-off-by: Lee Leahy leroy.p.leahy@intel.com --- src/include/bootblock_common.h | 2 +- src/lib/bootblock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/include/bootblock_common.h b/src/include/bootblock_common.h index 8bef60a..9a321b4 100644 --- a/src/include/bootblock_common.h +++ b/src/include/bootblock_common.h @@ -43,6 +43,6 @@ void asmlinkage bootblock_c_entry(uint64_t base_timestamp); * 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); +void asmlinkage 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 f16cb44..9dece0c 100644 --- a/src/lib/bootblock.c +++ b/src/lib/bootblock.c @@ -29,7 +29,7 @@ __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 bootblock_main_with_timestamp(uint64_t base_timestamp) +void asmlinkage bootblock_main_with_timestamp(uint64_t base_timestamp) { /* Initialize timestamps if we have TIMESTAMP region in memlayout.ld. */ if (IS_ENABLED(CONFIG_COLLECT_TIMESTAMPS) && _timestamp_size > 0)