aboutsummaryrefslogtreecommitdiff
path: root/src/cpu/intel/car/romstage.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu/intel/car/romstage.c')
-rw-r--r--src/cpu/intel/car/romstage.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/cpu/intel/car/romstage.c b/src/cpu/intel/car/romstage.c
index b9d787fdc0..2daf47b29b 100644
--- a/src/cpu/intel/car/romstage.c
+++ b/src/cpu/intel/car/romstage.c
@@ -53,6 +53,7 @@ static void romstage_main(unsigned long bist)
platform_enter_postcar();
}
+#if !IS_ENABLED(CONFIG_C_ENVIRONMENT_BOOTBLOCK)
/* This wrapper enables easy transition towards C_ENVIRONMENT_BOOTBLOCK,
* keeping changes in cache_as_ram.S easy to manage.
*/
@@ -60,3 +61,18 @@ asmlinkage void bootblock_c_entry_bist(uint64_t base_timestamp, uint32_t bist)
{
romstage_main(bist);
}
+#endif
+
+
+/* We don't carry BIST from bootblock in a good location to read from.
+ * Any error should have been reported in bootblock already.
+ */
+#define NO_BIST 0
+
+asmlinkage void car_stage_entry(void)
+{
+ /* Assumes the hardware was set up during the bootblock */
+ console_init();
+
+ romstage_main(NO_BIST);
+}