[commit] r5764 - in trunk/src: include/pc80 mainboard/amd/dbm690t pc80

[repository service]

Author: myles
Date: Thu Sep  2 20:29:31 2010
New Revision: 5764
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5764

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

Signed-off-by: Myles Watson 
Acked-by: Myles Watson

Modified:
   trunk/src/include/pc80/mc146818rtc.h
   trunk/src/mainboard/amd/dbm690t/Kconfig
   trunk/src/pc80/Makefile.inc
   trunk/src/pc80/mc146818rtc.c
   trunk/src/pc80/mc146818rtc_early.c

Modified: trunk/src/include/pc80/mc146818rtc.h
==============================================================================
--- trunk/src/include/pc80/mc146818rtc.h	Wed Sep  1 23:03:03 2010	(r5763)
+++ trunk/src/include/pc80/mc146818rtc.h	Thu Sep  2 20:29:31 2010	(r5764)
@@ -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)

Modified: trunk/src/mainboard/amd/dbm690t/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/Kconfig	Wed Sep  1 23:03:03 2010	(r5763)
+++ trunk/src/mainboard/amd/dbm690t/Kconfig	Thu Sep  2 20:29:31 2010	(r5764)
@@ -25,6 +25,12 @@
    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

Modified: trunk/src/pc80/Makefile.inc
==============================================================================
--- trunk/src/pc80/Makefile.inc	Wed Sep  1 23:03:03 2010	(r5763)
+++ trunk/src/pc80/Makefile.inc	Thu Sep  2 20:29:31 2010	(r5764)
@@ -8,4 +8,3 @@
 subdirs-y += vga

$(obj)/pc80/mc146818rtc.o : $(OPTION_TABLE_H)
-$(obj)/pc80/mc146818rtc_early.initobj.o : $(OPTION_TABLE_H)

Modified: trunk/src/pc80/mc146818rtc.c
==============================================================================
--- trunk/src/pc80/mc146818rtc.c	Wed Sep  1 23:03:03 2010	(r5763)
+++ trunk/src/pc80/mc146818rtc.c	Thu Sep  2 20:29:31 2010	(r5764)
@@ -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
  */

Modified: trunk/src/pc80/mc146818rtc_early.c
==============================================================================
--- trunk/src/pc80/mc146818rtc_early.c	Wed Sep  1 23:03:03 2010	(r5763)
+++ trunk/src/pc80/mc146818rtc_early.c	Thu Sep  2 20:29:31 2010	(r5764)
@@ -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