Aaron Durbin (adurbin@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9148
-gerrit
commit 34fba4a78e142914f00901791cb201f511fb689e Author: Aaron Durbin adurbin@chromium.org Date: Sat Mar 28 09:31:47 2015 -0500
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 --- src/mainboard/emulation/imgvp-pistachio/romstage.c | 13 ++----------- 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 ac0ea5f..3fcf23d 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 53ca898..3fcf23d 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(); }