GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Patrick Georgi 2010-02-10 19:40:10 +00:00
parent 1a47b5e5dc
commit 9a432abf17
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpu/x86/car/copy_and_run.c
View File

@ -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);
}

20
src/mainboard/emulation/qemu-x86/rom.c
View File

@ -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();
}