diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2013-02-04 14:38:03 +0800 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-02-07 06:10:09 +0100 |
| commit | 5f83f6cb7a3f179482db54aaff38f23795dc1acf (patch) | |
| tree | bd94e259d2ae6fab8e4b993d04215b0964d8bf5f /src/arch/armv7/bootblock_simple.c | |
| parent | c720d8d5d419d8e9128392cd7ab90e3a3fca1d4b (diff) | |
armv7: Clean up arm/snow bootblock build process.
Remove duplicated / testing code and share more driver for bootblock, romstage
and ramstage.
The __PRE_RAM__ is now also defined in bootblock build stage, since bootblock is
executed before RAM is initialized.
Change-Id: I4f5469b1545631eee1cf9f2f5df93cbe3a58268b
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: http://review.coreboot.org/2282
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c index e808edcd35..fe2662e022 100644 --- a/src/arch/armv7/bootblock_simple.c +++ b/src/arch/armv7/bootblock_simple.c @@ -38,19 +38,19 @@ static int boot_cpu(void) void main(void) { - const char *target1 = "fallback/romstage"; - unsigned long romstage_entry; + const char *stage_name = "fallback/romstage"; + void *entry; if (boot_cpu()) { bootblock_cpu_init(); bootblock_mainboard_init(); } + printk(BIOS_INFO, "hello from bootblock\n"); printk(BIOS_INFO, "bootblock main(): loading romstage\n"); - romstage_entry = (unsigned long)cbfs_load_stage( - CBFS_DEFAULT_MEDIA, target1); + entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, stage_name); printk(BIOS_INFO, "bootblock main(): jumping to romstage\n"); - if (romstage_entry) stage_exit(romstage_entry); + if (entry) stage_exit(entry); hlt(); } |