diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-03-29 23:01:35 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-03-29 23:01:35 +0000 |
| commit | 8e726b7363365459ab07b6f68e579b15a3ea8693 (patch) | |
| tree | 19a317cad1f08f75e1f3a7284c9e5afbf8bf23d7 /src/pc80 | |
| parent | 798ef2893c44ce3194c539c8c5db33d11e8edbac (diff) | |
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
Diffstat (limited to 'src/pc80')
| -rw-r--r-- | src/pc80/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/pc80/mc146818rtc.c | 5 | ||||
| -rw-r--r-- | src/pc80/mc146818rtc_early.c | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/pc80/Makefile.inc b/src/pc80/Makefile.inc index c7c0cd5d0a..43190fd071 100644 --- a/src/pc80/Makefile.inc +++ b/src/pc80/Makefile.inc @@ -6,3 +6,5 @@ obj-y += keyboard.o #initobj-y += serial.o subdirs-y += vga + +$(obj)/pc80/mc146818rtc.o : $(OPTION_TABLE_H) diff --git a/src/pc80/mc146818rtc.c b/src/pc80/mc146818rtc.c index 1b39db21d1..4bee1cdffe 100644 --- a/src/pc80/mc146818rtc.c +++ b/src/pc80/mc146818rtc.c @@ -3,6 +3,9 @@ #include <pc80/mc146818rtc.h> #include <boot/coreboot_tables.h> #include <string.h> +#if CONFIG_HAVE_OPTION_TABLE +#include <option_table.h> +#endif /* control registers - Moto names */ @@ -257,7 +260,7 @@ int get_option(void *dest, const char *name) } } if(!found) { - printk(BIOS_DEBUG, "WARNING: No cmos option '%s'\n", name); + printk(BIOS_DEBUG, "WARNING: No CMOS option '%s'.\n", name); return(-2); } diff --git a/src/pc80/mc146818rtc_early.c b/src/pc80/mc146818rtc_early.c index 7a1492102a..87fc3f0a61 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_error(void) 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 @@ static int cmos_chksum_valid(void) old_sum |= cmos_read(LB_CKS_LOC+1); return sum == old_sum; +#else + return 0; +#endif } |