2 files changed, 4 insertions, 16 deletions
diff --git a/src/mainboard/emulation/qemu-armv7/romstage.c b/src/mainboard/emulation/qemu-armv7/romstage.c
index 00dfecd431..b6314ccd1c 100644
--- a/src/mainboard/emulation/qemu-armv7/romstage.c
+++ b/src/mainboard/emulation/qemu-armv7/romstage.c
@@ -13,17 +13,11 @@
  * GNU General Public License for more details.
  */
 
-#include <cbfs.h>
 #include <console/console.h>
-#include <arch/stages.h>
+#include <program_loading.h>
 
 void main(void)
 {
-        void *entry;
-
 	console_init();
-
-	entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage");
-
-	stage_exit(entry);
+	run_ramstage();
 }
diff --git a/src/mainboard/emulation/qemu-riscv/romstage.c b/src/mainboard/emulation/qemu-riscv/romstage.c
index f4b44f614c..b6314ccd1c 100644
--- a/src/mainboard/emulation/qemu-riscv/romstage.c
+++ b/src/mainboard/emulation/qemu-riscv/romstage.c
@@ -13,17 +13,11 @@
  * GNU General Public License for more details.
  */
 
-#include <cbfs.h>
 #include <console/console.h>
-#include <arch/stages.h>
+#include <program_loading.h>
 
 void main(void)
 {
-        void *entry;
-
 	console_init();
-
-	entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, CONFIG_CBFS_PREFIX"/ramstage");
-
-	stage_exit(entry);
+	run_ramstage();
 }