From 9a432abf17a0b4152e6190624f2adfdd7cbfc444 Mon Sep 17 00:00:00 2001
From: Patrick Georgi <patrick.georgi@coresystems.de>
Date: Wed, 10 Feb 2010 19:40:10 +0000
Subject: [PATCH] Forgot a CBFS_PREFIX change in appropriate commit (r5102).
 Also, delete duplicate romstage file in qemu-x86

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5111 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/cpu/x86/car/copy_and_run.c         |  6 +-----
 src/mainboard/emulation/qemu-x86/rom.c | 20 --------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 src/mainboard/emulation/qemu-x86/rom.c

diff --git a/src/cpu/x86/car/copy_and_run.c b/src/cpu/x86/car/copy_and_run.c
index 7257c4f6bc..1c109a3c7d 100644
--- a/src/cpu/x86/car/copy_and_run.c
+++ b/src/cpu/x86/car/copy_and_run.c
@@ -9,9 +9,5 @@ static void copy_and_run(unsigned cpu_reset)
 	if (cpu_reset == 1) cpu_reset = -1;
 	else cpu_reset = 0;
 
-#if CONFIG_USE_FALLBACK_IMAGE == 1
-	cbfs_and_run_core("fallback/coreboot_ram", cpu_reset);
-#else
-	cbfs_and_run_core("normal/coreboot_ram", cpu_reset);
-#endif
+	cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram", cpu_reset);
 }
diff --git a/src/mainboard/emulation/qemu-x86/rom.c b/src/mainboard/emulation/qemu-x86/rom.c
deleted file mode 100644
index de1b162fd4..0000000000
--- a/src/mainboard/emulation/qemu-x86/rom.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include <device/pnp_def.h>
-#include <arch/hlt.h>
-#include <console/console.h>
-#include <cbfs.h>
-
-void main(void)
-{
-	int i;
-	void uart_init(void);
-	void (*start_address)();
-	outb(5, 0x80);
-	
-	uart_init();
-	start_address = cbfs_load_stage("fallback/coreboot_ram");
-	start_address();
-}