[coreboot] [commit] r6255 - in trunk/src: arch/x86 pc80

[repository service]

Author: oxygene
Date: Fri Jan 14 09:36:34 2011
New Revision: 6255
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6255

Log:
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 at secunet.com>
Acked-by: Patrick Georgi <patrick.georgi at secunet.com>

Modified:
   trunk/src/arch/x86/Kconfig
   trunk/src/pc80/mc146818rtc_early.c

Modified: trunk/src/arch/x86/Kconfig
==============================================================================
--- trunk/src/arch/x86/Kconfig	Fri Jan 14 08:41:42 2011	(r6254)
+++ trunk/src/arch/x86/Kconfig	Fri Jan 14 09:36:34 2011	(r6255)
@@ -91,8 +91,14 @@
 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

Modified: trunk/src/pc80/mc146818rtc_early.c
==============================================================================
--- trunk/src/pc80/mc146818rtc_early.c	Fri Jan 14 08:41:42 2011	(r6254)
+++ trunk/src/pc80/mc146818rtc_early.c	Fri Jan 14 09:36:34 2011	(r6255)
@@ -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 @@
 	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 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 @@
 			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,