armv7: add ARM-encoded bootblock_exit() stub
This replaces the call() function with a stub which is compiled
separately using -marm. See http://review.coreboot.org/#/c/2175/
for details.
Change-Id: I7f8c45b5e63ec97b0a82294488129d1c97ec0cbf
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: http://review.coreboot.org/2180
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c
index f6bcf98..af76d4c 100644
--- a/src/arch/armv7/bootblock_simple.c
+++ b/src/arch/armv7/bootblock_simple.c
@@ -20,6 +20,7 @@
*/
#include <bootblock_common.h>
+#include <arch/bootblock_exit.h>
#include <arch/cbfs.h>
#include <arch/hlt.h>
@@ -36,7 +37,7 @@
void main(unsigned long bist)
{
const char *target1 = "fallback/romstage";
- unsigned long entry;
+ unsigned long romstage_entry;
if (boot_cpu()) {
bootblock_cpu_init();
@@ -44,8 +45,8 @@
}
printk(BIOS_INFO, "bootblock main(): loading romstage\n");
- entry = loadstage(target1);
+ romstage_entry = loadstage(target1);
printk(BIOS_INFO, "bootblock main(): jumping to romstage\n");
- if (entry) call(entry);
+ if (romstage_entry) bootblock_exit(romstage_entry);
hlt();
}