diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-03-17 13:25:19 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@google.com> | 2015-03-20 19:28:25 +0100 |
| commit | e4f3e7a9c656356a92e827d5a39b85106cbdaf3a (patch) | |
| tree | 885e9fefb1a8ea6802b6df56fdcadcd435c5f5cd /src/mainboard/google/nyan | |
| parent | d1b0e87179ca42eadbfb36191171e0e8552c1cbe (diff) | |
romstages: use common run_ramstage()
Instead of sprinkling the cbfs calls around (as well as getting
return values incorrect) use the common run_ramstage() to perform
the necessary work to load and run ramstage.
Change-Id: I37b1e94be36ef7a43efe65b2db110742fa105169
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8710
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard/google/nyan')
| -rw-r--r-- | src/mainboard/google/nyan/romstage.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c index a71f68269b..914c925d5d 100644 --- a/src/mainboard/google/nyan/romstage.c +++ b/src/mainboard/google/nyan/romstage.c @@ -21,11 +21,11 @@ #include <arch/cpu.h> #include <arch/exception.h> #include <arch/io.h> -#include <arch/stages.h> #include <cbfs.h> #include <cbmem.h> #include <console/console.h> #include <mainboard/google/nyan/reset.h> +#include <program_loading.h> #include <romstage_handoff.h> #include <vendorcode/google/chromeos/chromeos.h> #include "sdram_configs.h" @@ -201,12 +201,7 @@ static void __attribute__((noinline)) romstage(void) vboot_verify_firmware(romstage_handoff_find_or_add()); - timestamp_add_now(TS_START_COPYRAM); - void *entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, - "fallback/coreboot_ram"); - timestamp_add_now(TS_END_COPYRAM); - - stage_exit(entry); + run_ramstage(); } /* Stub to force arm_init_caches to the top, before any stack/memory accesses */ |