[coreboot-gerrit] Change in coreboot[master]: arch/arm64,arm: Prepare for !SEPARATE_ROMSTAGE

[Arthur Heymans (Code Review)]

Attention is currently required from: Julius Werner.
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63420 )

Change subject: arch/arm64,arm: Prepare for !SEPARATE_ROMSTAGE
......................................................................

arch/arm64,arm: Prepare for !SEPARATE_ROMSTAGE

Prepare platforms for linking romstage code in the bootblock.

Change-Id: Ic20799b4d6e3f62cd05791a2bd275000a12cc83c
Signed-off-by: Arthur Heymans 
---
M src/arch/arm64/romstage.c
M src/mainboard/emulation/qemu-armv7/romstage.c
M src/mainboard/ti/beaglebone/romstage.c
3 files changed, 19 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/63420/1

diff --git a/src/arch/arm64/romstage.c b/src/arch/arm64/romstage.c
index b144f93..c604689b 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 @@
    timestamp_add_now(TS_ROMSTAGE_START);

console_init();
-	exception_init();

+	exception_init();
+	romstage_main();
+}
+
+void romstage_main(void)
+{
    platform_romstage_main();
    cbmem_initialize_empty();
    platform_romstage_postram();
diff --git a/src/mainboard/emulation/qemu-armv7/romstage.c b/src/mainboard/emulation/qemu-armv7/romstage.c
index c412315..eb7fb7a 100644
--- a/src/mainboard/emulation/qemu-armv7/romstage.c
+++ b/src/mainboard/emulation/qemu-armv7/romstage.c
@@ -2,9 +2,15 @@

#include <console/console.h>
 #include <program_loading.h>
+#include <romstage_common.h>

void main(void)
 {
    console_init();
+	romstage_main();
+}
+
+void romstage_main(void)
+{
    run_ramstage();
 }
diff --git a/src/mainboard/ti/beaglebone/romstage.c b/src/mainboard/ti/beaglebone/romstage.c
index 4d43be6..e12dd4a 100644
--- a/src/mainboard/ti/beaglebone/romstage.c
+++ b/src/mainboard/ti/beaglebone/romstage.c
@@ -3,9 +3,11 @@
 #include <program_loading.h>
 #include <console/console.h>
 #include <cbmem.h>
+#include <romstage_common.h>

#include <soc/ti/am335x/sdram.h>
 #include "ddr3.h"
+#include "romstage_common.h"

const struct ctrl_ioregs ioregs_bonelt = {
    .cm0ioctl = MT41K256M16HA125E_IOCTRL_VALUE,
@@ -48,7 +50,11 @@
 {
    console_init();
    printk(BIOS_INFO, "Hello from romstage.\n");
+	romstage_main();
+}

+void romstage_main(void)
+{
    config_ddr(400, &ioregs_bonelt, &ddr3_beagleblack_data, &ddr3_beagleblack_cmd_ctrl_data,
    	   &ddr3_beagleblack_emif_reg_data, 0);