[coreboot] [commit] r5138 - in trunk/src: mainboard/amd/serengeti_cheetah_fam10 mainboard/intel/d945gclf mainboard/kontron/986lcd-m mainboard/roda/rk886ex southbridge/intel/i82801gx

[repository service]

Author: stepan
Date: Mon Feb 22 10:15:13 2010
New Revision: 5138
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5138

Log:
fix builds...
Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>

Modified:
   trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
   trunk/src/mainboard/intel/d945gclf/romstage.c
   trunk/src/mainboard/kontron/986lcd-m/Kconfig
   trunk/src/mainboard/roda/rk886ex/romstage.c
   trunk/src/southbridge/intel/i82801gx/Kconfig

Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c	Mon Feb 22 08:28:06 2010	(r5137)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c	Mon Feb 22 10:15:13 2010	(r5138)
@@ -74,9 +74,11 @@
 #include "northbridge/amd/amdfam10/reset_test.c"
 
 #include <console/loglevel.h>
+#if 0
 void die(const char *msg);
 int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 #define printk_emerg(fmt, arg...)   do_printk(BIOS_EMERG   ,fmt, ##arg)
+#endif
 #include "cpu/x86/bist.h"
 
 

Modified: trunk/src/mainboard/intel/d945gclf/romstage.c
==============================================================================
--- trunk/src/mainboard/intel/d945gclf/romstage.c	Mon Feb 22 08:28:06 2010	(r5137)
+++ trunk/src/mainboard/intel/d945gclf/romstage.c	Mon Feb 22 10:15:13 2010	(r5138)
@@ -37,6 +37,7 @@
 #include "option_table.h"
 #include "pc80/mc146818rtc_early.c"
 
+#include <console/console.h>
 #include "pc80/serial.c"
 #include "arch/i386/lib/console.c"
 #include <cpu/x86/bist.h>

Modified: trunk/src/mainboard/kontron/986lcd-m/Kconfig
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/Kconfig	Mon Feb 22 08:28:06 2010	(r5137)
+++ trunk/src/mainboard/kontron/986lcd-m/Kconfig	Mon Feb 22 10:15:13 2010	(r5138)
@@ -10,7 +10,6 @@
 	select GENERATE_PIRQ_TABLE
 	select GENERATE_MP_TABLE
 	select HAVE_ACPI_RESUME
-	select HAVE_HARD_RESET
 	select HAVE_MAINBOARD_RESOURCES
 	select MMCONF_SUPPORT
 	select USE_PRINTK_IN_CAR

Modified: trunk/src/mainboard/roda/rk886ex/romstage.c
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/romstage.c	Mon Feb 22 08:28:06 2010	(r5137)
+++ trunk/src/mainboard/roda/rk886ex/romstage.c	Mon Feb 22 10:15:13 2010	(r5138)
@@ -39,6 +39,7 @@
 #include "option_table.h"
 #include "pc80/mc146818rtc_early.c"
 
+#include <console/console.h>
 #include "pc80/serial.c"
 #include "arch/i386/lib/console.c"
 #include <cpu/x86/bist.h>

Modified: trunk/src/southbridge/intel/i82801gx/Kconfig
==============================================================================
--- trunk/src/southbridge/intel/i82801gx/Kconfig	Mon Feb 22 08:28:06 2010	(r5137)
+++ trunk/src/southbridge/intel/i82801gx/Kconfig	Mon Feb 22 10:15:13 2010	(r5138)
@@ -20,5 +20,6 @@
 config SOUTHBRIDGE_INTEL_I82801GX
 	bool
 	select IOAPIC
+	select HAVE_HARD_RESET
 	select USE_WATCHDOG_ON_BOOT