diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-03-28 09:31:47 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@google.com> | 2015-03-28 17:43:47 +0100 |
| commit | 8880df10fae2b399038ce7876d78b8aa9b0836fa (patch) | |
| tree | c3f85e0afe0d6cdeeb04827046b0e2347f91fcd2 | |
| parent | 910a00dc30c28a667e7064961107ff4483d739e1 (diff) | |
pistachio: don't open code ramstage loading
Use the run_ramstage() function to load and run ramstage.
Change-Id: I783801bf506fa2f9608eefe1cd20257292c80af5
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9148
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/mainboard/emulation/imgvp-pistachio/romstage.c | 13 | ||||
| -rw-r--r-- | src/soc/imgtec/pistachio/romstage.c | 14 |
2 files changed, 4 insertions, 23 deletions
diff --git a/src/mainboard/emulation/imgvp-pistachio/romstage.c b/src/mainboard/emulation/imgvp-pistachio/romstage.c index ac0ea5f903..3fcf23d461 100644 --- a/src/mainboard/emulation/imgvp-pistachio/romstage.c +++ b/src/mainboard/emulation/imgvp-pistachio/romstage.c @@ -19,20 +19,11 @@ * MA 02110-1301 USA */ -#include <arch/hlt.h> -#include <arch/stages.h> -#include <cbfs.h> +#include <program_loading.h> #include <console/console.h> void main(void) { - void *entry; - console_init(); - - entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage"); - if (entry != (void *)-1) - stage_exit(entry); - - hlt(); + run_ramstage(); } diff --git a/src/soc/imgtec/pistachio/romstage.c b/src/soc/imgtec/pistachio/romstage.c index 53ca898fed..3fcf23d461 100644 --- a/src/soc/imgtec/pistachio/romstage.c +++ b/src/soc/imgtec/pistachio/romstage.c @@ -19,21 +19,11 @@ * MA 02110-1301 USA */ -#include <arch/hlt.h> -#include <arch/stages.h> -#include <cbfs.h> +#include <program_loading.h> #include <console/console.h> void main(void) { - void *entry; - console_init(); - - entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, - CONFIG_CBFS_PREFIX "/ramstage"); - if (entry != (void *)-1) - stage_exit(entry); - - hlt(); + run_ramstage(); } |