diff options
| author | David Hendricks <dhendrix@chromium.org> | 2013-01-31 17:05:50 -0800 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-02-01 03:25:30 +0100 |
| commit | 50c0a50ac6a3fa54ed1286e8b76f933701b6d053 (patch) | |
| tree | 7db0043dc830d9c522639b7bb3b98c2529dcdc88 /src/arch/armv7/bootblock_simple.c | |
| parent | 79e36d90608a929c33b655c6fb6376f33f332e6f (diff) | |
| download | coreboot-50c0a50ac6a3fa54ed1286e8b76f933701b6d053.tar.xz | |
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 <dhendrix@chromium.org>
Reviewed-on: http://review.coreboot.org/2254
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/arch/armv7/bootblock_simple.c')
| -rw-r--r-- | src/arch/armv7/bootblock_simple.c | 8 |
1 files changed, 5 insertions, 3 deletions
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 <bootblock_common.h> -#include <arch/bootblock_exit.h> #include <arch/cbfs.h> #include <arch/hlt.h> +#include <arch/stages.h> + +#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(); } |