Disable CMOS recovery code for ROMCC boards as the CBFS code used for

that feature is not ROMCC compatible.
Fixes build errors introduced in r6253.

Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Acked-by: Patrick Georgi <patrick.georgi@secunet.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6255 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index aacc0982a6c01b8646ef9f12222a02f954ac4de3..3684c69e27b663698db6f4036e0657a8f06c1fc4 100644 (file)
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -91,8 +91,14 @@ config PC80_SYSTEM
 config BOOTBLOCK_NORTHBRIDGE_INIT
        string
 
+config USE_CMOS_RECOVERY
+       bool
+       default n if ROMCC
+       default y
+
 config HAVE_CMOS_DEFAULT
        def_bool n
+       depends on USE_CMOS_RECOVERY
 
 config CMOS_DEFAULT_FILE
        string

diff --git a/src/pc80/mc146818rtc_early.c b/src/pc80/mc146818rtc_early.c
index 10de0bc54f269d84c0a3f5f8b1816a03b4e5fb42..bb81ca7b657d4f1d0db70c60a0b379f07fc76e75 100644 (file)
--- a/src/pc80/mc146818rtc_early.c
+++ b/src/pc80/mc146818rtc_early.c
@@ -1,6 +1,5 @@
 #include <pc80/mc146818rtc.h>
 #include <fallback.h>
-#include <cbfs.h>
 #if CONFIG_USE_OPTION_TABLE
 #include "option_table.h"
 #endif
@@ -12,18 +11,20 @@
 #error "CONFIG_MAX_REBOOT_CNT too high"
 #endif
 
+#if CONFIG_USE_CMOS_RECOVERY
+#include <cbfs.h>
 #include <console/loglevel.h>
 
 int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 #define printk_warning(fmt, arg...) do_printk(BIOS_WARNING ,fmt, ##arg)
 #define printk_debug(fmt, arg...) do_printk(BIOS_DEBUG ,fmt, ##arg)
+#endif
 
 static int cmos_error(void)
 {
        unsigned char reg_d;
        /* See if the cmos error condition has been flagged */
        reg_d = cmos_read(RTC_REG_D);
-       printk_debug("CMOS_REG_D(VRT): %x\n", reg_d & RTC_VRT);
        return (reg_d & RTC_VRT) == 0;
 }
 
@@ -43,7 +44,6 @@ static int cmos_chksum_valid(void)
        old_sum = cmos_read(LB_CKS_LOC) << 8;
        old_sum |=  cmos_read(LB_CKS_LOC+1);
 
-       printk_debug("CMOS checksum: old = %lx, new=%lx\n", old_sum, sum);
        return sum == old_sum;
 #else
        return 0;
@@ -60,11 +60,12 @@ static inline int last_boot_normal(void)
 
 static inline int do_normal_boot(void)
 {
-       char *cmos_default = cbfs_find_file("cmos.default", 0xaa);
        unsigned char byte;
        int i;
 
        if (cmos_error() || !cmos_chksum_valid()) {
+#if CONFIG_USE_CMOS_RECOVERY
+               char *cmos_default = cbfs_find_file("cmos.default", 0xaa);
                if (cmos_default) {
                        printk_warning("WARNING - CMOS CORRUPTED. RESTORING DEFAULTS.\n");
                        /* First 14 bytes are reserved for
@@ -79,6 +80,7 @@ static inline int do_normal_boot(void)
                        outb(0x06, 0xcf9);
                        for (;;) asm("hlt"); /* Wait for reset! */
                }
+#endif
 
                /* There are no impossible values, no checksums so just
                 * trust whatever value we have in the the cmos,