aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/google/veyron
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-03-17 13:25:19 -0500
committerAaron Durbin <adurbin@google.com>2015-03-20 19:28:25 +0100
commite4f3e7a9c656356a92e827d5a39b85106cbdaf3a (patch)
tree885e9fefb1a8ea6802b6df56fdcadcd435c5f5cd /src/mainboard/google/veyron
parentd1b0e87179ca42eadbfb36191171e0e8552c1cbe (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/veyron')
-rw-r--r--src/mainboard/google/veyron/romstage.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mainboard/google/veyron/romstage.c b/src/mainboard/google/veyron/romstage.c
index b9daefe6b9..5b26f48e3c 100644
--- a/src/mainboard/google/veyron/romstage.c
+++ b/src/mainboard/google/veyron/romstage.c
@@ -21,17 +21,15 @@
#include <armv7.h>
#include <cbfs.h>
#include <console/console.h>
-#include <arch/stages.h>
#include <cbmem.h>
#include <delay.h>
+#include <program_loading.h>
#include <timestamp.h>
#include <arch/cache.h>
#include <arch/exception.h>
void main(void)
{
- void *entry;
-
console_init();
/* used for MMU and CBMEM setup, in MB */
@@ -54,6 +52,5 @@ void main(void)
cbmem_initialize_empty();
- entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage");
- stage_exit(entry);
+ run_ramstage();
}