Revert 5762. It silently broke a lot of boards because abuild was broken.

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


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5764 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

5 files changed, 14 insertions, 8 deletions

diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h
index 032e3858bf..0abb2a6b4b 100644
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -81,6 +81,14 @@
 #define PC_CKS_RANGE_END	45
 #define PC_CKS_LOC		46
 
+/* coreboot cmos checksum is usually only built over bytes 49..125
+ * LB_CKS_RANGE_START, LB_CKS_RANGE_END and LB_CKS_LOC are defined
+ * in option_table.h
+ */
+#if CONFIG_HAVE_OPTION_TABLE
+#include <option_table.h>
+#endif
+
 #ifndef UTIL_BUILD_OPTION_TABLE
 #include <arch/io.h>
 static inline unsigned char cmos_read(unsigned char addr)
diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig
index f9d61072f9..224a0be890 100644
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/src/mainboard/amd/dbm690t/Kconfig
@@ -25,6 +25,12 @@ config MAINBOARD_DIR
 	string
 	default amd/dbm690t
 
+# This is a temporary fix, and should be removed when the race condition for
+# building option_table.h is fixed.
+config WARNINGS_ARE_ERRORS
+	bool
+	default n
+
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
diff --git a/src/pc80/Makefile.inc b/src/pc80/Makefile.inc
index fe7e8e8750..b7890f56b6 100644
--- a/src/pc80/Makefile.inc
+++ b/src/pc80/Makefile.inc
@@ -8,4 +8,3 @@ initobj-$(CONFIG_CACHE_AS_RAM) += serial.o
 subdirs-y += vga
 
 $(obj)/pc80/mc146818rtc.o : $(OPTION_TABLE_H)
-$(obj)/pc80/mc146818rtc_early.initobj.o : $(OPTION_TABLE_H)
diff --git a/src/pc80/mc146818rtc.c b/src/pc80/mc146818rtc.c
index d32b862317..23b834c06a 100644
--- a/src/pc80/mc146818rtc.c
+++ b/src/pc80/mc146818rtc.c
@@ -2,9 +2,6 @@
 #include <pc80/mc146818rtc.h>
 #include <boot/coreboot_tables.h>
 #include <string.h>
-#if CONFIG_USE_OPTION_TABLE
-#include <option_table.h>
-#endif
 
 /* control registers - Moto names
  */
diff --git a/src/pc80/mc146818rtc_early.c b/src/pc80/mc146818rtc_early.c
index 9ffb440d1a..ed1f0926f0 100644
--- a/src/pc80/mc146818rtc_early.c
+++ b/src/pc80/mc146818rtc_early.c
@@ -1,10 +1,6 @@
 #include <pc80/mc146818rtc.h>
 #include <fallback.h>
 
-#if CONFIG_USE_OPTION_TABLE
-#include <option_table.h>
-#endif
-
 #ifndef CONFIG_MAX_REBOOT_CNT
 #error "CONFIG_MAX_REBOOT_CNT not defined"
 #endif