From b5828d74455a91553d78ef3077936693ae36213f Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 29 Mar 2010 17:14:28 +0000 Subject: This patch drops the coreboot CMOS checksum ranges from Kconfig because the information is already specified in cmos.layout. coreboot is changed to use that version instead. Signed-off-by: Stefan Reinauer Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5313 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/pc80/mc146818rtc.c | 8 ++++---- src/pc80/mc146818rtc_early.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/pc80') diff --git a/src/pc80/mc146818rtc.c b/src/pc80/mc146818rtc.c index 9251f7924d..1b39db21d1 100644 --- a/src/pc80/mc146818rtc.c +++ b/src/pc80/mc146818rtc.c @@ -185,8 +185,8 @@ void rtc_init(int invalid) #if CONFIG_HAVE_OPTION_TABLE /* See if there is a LB CMOS checksum error */ - checksum_invalid = !rtc_checksum_valid(CONFIG_LB_CKS_RANGE_START, - CONFIG_LB_CKS_RANGE_END,CONFIG_LB_CKS_LOC); + checksum_invalid = !rtc_checksum_valid(LB_CKS_RANGE_START, + LB_CKS_RANGE_END,LB_CKS_LOC); if(checksum_invalid) printk(BIOS_DEBUG, "Invalid CMOS LB checksum\n"); @@ -263,8 +263,8 @@ int get_option(void *dest, const char *name) if(get_cmos_value(ce->bit, ce->length, dest)) return(-3); - if(!rtc_checksum_valid(CONFIG_LB_CKS_RANGE_START, - CONFIG_LB_CKS_RANGE_END,CONFIG_LB_CKS_LOC)) + if(!rtc_checksum_valid(LB_CKS_RANGE_START, + LB_CKS_RANGE_END,LB_CKS_LOC)) return(-4); return(0); } diff --git a/src/pc80/mc146818rtc_early.c b/src/pc80/mc146818rtc_early.c index ad5a4dc638..7a1492102a 100644 --- a/src/pc80/mc146818rtc_early.c +++ b/src/pc80/mc146818rtc_early.c @@ -44,14 +44,14 @@ static int cmos_chksum_valid(void) unsigned long sum, old_sum; sum = 0; /* Comput the cmos checksum */ - for(addr = CONFIG_LB_CKS_RANGE_START; addr <= CONFIG_LB_CKS_RANGE_END; addr++) { + for(addr = LB_CKS_RANGE_START; addr <= LB_CKS_RANGE_END; addr++) { sum += cmos_read(addr); } sum = (sum & 0xffff) ^ 0xffff; /* Read the stored checksum */ - old_sum = cmos_read(CONFIG_LB_CKS_LOC) << 8; - old_sum |= cmos_read(CONFIG_LB_CKS_LOC+1); + old_sum = cmos_read(LB_CKS_LOC) << 8; + old_sum |= cmos_read(LB_CKS_LOC+1); return sum == old_sum; } -- cgit v1.2.3