diff options
| -rw-r--r-- | src/cpu/x86/car/copy_and_run.c | 6 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-x86/rom.c | 20 |
2 files changed, 1 insertions, 25 deletions
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(); -} |