diff options
author | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-02-10 19:40:10 +0000 |
---|---|---|
committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-02-10 19:40:10 +0000 |
commit | 9a432abf17a0b4152e6190624f2adfdd7cbfc444 (patch) | |
tree | 17741b12e3ea734c060491743d7d88e6d8424616 /src | |
parent | 1a47b5e5dceaa9bc1d63b48daafdc7f25e8c0835 (diff) |
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
Diffstat (limited to 'src')
-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(); -} |