[coreboot] [commit] r5111 - in trunk/src: cpu/x86/car mainboard/emulation/qemu-x86

[repository service]

Author: oxygene
Date: Wed Feb 10 20:40:10 2010
New Revision: 5111
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5111

Log:
Forgot a CBFS_PREFIX change in appropriate commit (r5102).
Also, delete duplicate romstage file in qemu-x86

Signed-off-by: Patrick Georgi 
Acked-by: Patrick Georgi

Deleted:
   trunk/src/mainboard/emulation/qemu-x86/rom.c
Modified:
   trunk/src/cpu/x86/car/copy_and_run.c

Modified: trunk/src/cpu/x86/car/copy_and_run.c
==============================================================================
--- trunk/src/cpu/x86/car/copy_and_run.c	Wed Feb 10 19:53:40 2010	(r5110)
+++ trunk/src/cpu/x86/car/copy_and_run.c	Wed Feb 10 20:40:10 2010	(r5111)
@@ -9,9 +9,5 @@
    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);
 }