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 <stepan@coresystems.de> Acked-by: Ronald G. Minnich <rminnich@gmai.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5313 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2010-03-29 17:14:28 +00:00
parent 002c9ff3e4
commit b5828d7445
70 changed files with 114 additions and 768 deletions
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -214,18 +214,6 @@ config XIP_ROM_SIZE
 	hex
 	default 0x20000

-config LB_CKS_RANGE_START
-	int
-	default 49
-
-config LB_CKS_RANGE_END
-	int
-	default 125
-
-config LB_CKS_LOC
-	int
-	default 126
-
 config LOGICAL_CPUS
 	bool
 	default y
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -59,9 +59,9 @@ $(obj)/option_table.h $(obj)/option_table.c: $(obj)/build_opt_tbl $(top)/src/mai
 	@printf "    OPTION     $(subst $(obj)/,,$(@))\n"
 	$(obj)/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --header $(obj)/option_table.h --option $(obj)/option_table.c

-$(obj)/build_opt_tbl: $(top)/util/options/build_opt_tbl.c $(top)/src/include/pc80/mc146818rtc.h $(top)/src/include/boot/coreboot_tables.h $(obj)/config.h
+$(obj)/build_opt_tbl: $(top)/util/options/build_opt_tbl.c $(top)/src/include/pc80/mc146818rtc.h $(top)/src/include/boot/coreboot_tables.h
 	@printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
-	$(HOSTCC) $(HOSTCFLAGS) -include $(obj)/config.h $< -o $@
+	$(HOSTCC) $(HOSTCFLAGS) $< -o $@

 #######################################################################
 # Build the coreboot_ram (stage 2)
--- a/src/arch/i386/boot/coreboot_table.c
+++ b/src/arch/i386/boot/coreboot_table.c
@@ -2,7 +2,7 @@
 * This file is part of the coreboot project.
 * 
 * Copyright (C) 2003-2004 Eric Biederman
- * Copyright (C) 2005-2009 coresystems GmbH
+ * Copyright (C) 2005-2010 coresystems GmbH
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
@@ -29,6 +29,9 @@
 #include <version.h>
 #include <device/device.h>
 #include <stdlib.h>
