From e4f3e7a9c656356a92e827d5a39b85106cbdaf3a Mon Sep 17 00:00:00 2001
From: Aaron Durbin <adurbin@chromium.org>
Date: Tue, 17 Mar 2015 13:25:19 -0500
Subject: 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>
---
 src/mainboard/google/veyron/romstage.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/mainboard/google/veyron')

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();
 }
-- 
cgit v1.2.3