From 853295a7f1f17083ce463f11fc210cd9972462d4 Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Tue, 2 Aug 2016 17:35:22 -0700 Subject: [PATCH] UPSTREAM: soc/intel/quark: Add bootblock_c_entry Add the bootblock_c_entry routine to make it more explicit where the code transitions from assembler to C. TEST=Build and run on Galileo Gen2 BUG=None BRANCH=None Change-Id: I8c1f397fcdfee1c244ceaac3794881d4d7fb2182 Signed-off-by: Lee Leahy Reviewed-on: https://review.coreboot.org/16064 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/368406 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/soc/intel/quark/bootblock/bootblock.c | 5 +++++ src/soc/intel/quark/bootblock/esram_init.S | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/soc/intel/quark/bootblock/bootblock.c b/src/soc/intel/quark/bootblock/bootblock.c index 959084d935..3c90de9636 100644 --- a/src/soc/intel/quark/bootblock/bootblock.c +++ b/src/soc/intel/quark/bootblock/bootblock.c @@ -75,6 +75,11 @@ static const struct reg_script mtrr_init[] = { REG_SCRIPT_END }; +void asmlinkage bootblock_c_entry(uint64_t base_timestamp) +{ + bootblock_main_with_timestamp(base_timestamp); +} + void bootblock_soc_early_init(void) { /* Initialize the MTRRs */ diff --git a/src/soc/intel/quark/bootblock/esram_init.S b/src/soc/intel/quark/bootblock/esram_init.S index f3852c4800..d982cdd2f9 100644 --- a/src/soc/intel/quark/bootblock/esram_init.S +++ b/src/soc/intel/quark/bootblock/esram_init.S @@ -534,6 +534,6 @@ before_carstage: push %ebp /* We can call into C functions now */ - call bootblock_main_with_timestamp + call bootblock_c_entry /* Never reached */