diff options
| author | David Hendricks <dhendrix@chromium.org> | 2013-01-21 20:02:15 -0800 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-01-22 06:12:39 +0100 |
| commit | 35934415c4d36e094f4c53f155cb9efa3aef977e (patch) | |
| tree | a18b960ab6e98a4c6c1073da957815c9857e0c5a /src/arch/armv7/bootblock_simple.c | |
| parent | f5726ea544af904061b754fb6e369e477e93f0a5 (diff) | |
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>
Diffstat (limited to 'src/arch/armv7/bootblock_simple.c')
| -rw-r--r-- | src/arch/armv7/bootblock_simple.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c index f6bcf980b1..af76d4c973 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 @@ static int boot_cpu(void) 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 @@ void main(unsigned long bist) } 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(); } |