commit 8e726b7363365459ab07b6f68e579b15a3ea8693
author Stefan Reinauer <stepan@coresystems.de> Mon Mar 29 23:01:35 2010 +0000
committer Stefan Reinauer <stepan@openbios.org> Mon Mar 29 23:01:35 2010 +0000
tree 19a317cad1f08f75e1f3a7284c9e5afbf8bf23d7
parent 798ef2893c44ce3194c539c8c5db33d11e8edbac

Don't include option_table.h every time we include mc146818rtc.h, that was a
stupid idea. Instead include it where it is needed. And add some explicit
dependencies to it.

Also, error for missing IRQ_SLOT_COUNT for now, so we can fix up the boards.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



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

src/pc80/mc146818rtc_early.c

diff --git a/src/pc80/mc146818rtc_early.c b/src/pc80/mc146818rtc_early.c
index 7a14921..87fc3f0 100644
--- a/src/pc80/mc146818rtc_early.c
+++ b/src/pc80/mc146818rtc_early.c
@@ -1,5 +1,8 @@
 #include <pc80/mc146818rtc.h>
 #include <fallback.h>
+#if CONFIG_HAVE_OPTION_TABLE
+#include <option_table.h>
+#endif
 
 #ifndef CONFIG_MAX_REBOOT_CNT
 #error "CONFIG_MAX_REBOOT_CNT not defined"
@@ -40,6 +43,7 @@
 
 static int cmos_chksum_valid(void)
 {
+#if CONFIG_HAVE_OPTION_TABLE == 1
 	unsigned char addr;
 	unsigned long sum, old_sum;
 	sum = 0;
@@ -54,6 +58,9 @@
 	old_sum |=  cmos_read(LB_CKS_LOC+1);
 
 	return sum == old_sum;
+#else
+	return 0;
+#endif
 }