diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-03-17 13:20:02 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@google.com> | 2015-03-20 19:28:52 +0100 |
| commit | f5d7f605aba97451f3116cf6489c0e31b5554427 (patch) | |
| tree | 760c54276be0be592ef0456ccd874ed179402322 /src/arch/arm/armv7 | |
| parent | e4f3e7a9c656356a92e827d5a39b85106cbdaf3a (diff) | |
| download | coreboot-f5d7f605aba97451f3116cf6489c0e31b5554427.tar.xz | |
bootblocks: use run_romstage()
Instead of sprinkling the cbfs calls around (as well as getting
return values incorrect) use the common run_romstage() to perform
the necessary work to load and run romstage.
Change-Id: Id59f47febf5122cb3ee60f9741cfb58cb60ccab5
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8711
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/arch/arm/armv7')
| -rw-r--r-- | src/arch/arm/armv7/bootblock_simple.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/arch/arm/armv7/bootblock_simple.c b/src/arch/arm/armv7/bootblock_simple.c index 2fc000d746..96f2445f57 100644 --- a/src/arch/arm/armv7/bootblock_simple.c +++ b/src/arch/arm/armv7/bootblock_simple.c @@ -25,7 +25,7 @@ #include <bootblock_common.h> #include <cbfs.h> #include <console/console.h> -#include <halt.h> +#include <program_loading.h> #include <smp/node.h> __attribute__((weak)) void bootblock_soc_init(void) { /* do nothing */ } @@ -33,9 +33,6 @@ __attribute__((weak)) void bootblock_mainboard_init(void) { /* do nothing */ } void main(void) { - const char *stage_name = "fallback/romstage"; - void *entry; - bootblock_soc_init(); bootblock_mainboard_init(); @@ -44,8 +41,5 @@ void main(void) exception_init(); #endif - entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, stage_name); - - if (entry) stage_exit(entry); - halt(); + run_romstage(); } |