From cef3b896c1593de5a41b57bff4d4600d0c90e06e Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 18 Jan 2011 14:28:45 +0000 Subject: [PATCH] Report if cmos_layout.bin can't be found when it should. Signed-off-by: Patrick Georgi Acked-by: Patrick Georgi git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6269 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/x86/boot/coreboot_table.c | 2 ++ src/pc80/mc146818rtc.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/arch/x86/boot/coreboot_table.c b/src/arch/x86/boot/coreboot_table.c index 3dc8ea612b..dea030b60a 100644 --- a/src/arch/x86/boot/coreboot_table.c +++ b/src/arch/x86/boot/coreboot_table.c @@ -549,6 +549,8 @@ unsigned long write_coreboot_table( 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 diff --git a/src/pc80/mc146818rtc.c b/src/pc80/mc146818rtc.c index 32543f01c2..d9a3d481e9 100644 --- a/src/pc80/mc146818rtc.c +++ b/src/pc80/mc146818rtc.c @@ -228,6 +228,10 @@ int get_option(void *dest, const char *name) /* 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)) {