GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Reviewed-on: https://review.coreboot.org/15125
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Lee Leahy 2016-06-05 17:20:17 -07:00 committed by Leroy P Leahy
parent c8d45ac88e
commit 538b324c5f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/bootblock_common.h
View File

@ -16,6 +16,7 @@
#ifndef __BOOTBLOCK_COMMON_H #ifndef __BOOTBLOCK_COMMON_H
#define __BOOTBLOCK_COMMON_H #define __BOOTBLOCK_COMMON_H
#include <arch/cpu.h>
#include <main_decl.h> #include <main_decl.h>
#include <stdint.h> #include <stdint.h>
@ -36,6 +37,6 @@ void bootblock_soc_init(void);
* This function assumes that the timer has already been initialized, so it * This function assumes that the timer has already been initialized, so it
* does not call init_timer(). * 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 */ #endif /* __BOOTBLOCK_COMMON_H */

2
src/lib/bootblock.c
View File

@ -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_soc_init(void) { /* do nothing */ }
__attribute__((weak)) void bootblock_mainboard_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. */ /* Initialize timestamps if we have TIMESTAMP region in memlayout.ld. */
if (IS_ENABLED(CONFIG_COLLECT_TIMESTAMPS) && _timestamp_size > 0) if (IS_ENABLED(CONFIG_COLLECT_TIMESTAMPS) && _timestamp_size > 0)