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

[repository service]

Author: oxygene
Date: Tue Jan 18 15:28:45 2011
New Revision: 6269
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6269

Log:
Report if cmos_layout.bin can't be found when it should.

Signed-off-by: Patrick Georgi <patrick.georgi at secunet.com>
Acked-by: Patrick Georgi <patrick.georgi at secunet.com>

Modified:
   trunk/src/arch/x86/boot/coreboot_table.c
   trunk/src/pc80/mc146818rtc.c

Modified: trunk/src/arch/x86/boot/coreboot_table.c
==============================================================================
--- trunk/src/arch/x86/boot/coreboot_table.c	Tue Jan 18 14:56:36 2011	(r6268)
+++ trunk/src/arch/x86/boot/coreboot_table.c	Tue Jan 18 15:28:45 2011	(r6269)
@@ -549,6 +549,8 @@
 			memcpy(rec_dest,  &option_table, option_table.size);
 			/* Create cmos checksum entry in coreboot table */
 			lb_cmos_checksum(head);
+		} else {
+			printk(BIOS_ERR, "cmos_layout.bin could not be found!\n");
 		}
 	}
 #endif

Modified: trunk/src/pc80/mc146818rtc.c
==============================================================================
--- trunk/src/pc80/mc146818rtc.c	Tue Jan 18 14:56:36 2011	(r6268)
+++ trunk/src/pc80/mc146818rtc.c	Tue Jan 18 15:28:45 2011	(r6269)
@@ -228,6 +228,10 @@
 
 	/* find the requested entry record */
 	ct=cbfs_find_file("cmos_layout.bin", CMOS_COMPONENT_CMOS_LAYOUT);
+	if (!ct) {
+		printk(BIOS_ERR, "cmos_layout.bin could not be found. Options are disabled\n");
+		return(-2);
+	}
 	ce=(struct cmos_entries*)((unsigned char *)ct + ct->header_length);
 	for(;ce->tag==LB_TAG_OPTION;
 		ce=(struct cmos_entries*)((unsigned char *)ce + ce->size)) {