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();
 }