+#if (CONFIG_HAVE_OPTION_TABLE == 1)
+#include <pc80/mc146818rtc.h>
+#endif

 static struct lb_header *lb_table_init(unsigned long addr)
 {
@@ -196,9 +199,9 @@ static struct cmos_checksum *lb_cmos_checksum(struct lb_header *header)

 	cmos_checksum->size = (sizeof(*cmos_checksum));

-	cmos_checksum->range_start = CONFIG_LB_CKS_RANGE_START * 8;
-	cmos_checksum->range_end = ( CONFIG_LB_CKS_RANGE_END * 8 ) + 7;
-	cmos_checksum->location = CONFIG_LB_CKS_LOC * 8;
+	cmos_checksum->range_start = LB_CKS_RANGE_START * 8;
+	cmos_checksum->range_end = ( LB_CKS_RANGE_END * 8 ) + 7;
+	cmos_checksum->location = LB_CKS_LOC * 8;
 	cmos_checksum->type = CHECKSUM_PCBIOS;
 	
 	return cmos_checksum;
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -81,15 +81,9 @@
 #define PC_CKS_RANGE_END	45
 #define PC_CKS_LOC		46

-/* Linux bios checksum is built only over bytes 49..125 */
-#ifndef CONFIG_LB_CKS_RANGE_START
-#define CONFIG_LB_CKS_RANGE_START	49
-#endif
-#ifndef CONFIG_LB_CKS_RANGE_END
-#define CONFIG_LB_CKS_RANGE_END	125
-#endif
-#ifndef CONFIG_LB_CKS_LOC
-#define CONFIG_LB_CKS_LOC		126
+/* coreboot cmos checksum is usually only built over bytes 49..125 */
+#ifdef AUTOCONF_INCLUDED
+#include <option_table.h>
 #endif

 #if !defined(ASSEMBLY)
@@ -97,7 +91,8 @@ void rtc_init(int invalid);
 #if CONFIG_USE_OPTION_TABLE == 1
 int get_option(void *dest, const char *name);
 #else
-static inline int get_option(void *dest, const char *name) { return -2; }
+static inline int get_option(void *dest __attribute__((unused)),
+	const char *name __attribute__((unused))) { return -2; }
 #endif
 #endif

--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -30,4 +30,4 @@ obj-$(CONFIG_BOOTSPLASH) += jpeg.o

 smmobj-y += memcpy.o

-$(obj)/lib/version.o :: $(obj)/build.h
+$(obj)/lib/version.o : $(obj)/build.h
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/src/mainboard/amd/dbm690t/Kconfig
@@ -49,16 +49,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_AMD_DBM690T

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_AMD_DBM690T
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_AMD_DBM690T
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "DBM690T"
--- a/src/mainboard/amd/mahogany/Kconfig
+++ b/src/mainboard/amd/mahogany/Kconfig
@@ -51,16 +51,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_AMD_MAHOGANY

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_AMD_MAHOGANY
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_AMD_MAHOGANY
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "MAHOGANY"
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig
@@ -35,16 +35,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_AMD_MAHOGANY_FAM10

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_AMD_MAHOGANY_FAM10
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_AMD_MAHOGANY_FAM10
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "Mahogany (Fam10)"
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -43,16 +43,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_AMD_PISTACHIO

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_AMD_PISTACHIO
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_AMD_PISTACHIO
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "Pistachio"
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -46,16 +46,6 @@ config APIC_ID_OFFSET
 	default 0x8
 	depends on BOARD_AMD_SERENGETI_CHEETAH

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_AMD_SERENGETI_CHEETAH
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_AMD_SERENGETI_CHEETAH
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "Serengeti Cheetah"
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -33,16 +33,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "Serengeti Cheetah (Fam10)"
--- a/src/mainboard/arima/hdama/Kconfig
+++ b/src/mainboard/arima/hdama/Kconfig
@@ -35,16 +35,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_ARIMA_HDAMA

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_ARIMA_HDAMA
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_ARIMA_HDAMA
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "HDAMA"
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/src/mainboard/asus/a8n_e/Kconfig
@@ -49,16 +49,6 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	default n
 	depends on BOARD_ASUS_A8N_E

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_ASUS_A8N_E
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_ASUS_A8N_E
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "A8N-E"
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -49,16 +49,6 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	default n
 	depends on BOARD_ASUS_A8V_E_SE

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_ASUS_A8V_E_SE
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_ASUS_A8V_E_SE
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "A8V-E SE"
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -82,16 +82,6 @@ config HEAP_SIZE
 	default 0x40000
 	depends on BOARD_ASUS_M2V_MX_SE

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_ASUS_M2V_MX_SE
-
-config LB_CKS_LOC
-	int
-	default	123
-	depends	on BOARD_ASUS_M2V_MX_SE
-
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
--- a/src/mainboard/broadcom/blast/Kconfig
+++ b/src/mainboard/broadcom/blast/Kconfig
@@ -46,16 +46,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 1
 	depends on BOARD_BROADCOM_BLAST

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_BROADCOM_BLAST
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_BROADCOM_BLAST
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "Blast"
--- a/src/mainboard/dell/s1850/Kconfig
+++ b/src/mainboard/dell/s1850/Kconfig
@@ -20,16 +20,6 @@ config MAINBOARD_DIR
 	default dell/s1850
 	depends on BOARD_DELL_S1850

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_DELL_S1850
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_DELL_S1850
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "PowerEdge 1850"
--- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
@@ -50,21 +50,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_GIGABYTE_GA_2761GXDK

-config LB_CKS_RANGE_START
-	int
-	default 49
-	depends on BOARD_GIGABYTE_GA_2761GXDK
-
-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_GIGABYTE_GA_2761GXDK
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_GIGABYTE_GA_2761GXDK
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "GA-2761GXDK"
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -53,21 +53,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_GIGABYTE_M57SLI

-config LB_CKS_RANGE_START
-	int
-	default 49
-	depends on BOARD_GIGABYTE_M57SLI
-
-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_GIGABYTE_M57SLI
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_GIGABYTE_M57SLI
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "GA-M57SLI-S4"
--- a/src/mainboard/hp/dl145_g3/Kconfig
+++ b/src/mainboard/hp/dl145_g3/Kconfig
@@ -52,16 +52,6 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	default n
 	depends on BOARD_HP_DL145_G3

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_HP_DL145_G3
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_HP_DL145_G3
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "ProLiant DL145 G3"
--- a/src/mainboard/ibm/e325/Kconfig
+++ b/src/mainboard/ibm/e325/Kconfig
@@ -41,16 +41,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_IBM_E325

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_IBM_E325
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_IBM_E325
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "eServer 325"
--- a/src/mainboard/ibm/e326/Kconfig
+++ b/src/mainboard/ibm/e326/Kconfig
@@ -41,16 +41,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_IBM_E326

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_IBM_E326
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_IBM_E326
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "eServer 326"
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -61,16 +61,6 @@ config DCACHE_RAM_SIZE
 	default 0x8000
 	depends on BOARD_INTEL_D945GCLF

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_INTEL_D945GCLF
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_INTEL_D945GCLF
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "D945GCLF"
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/src/mainboard/intel/eagleheights/Kconfig
@@ -38,16 +38,6 @@ config DCACHE_RAM_SIZE
 	default 0x8000
 	depends on BOARD_INTEL_EAGLEHEIGHTS

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_INTEL_EAGLEHEIGHTS
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_INTEL_EAGLEHEIGHTS
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "EagleHeights"
--- a/src/mainboard/intel/jarrell/Kconfig
+++ b/src/mainboard/intel/jarrell/Kconfig
@@ -21,16 +21,6 @@ config MAINBOARD_DIR
 	default intel/jarrell
 	depends on BOARD_INTEL_JARRELL

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_INTEL_JARRELL
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_INTEL_JARRELL
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "Jarrell"
--- a/src/mainboard/intel/mtarvon/Kconfig
+++ b/src/mainboard/intel/mtarvon/Kconfig
@@ -17,16 +17,6 @@ config MAINBOARD_DIR
 	default intel/mtarvon
 	depends on BOARD_INTEL_MTARVON

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_INTEL_MTARVON
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_INTEL_MTARVON
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "3100 devkit (Mt. Arvon)"
--- a/src/mainboard/intel/truxton/Kconfig
+++ b/src/mainboard/intel/truxton/Kconfig
@@ -18,16 +18,6 @@ config MAINBOARD_DIR
 	default intel/truxton
 	depends on BOARD_INTEL_TRUXTON

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_INTEL_TRUXTON
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_INTEL_TRUXTON
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "Truxton"
--- a/src/mainboard/intel/xe7501devkit/Kconfig
+++ b/src/mainboard/intel/xe7501devkit/Kconfig
@@ -21,21 +21,6 @@ config MAINBOARD_DIR
 	default intel/xe7501devkit
 	depends on BOARD_INTEL_XE7501DEVKIT

-config LB_CKS_RANGE_START
-	int
-	default 128
-	depends on BOARD_INTEL_XE7501DEVKIT
-
-config LB_CKS_RANGE_END
-	int
-	default 130
-	depends on BOARD_INTEL_XE7501DEVKIT
-
-config LB_CKS_LOC
-	int
-	default 131
-	depends on BOARD_INTEL_XE7501DEVKIT
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "XE7501devkit"
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/src/mainboard/iwill/dk8_htx/Kconfig
@@ -45,16 +45,6 @@ config APIC_ID_OFFSET
 	default 0x10
 	depends on BOARD_IWILL_DK8_HTX

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_IWILL_DK8_HTX
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_IWILL_DK8_HTX
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "DK8-HTX"
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/src/mainboard/iwill/dk8s2/Kconfig
@@ -42,16 +42,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_IWILL_DK8S2

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_IWILL_DK8S2
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_IWILL_DK8S2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "DK8S2"
--- a/src/mainboard/iwill/dk8x/Kconfig
+++ b/src/mainboard/iwill/dk8x/Kconfig
@@ -41,16 +41,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_IWILL_DK8X

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_IWILL_DK8X
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_IWILL_DK8X
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "DK8X"
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -38,16 +38,6 @@ config DCACHE_RAM_SIZE
 	default 0x8000
 	depends on BOARD_KONTRON_986LCD_M

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_KONTRON_986LCD_M
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_KONTRON_986LCD_M
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "986LCD-M"
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -35,26 +35,11 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	default 0x6900
 	depends on BOARD_KONTRON_KT690

-config LB_CKS_RANGE_START
-	int
-	default 49
-	depends on BOARD_KONTRON_KT690
-
 config APIC_ID_OFFSET
 	hex
 	default 0x0
 	depends on BOARD_KONTRON_KT690

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_KONTRON_KT690
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_KONTRON_KT690
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "KT690/mITX"
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -34,16 +34,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_MSI_MS7135

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_MSI_MS7135
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_MSI_MS7135
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-7135"
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/src/mainboard/msi/ms7260/Kconfig
@@ -51,21 +51,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_MSI_MS7260

-config LB_CKS_RANGE_START
-	int
-	default 49
-	depends on BOARD_MSI_MS7260
-
-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_MSI_MS7260
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_MSI_MS7260
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-7260"
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/src/mainboard/msi/ms9185/Kconfig
@@ -47,16 +47,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_MSI_MS9185

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_MSI_MS9185
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_MSI_MS9185
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-9185"
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/src/mainboard/msi/ms9282/Kconfig
@@ -45,21 +45,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 1
 	depends on BOARD_MSI_MS9282

-config LB_CKS_RANGE_START
-	int
-	default 49
-	depends on BOARD_MSI_MS9282
-
-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_MSI_MS9282
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_MSI_MS9282
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-9282"
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -92,21 +92,6 @@ config USE_OPTION_TABLE
 	default n
 	depends on BOARD_MSI_MS9652_FAM10

-config LB_CKS_RANGE_START
-	int
-	default 49
-	depends on BOARD_MSI_MS9652_FAM10
-
-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_MSI_MS9652_FAM10
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_MSI_MS9652_FAM10
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-9652"
--- a/src/mainboard/newisys/khepri/Kconfig
+++ b/src/mainboard/newisys/khepri/Kconfig
@@ -45,16 +45,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 0
 	depends on BOARD_NEWISYS_KHEPRI

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_NEWISYS_KHEPRI
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_NEWISYS_KHEPRI
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "Khepri"
--- a/src/mainboard/nvidia/l1_2pvv/Kconfig
+++ b/src/mainboard/nvidia/l1_2pvv/Kconfig
@@ -51,21 +51,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_NVIDIA_L1_2PVV

-config LB_CKS_RANGE_START
-	int
-	default 49
-	depends on BOARD_NVIDIA_L1_2PVV
-
-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_NVIDIA_L1_2PVV
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_NVIDIA_L1_2PVV
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "l1_2pvv"
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -35,16 +35,6 @@ config DCACHE_RAM_SIZE
 	default 0x8000
 	depends on BOARD_RODA_RK886EX

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_RODA_RK886EX
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_RODA_RK886EX
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "RK886EX"
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -49,16 +49,6 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	default n
 	depends on BOARD_SUNW_ULTRA40

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_SUNW_ULTRA40
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_SUNW_ULTRA40
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "Ultra 40"
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -56,16 +56,6 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	default n
 	depends on BOARD_SUPERMICRO_H8DME

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_SUPERMICRO_H8DME
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_SUPERMICRO_H8DME
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "H8DME-2"
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/src/mainboard/supermicro/h8dmr/Kconfig
@@ -55,16 +55,6 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	default n
 	depends on BOARD_SUPERMICRO_H8DMR

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_SUPERMICRO_H8DMR
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_SUPERMICRO_H8DMR
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "H8DMR-i2"
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -73,16 +73,6 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	default n
 	depends on BOARD_SUPERMICRO_H8DMR_FAM10

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "H8DMR-i2 (Fam10)"
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -74,16 +74,6 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	default n
 	depends on BOARD_SUPERMICRO_H8QME_FAM10

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "H8QME-2+ (Fam10)"
--- a/src/mainboard/supermicro/x6dai_g/Kconfig
+++ b/src/mainboard/supermicro/x6dai_g/Kconfig
@@ -17,16 +17,6 @@ config MAINBOARD_DIR
 	default supermicro/x6dai_g
 	depends on BOARD_SUPERMICRO_X6DAI_G

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_SUPERMICRO_X6DAI_G
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_SUPERMICRO_X6DAI_G
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "X6DAi-G"
--- a/src/mainboard/supermicro/x6dhe_g/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g/Kconfig
@@ -19,16 +19,6 @@ config MAINBOARD_DIR
 	default supermicro/x6dhe_g
 	depends on BOARD_SUPERMICRO_X6DHE_G

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_SUPERMICRO_X6DHE_G
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_SUPERMICRO_X6DHE_G
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "X6DHE-G"
--- a/src/mainboard/supermicro/x6dhe_g2/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig
@@ -20,16 +20,6 @@ config MAINBOARD_DIR
 	default supermicro/x6dhe_g2
 	depends on BOARD_SUPERMICRO_X6DHE_G2

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_SUPERMICRO_X6DHE_G2
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_SUPERMICRO_X6DHE_G2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "X6DHE-G2"
--- a/src/mainboard/supermicro/x6dhr_ig/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig/Kconfig
@@ -19,16 +19,6 @@ config MAINBOARD_DIR
 	default supermicro/x6dhr_ig
 	depends on BOARD_SUPERMICRO_X6DHR_IG

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_SUPERMICRO_X6DHR_IG
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_SUPERMICRO_X6DHR_IG
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "X6DHR-iG"
--- a/src/mainboard/supermicro/x6dhr_ig2/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
@@ -19,16 +19,6 @@ config MAINBOARD_DIR
 	default supermicro/x6dhr_ig2
 	depends on BOARD_SUPERMICRO_X6DHR_IG2

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_SUPERMICRO_X6DHR_IG2
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_SUPERMICRO_X6DHR_IG2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "X6DHR-iG2"
--- a/src/mainboard/technexion/tim5690/Kconfig
+++ b/src/mainboard/technexion/tim5690/Kconfig
@@ -45,16 +45,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_TECHNEXION_TIM5690

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TECHNEXION_TIM5690
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_TECHNEXION_TIM5690
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "TIM-5690"
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/src/mainboard/technexion/tim8690/Kconfig
@@ -44,16 +44,6 @@ config APIC_ID_OFFSET
 	default 0x0
 	depends on BOARD_TECHNEXION_TIM8690

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TECHNEXION_TIM8690
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_TECHNEXION_TIM8690
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "TIM-8690"
--- a/src/mainboard/tyan/s2735/Kconfig
+++ b/src/mainboard/tyan/s2735/Kconfig
@@ -31,21 +31,6 @@ config DCACHE_RAM_SIZE
 	default 0x1000
 	depends on BOARD_TYAN_S2735
 	
-config LB_CKS_RANGE_START
-	int
-	default 49
-	depends on BOARD_TYAN_S2735
-
-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2735
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_TYAN_S2735
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2735"
--- a/src/mainboard/tyan/s2850/Kconfig
+++ b/src/mainboard/tyan/s2850/Kconfig
@@ -16,16 +16,6 @@ config MAINBOARD_DIR
 	default tyan/s2850
 	depends on BOARD_TYAN_S2850

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2850
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_TYAN_S2850
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2850"
--- a/src/mainboard/tyan/s2875/Kconfig
+++ b/src/mainboard/tyan/s2875/Kconfig
@@ -17,16 +17,6 @@ config MAINBOARD_DIR
 	default tyan/s2875
 	depends on BOARD_TYAN_S2875

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2875
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_TYAN_S2875
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2875"
--- a/src/mainboard/tyan/s2880/Kconfig
+++ b/src/mainboard/tyan/s2880/Kconfig
@@ -28,16 +28,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 0
 	depends on BOARD_TYAN_S2880

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2880
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_TYAN_S2880
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2880"
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -29,16 +29,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_TYAN_S2881

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2881
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_TYAN_S2881
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2881"
--- a/src/mainboard/tyan/s2882/Kconfig
+++ b/src/mainboard/tyan/s2882/Kconfig
@@ -28,16 +28,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 0
 	depends on BOARD_TYAN_S2882

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2882
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_TYAN_S2882
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2882"
--- a/src/mainboard/tyan/s2885/Kconfig
+++ b/src/mainboard/tyan/s2885/Kconfig
@@ -29,16 +29,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_TYAN_S2885

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2885
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_TYAN_S2885
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2885"
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -31,16 +31,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_TYAN_S2891

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2891
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_TYAN_S2891
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2891"
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -30,16 +30,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_TYAN_S2892

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2892
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_TYAN_S2892
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2892"
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -30,16 +30,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_TYAN_S2895

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2895
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_TYAN_S2895
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2895"
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -51,21 +51,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_TYAN_S2912

-config LB_CKS_RANGE_START
-	int
-	default 49
-	depends on BOARD_TYAN_S2912
-
-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2912
-
-config LB_CKS_LOC
-	int
-        default 123
-	depends on BOARD_TYAN_S2912
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2912"
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -53,21 +53,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_TYAN_S2912_FAM10

-config LB_CKS_RANGE_START
-	int
-	default 49
-	depends on BOARD_TYAN_S2912_FAM10
-
-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S2912_FAM10
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_TYAN_S2912_FAM10
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2912 (Fam10)"
--- a/src/mainboard/tyan/s4880/Kconfig
+++ b/src/mainboard/tyan/s4880/Kconfig
@@ -45,16 +45,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 0
 	depends on BOARD_TYAN_S4880

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S4880
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_TYAN_S4880
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S4880"
--- a/src/mainboard/tyan/s4882/Kconfig
+++ b/src/mainboard/tyan/s4882/Kconfig
@@ -45,16 +45,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 0
 	depends on BOARD_TYAN_S4882

-config LB_CKS_RANGE_END
-	int
-	default 122
-	depends on BOARD_TYAN_S4882
-
-config LB_CKS_LOC
-	int
-	default 123
-	depends on BOARD_TYAN_S4882
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S4882"
--- 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);
 }
--- 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;
 }