aboutsummaryrefslogtreecommitdiff
path: root/src/soc/intel/baytrail/romstage/romstage.c
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2018-11-29 14:16:49 +0100
committerPatrick Georgi <pgeorgi@google.com>2018-12-05 13:33:32 +0000
commitd5d20d03fea5d50152fac783cb0985dbaa66d782 (patch)
tree0b020ad67d2a82f5371321d402b54631203e1990 /src/soc/intel/baytrail/romstage/romstage.c
parentf6cfbf380488d74f5b420d90d02e59399b83fed9 (diff)
soc/intel/baytrail: Implement POSTCAR stage
Use common code to tear down CAR. Change-Id: I62a70ae35fe92808f180f2b5f21c5899a96c2c16 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/29930 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/baytrail/romstage/romstage.c')
-rw-r--r--src/soc/intel/baytrail/romstage/romstage.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c
index dd1fd29c7d..0e1d57e3dd 100644
--- a/src/soc/intel/baytrail/romstage/romstage.c
+++ b/src/soc/intel/baytrail/romstage/romstage.c
@@ -47,7 +47,7 @@
* Because we can't use global variables the stack is used for allocations --
* thus the need to call back and forth. */
-static void *setup_stack_and_mtrrs(void);
+static void platform_enter_postcar(void);
static void program_base_addresses(void)
{
@@ -128,7 +128,10 @@ void *asmlinkage romstage_main(unsigned long bist, uint32_t tsc_low,
/* Call into mainboard. */
mainboard_romstage_entry(&rp);
- return setup_stack_and_mtrrs();
+ platform_enter_postcar();
+
+ /* We don't return here */
+ return NULL;
}
static struct chipset_power_state power_state CAR_GLOBAL;
@@ -245,7 +248,7 @@ static inline uint32_t *stack_push(u32 *stack, u32 value)
/* setup_stack_and_mtrrs() determines the stack to use after
* cache-as-ram is torn down as well as the MTRR settings to use. */
-static void *setup_stack_and_mtrrs(void)
+static void platform_enter_postcar(void)
{
struct postcar_frame pcf;
uintptr_t top_of_ram;
@@ -267,5 +270,5 @@ static void *setup_stack_and_mtrrs(void)
postcar_frame_add_mtrr(&pcf, top_of_ram - 8*MiB, 16*MiB,
MTRR_TYPE_WRBACK);
- return postcar_commit_mtrrs(&pcf);
+ run_postcar_phase(&pcf);
}