summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2018-12-23 07:11:14 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2018-12-28 05:27:20 +0000
commitacaa581a474660e9c34cb4930cd63c77660f6e16 (patch)
tree636f8071ee07775941ccae257b8b83917a8b42f8
parent049ad67f76a7cd051f3228e084d0097d8cef8249 (diff)
downloadcoreboot-acaa581a474660e9c34cb4930cd63c77660f6e16.tar.xz
soc/intel: Drop romstage_after_car()
Platforms moved to POSTCAR_STAGE so these are no longer used. Change-Id: I9a7b5a1f29b402d0e996f2c2f8c6db3800cdddf3 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/30387 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
-rw-r--r--src/cpu/intel/car/romstage.c6
-rw-r--r--src/include/cpu/intel/romstage.h3
-rw-r--r--src/soc/intel/baytrail/include/soc/romstage.h1
-rw-r--r--src/soc/intel/baytrail/romstage/romstage.c7
-rw-r--r--src/soc/intel/broadwell/include/soc/romstage.h1
-rw-r--r--src/soc/intel/broadwell/romstage/romstage.c8
6 files changed, 0 insertions, 26 deletions
diff --git a/src/cpu/intel/car/romstage.c b/src/cpu/intel/car/romstage.c
index 164f1219a1..823853ce60 100644
--- a/src/cpu/intel/car/romstage.c
+++ b/src/cpu/intel/car/romstage.c
@@ -58,9 +58,3 @@ asmlinkage void *romstage_main(unsigned long bist)
/* We do not return. */
return NULL;
}
-
-asmlinkage void romstage_after_car(void)
-{
- /* Load the ramstage. */
- run_ramstage();
-}
diff --git a/src/include/cpu/intel/romstage.h b/src/include/cpu/intel/romstage.h
index eace57e558..418d029642 100644
--- a/src/include/cpu/intel/romstage.h
+++ b/src/include/cpu/intel/romstage.h
@@ -27,8 +27,5 @@ void platform_enter_postcar(void);
/* romstage_main is called from the cache-as-ram assembly file to prepare
* CAR stack guards.*/
asmlinkage void *romstage_main(unsigned long bist);
-/* romstage_after_car() is the C function called after cache-as-ram has
- * been torn down. It is responsible for loading the ramstage. */
-asmlinkage void romstage_after_car(void);
#endif /* _CPU_INTEL_ROMSTAGE_H */
diff --git a/src/soc/intel/baytrail/include/soc/romstage.h b/src/soc/intel/baytrail/include/soc/romstage.h
index ba12c8f75a..ac0f03bfdf 100644
--- a/src/soc/intel/baytrail/include/soc/romstage.h
+++ b/src/soc/intel/baytrail/include/soc/romstage.h
@@ -33,7 +33,6 @@ void mainboard_romstage_entry(struct romstage_params *params);
void romstage_common(struct romstage_params *params);
void *asmlinkage romstage_main(unsigned long bist, uint32_t tsc_lo,
uint32_t tsc_high);
-void asmlinkage romstage_after_car(void);
void raminit(struct mrc_params *mp, int prev_sleep_state);
void gfx_init(void);
void tco_disable(void);
diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c
index 0e1d57e3dd..011840461a 100644
--- a/src/soc/intel/baytrail/romstage/romstage.c
+++ b/src/soc/intel/baytrail/romstage/romstage.c
@@ -230,13 +230,6 @@ void romstage_common(struct romstage_params *params)
romstage_handoff_init(prev_sleep_state == ACPI_S3);
}
-void asmlinkage romstage_after_car(void)
-{
- /* Load the ramstage. */
- run_ramstage();
- while (1);
-}
-
static inline uint32_t *stack_push(u32 *stack, u32 value)
{
stack = &stack[-1];
diff --git a/src/soc/intel/broadwell/include/soc/romstage.h b/src/soc/intel/broadwell/include/soc/romstage.h
index e52004bfd5..e2f99f252b 100644
--- a/src/soc/intel/broadwell/include/soc/romstage.h
+++ b/src/soc/intel/broadwell/include/soc/romstage.h
@@ -31,7 +31,6 @@ void mainboard_romstage_entry(struct romstage_params *params);
void romstage_common(struct romstage_params *params);
asmlinkage void *romstage_main(unsigned long bist, uint32_t tsc_lo,
uint32_t tsc_high);
-asmlinkage void romstage_after_car(void);
void raminit(struct pei_data *pei_data);
void *setup_stack_and_mtrrs(void);
diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage/romstage.c
index 1e925212b4..afc8216677 100644
--- a/src/soc/intel/broadwell/romstage/romstage.c
+++ b/src/soc/intel/broadwell/romstage/romstage.c
@@ -139,12 +139,4 @@ void romstage_common(struct romstage_params *params)
romstage_handoff_init(params->power_state->prev_sleep_state == ACPI_S3);
}
-asmlinkage void romstage_after_car(void)
-{
- /* Load the ramstage. */
- run_ramstage();
- while (1)
- ;
-}
-
void __weak mainboard_pre_console_init(void) {}