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

Fix compilation for mtarvon. CAR initialization does early_mtrr_init, 

jarell/debug.c isn't ready for gcc, and skip_romstage() doesn't compile.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5767 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Myles Watson 2010-09-02 22:02:53 +00:00
parent dfe8d766fb
commit 8377c2d4bf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mainboard/intel/mtarvon/romstage.c
View File

@ -33,7 +33,6 @@
#include "southbridge/intel/i3100/i3100_early_lpc.c" #include "southbridge/intel/i3100/i3100_early_lpc.c"
#include "northbridge/intel/i3100/raminit.h" #include "northbridge/intel/i3100/raminit.h"
#include "superio/intel/i3100/i3100.h" #include "superio/intel/i3100/i3100.h"
#include "cpu/x86/lapic/boot_cpu.c"
#include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/mtrr/earlymtrr.c"
#include "superio/intel/i3100/i3100_early_serial.c" #include "superio/intel/i3100/i3100_early_serial.c"
#include "northbridge/intel/i3100/memory_initialized.c" #include "northbridge/intel/i3100/memory_initialized.c"
@ -52,10 +51,11 @@ static inline int spd_read_byte(u16 device, u8 address)
#include "northbridge/intel/i3100/raminit.c" #include "northbridge/intel/i3100/raminit.c"
#include "lib/generic_sdram.c" #include "lib/generic_sdram.c"
#include "../jarrell/debug.c" #if 0 /* skip_romstage doesn't compile with gcc */
#include "arch/i386/lib/stages.c" #include "arch/i386/lib/stages.c"
#endif
static void main(unsigned long bist) void main(unsigned long bist)
{ {
msr_t msr; msr_t msr;
u16 perf; u16 perf;
@ -72,11 +72,12 @@ static void main(unsigned long bist)
}; };
if (bist == 0) { if (bist == 0) {
#if 0 /* skip_romstage doesn't compile with gcc */
/* Skip this if there was a built in self test failure */ /* Skip this if there was a built in self test failure */
early_mtrr_init();
if (memory_initialized()) { if (memory_initialized()) {
skip_romstage(); skip_romstage();
} }
#endif
} }
/* Set up the console */ /* Set up the console */
i3100_enable_superio(); i3100_enable_superio();