From 538b324c5f6e890b435dd88f4674cdd09fb56ed9 Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Sun, 5 Jun 2016 17:20:17 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/15125 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/include/bootblock_common.h | 3 ++- src/lib/bootblock.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/include/bootblock_common.h b/src/include/bootblock_common.h index b227cf47be..0985241590 100644 --- a/src/include/bootblock_common.h +++ b/src/include/bootblock_common.h @@ -16,6 +16,7 @@ #ifndef __BOOTBLOCK_COMMON_H #define __BOOTBLOCK_COMMON_H +#include #include #include @@ -36,6 +37,6 @@ void bootblock_soc_init(void); * 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 f16cb44df6..9dece0c373 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) -- cgit v1.2.3