summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Leahy <leroy.p.leahy@intel.com>2016-07-20 08:41:52 -0700
committerLee Leahy <leroy.p.leahy@intel.com>2016-08-01 06:15:47 +0200
commit0c1843aeb9559424c04c89e80a8c540e5634802d (patch)
treef79106332f0528d26c91e8b79fe430acd33fbe6f
parent33ab4fea23d8e57b4abab0e10d556ff6344ecf37 (diff)
soc/intel/quark: Fix car_stage_entry routine name.
Change routine name from car_state_entry to car_stage_entry. TEST=Build and run on Galileo Gen2 Change-Id: Ifd11db3fa711f2fe52ade1c6cde94f9be1f3a652 Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com> Reviewed-on: https://review.coreboot.org/15857 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
-rw-r--r--src/soc/intel/quark/include/soc/romstage.h2
-rw-r--r--src/soc/intel/quark/romstage/car_stage_entry.S2
-rw-r--r--src/soc/intel/quark/romstage/romstage.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/intel/quark/include/soc/romstage.h b/src/soc/intel/quark/include/soc/romstage.h
index 7d89c8b02a..7e761ab427 100644
--- a/src/soc/intel/quark/include/soc/romstage.h
+++ b/src/soc/intel/quark/include/soc/romstage.h
@@ -25,7 +25,7 @@
#include <fsp/romstage.h>
#include <soc/reg_access.h>
-asmlinkage void *car_state_c_entry(void);
+asmlinkage void *car_stage_c_entry(void);
void report_platform_info(void);
int set_base_address_and_enable_uart(u8 bus, u8 dev, u8 func, u32 mmio_base);
void pcie_init(void);
diff --git a/src/soc/intel/quark/romstage/car_stage_entry.S b/src/soc/intel/quark/romstage/car_stage_entry.S
index bf51061984..d0a0db0f5d 100644
--- a/src/soc/intel/quark/romstage/car_stage_entry.S
+++ b/src/soc/intel/quark/romstage/car_stage_entry.S
@@ -27,7 +27,7 @@
car_stage_entry:
/* Enter the C code */
- call car_state_c_entry
+ call car_stage_c_entry
#if !ENV_VERSTAGE
#include "src/drivers/intel/fsp1_1/after_raminit.S"
diff --git a/src/soc/intel/quark/romstage/romstage.c b/src/soc/intel/quark/romstage/romstage.c
index 457c922a96..4f9b6986da 100644
--- a/src/soc/intel/quark/romstage/romstage.c
+++ b/src/soc/intel/quark/romstage/romstage.c
@@ -66,7 +66,7 @@ static const struct reg_script hsuart_init[] = {
REG_SCRIPT_END
};
-asmlinkage void *car_state_c_entry(void)
+asmlinkage void *car_stage_c_entry(void)
{
post_code(0x20);
if (IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1)) {