From 3e914d372661ba68ca92d476708bd68af2593b10 Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Wed, 6 Apr 2022 22:25:50 +0200
Subject: arch/arm64,arm: Prepare for !SEPARATE_ROMSTAGE

Prepare platforms for linking romstage code in the bootblock.

Change-Id: Ic20799b4d6e3f62cd05791a2bd275000a12cc83c
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63420
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
---
 src/arch/arm64/romstage.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/arch')

diff --git a/src/arch/arm64/romstage.c b/src/arch/arm64/romstage.c
index b144f9320f..654ba5a289 100644
--- a/src/arch/arm64/romstage.c
+++ b/src/arch/arm64/romstage.c
@@ -5,6 +5,7 @@
 #include <cbmem.h>
 #include <console/console.h>
 #include <program_loading.h>
+#include <romstage_common.h>
 #include <timestamp.h>
 
 __weak void platform_romstage_main(void) { /* no-op, for bring-up */ }
@@ -15,8 +16,13 @@ void main(void)
 	timestamp_add_now(TS_ROMSTAGE_START);
 
 	console_init();
+
 	exception_init();
+	romstage_main();
+}
 
+void __noreturn romstage_main(void)
+{
 	platform_romstage_main();
 	cbmem_initialize_empty();
 	platform_romstage_postram();
-- 
cgit v1.2.3