From 50c0a50ac6a3fa54ed1286e8b76f933701b6d053 Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Thu, 31 Jan 2013 17:05:50 -0800 Subject: armv7: unify stage hand-off routines This replaces the current stage-specific exit/entry functions with generic versions. Now all stages compile with stage_entry(), which is placed at .text.stage_entry.armv7, and stage_exit(). Snow's ramstage files are also updated to avoid build breakage. Change-Id: I953a2c4b8121bd4b66c3362557997a9ca3aa53b0 Signed-off-by: David Hendricks Reviewed-on: http://review.coreboot.org/2254 Reviewed-by: Ronald G. Minnich Tested-by: build bot (Jenkins) --- src/arch/armv7/bootblock_simple.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/arch/armv7/bootblock_simple.c') diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c index d97075e2f8..8df7e6a70d 100644 --- a/src/arch/armv7/bootblock_simple.c +++ b/src/arch/armv7/bootblock_simple.c @@ -20,9 +20,11 @@ */ #include -#include #include #include +#include + +#include "stages.c" static int boot_cpu(void) { @@ -34,7 +36,7 @@ static int boot_cpu(void) return 1; } -void main(unsigned long bist) +void main(void) { const char *target1 = "fallback/romstage"; unsigned long romstage_entry; @@ -49,6 +51,6 @@ void main(unsigned long bist) CBFS_DEFAULT_MEDIA, target1); printk(BIOS_INFO, "bootblock main(): jumping to romstage\n"); - if (romstage_entry) bootblock_exit(romstage_entry); + if (romstage_entry) stage_exit(romstage_entry); hlt(); } -- cgit v1.2.3