summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorLee Leahy <leroy.p.leahy@intel.com>2016-08-02 17:35:22 -0700
committerLee Leahy <leroy.p.leahy@intel.com>2016-08-05 01:55:41 +0200
commit3de7d4a9b2fddb798ce04ea217b7642ff3510ac3 (patch)
tree357a9fdbcae42793ce1814091882e9ead784d941 /src/soc
parentf74ce24de1c19cd021c9a09765f024a23c1fc238 (diff)
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 Change-Id: Ib5f580c30b58d3c82fedddf63c368e617d401515 Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com> Reviewed-on: https://review.coreboot.org/16064 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/quark/bootblock/bootblock.c5
-rw-r--r--src/soc/intel/quark/bootblock/esram_init.S2
2 files changed, 6 insertions, 1 deletions
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 */