summaryrefslogtreecommitdiff
path: root/src/cpu/intel/car
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2018-06-05 11:19:22 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-01-08 15:35:08 +0000
commitd3d82e09fc477bc3c5b10a3aca20fe1490fa1fd9 (patch)
treee29902521b9d838cec97b431dde8a71467acc8d4 /src/cpu/intel/car
parentc641f7ed9f9083f73ddb69676a74d7e205351baa (diff)
downloadcoreboot-d3d82e09fc477bc3c5b10a3aca20fe1490fa1fd9.tar.xz
cpu/intel/car: Enable use of C_ENVIRONMENT_BOOTBLOCK
Add common C entry points that hook to platform-specific bootblock code. Change-Id: I8eac974864f255811e8708997a8014a45a5c09ee Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/30494 Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/cpu/intel/car')
-rw-r--r--src/cpu/intel/car/bootblock.c36
-rw-r--r--src/cpu/intel/car/bootblock.h21
-rw-r--r--src/cpu/intel/car/romstage.c16
3 files changed, 73 insertions, 0 deletions
diff --git a/src/cpu/intel/car/bootblock.c b/src/cpu/intel/car/bootblock.c
new file mode 100644
index 0000000000..6bc041443e
--- /dev/null
+++ b/src/cpu/intel/car/bootblock.c
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <bootblock_common.h>
+#include <cpu/intel/car/bootblock.h>
+
+asmlinkage void bootblock_c_entry_bist(uint64_t base_timestamp, uint32_t bist)
+{
+ /* Call lib/bootblock.c main */
+ bootblock_main_with_timestamp(base_timestamp, NULL, 0);
+}
+
+void __weak bootblock_early_northbridge_init(void) { }
+void __weak bootblock_early_southbridge_init(void) { }
+void __weak bootblock_early_cpu_init(void) { }
+
+void bootblock_soc_early_init(void)
+{
+ bootblock_early_northbridge_init();
+ bootblock_early_southbridge_init();
+ bootblock_early_cpu_init();
+}
+
+void bootblock_soc_init(void)
+{
+}
diff --git a/src/cpu/intel/car/bootblock.h b/src/cpu/intel/car/bootblock.h
new file mode 100644
index 0000000000..5adfd8711d
--- /dev/null
+++ b/src/cpu/intel/car/bootblock.h
@@ -0,0 +1,21 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _CPU_INTEL_CAR_BOOTBLOCK_H
+#define _CPU_INTEL_CAR_BOOTBLOCK_H
+
+void bootblock_early_cpu_init(void);
+void bootblock_early_northbridge_init(void);
+void bootblock_early_southbridge_init(void);
+
+#endif
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);
+}