On Wed, Dec 17, 2008 at 1:11 AM, Corey Osgood <[email protected]>wrote:
> It's incredibly annoying to have to reset the BIOS options after every > coreboot test run, so I've "fixed" the problem with errors when building > with OPTION_TABLE deselected, but I'm not exactly 100% sure it's the right > fix. I'd REALLY appreciate it if someone checks ;) Also, I've removed > "select OPTION_TABLE" from all the mainboard Kconfigs (the new option > defaults to y), but I'm not sure if there are any chipsets where the option > table is absolutely required. Oops, OPTION_TABLE already had an entry with a help. Remove that, and use that help since it was way better then mine. IMO, this is where OPTION_TABLE belongs, perhaps with "depends EXPERT". -Corey
Move OPTION_TABLE to a menu config option, and default it to enabled. This allows a user/developer to disable the option table, so it doesn't overwrite whatever the factory BIOS has written. Also fix building with OPTION_TABLE disabled. Signed-off-by: Corey Osgood <[email protected]> Index: arch/x86/mc146818rtc.c =================================================================== --- arch/x86/mc146818rtc.c (revision 1076) +++ arch/x86/mc146818rtc.c (working copy) @@ -196,6 +196,7 @@ int get_option(void *dest, char *name) { +#if CONFIG_OPTION_TABLE // struct cmos_option_table *option_table; struct cmos_option_table *ct; struct cmos_entries *ce; @@ -224,7 +225,6 @@ if(!rtc_checksum_valid(CB_CKS_RANGE_START, CB_CKS_RANGE_END,CB_CKS_LOC)) return(-4); -#ifdef CONFIG_OPTION_TABLE return(0); #else return -2; Index: Kconfig =================================================================== --- Kconfig (revision 1076) +++ Kconfig (working copy) @@ -53,6 +53,14 @@ help Append an extra string to the end of the coreboot version. +config OPTION_TABLE + bool "CMOS Option Table" + default y + help + This option is used to determine whether the mainboard has + a battery backed up real time clock with CMOS NVRAM, or if you want + to use it. + config BEEPS bool "Enable beeps upon certain coreboot events" depends EXPERT Index: mainboard/adl/Kconfig =================================================================== --- mainboard/adl/Kconfig (revision 1076) +++ mainboard/adl/Kconfig (working copy) @@ -27,7 +27,6 @@ bool "MSM800SEV" select ARCH_X86 select CPU_AMD_GEODELX - select OPTION_TABLE select NORTHBRIDGE_AMD_GEODELX select SOUTHBRIDGE_AMD_CS5536 select SUPERIO_WINBOND_W83627HF Index: mainboard/amd/Kconfig =================================================================== --- mainboard/amd/Kconfig (revision 1076) +++ mainboard/amd/Kconfig (working copy) @@ -27,7 +27,6 @@ bool "DB800" select ARCH_X86 select CPU_AMD_GEODELX - select OPTION_TABLE select NORTHBRIDGE_AMD_GEODELX select SOUTHBRIDGE_AMD_CS5536 select SUPERIO_WINBOND_W83627HF @@ -38,7 +37,6 @@ config BOARD_AMD_DBM690T bool "dbm690t" select ARCH_X86 - select OPTION_TABLE select CPU_AMD_K8 select NORTHBRIDGE_AMD_K8 select SOUTHBRIDGE_AMD_SB600 @@ -52,7 +50,6 @@ bool "Norwich" select ARCH_X86 select CPU_AMD_GEODELX - select OPTION_TABLE select NORTHBRIDGE_AMD_GEODELX select SOUTHBRIDGE_AMD_CS5536 select PIRQ_TABLE @@ -62,7 +59,6 @@ config BOARD_AMD_SERENGETI bool "Serengeti" select ARCH_X86 - select OPTION_TABLE select CPU_AMD_K8 select NORTHBRIDGE_AMD_K8 select SOUTHBRIDGE_AMD_AMD8111 Index: mainboard/amp/Kconfig =================================================================== --- mainboard/amp/Kconfig (revision 1076) +++ mainboard/amp/Kconfig (working copy) @@ -27,7 +27,6 @@ bool "TinyGX" select ARCH_X86 select CPU_AMD_GEODELX - select OPTION_TABLE select NORTHBRIDGE_AMD_GEODELX select SOUTHBRIDGE_AMD_CS5536 select SUPERIO_ITE_IT8716F Index: mainboard/artecgroup/Kconfig =================================================================== --- mainboard/artecgroup/Kconfig (revision 1076) +++ mainboard/artecgroup/Kconfig (working copy) @@ -27,7 +27,6 @@ bool "DBE61" select ARCH_X86 select CPU_AMD_GEODELX - select OPTION_TABLE select NORTHBRIDGE_AMD_GEODELX select SOUTHBRIDGE_AMD_CS5536 select PIRQ_TABLE @@ -38,7 +37,6 @@ bool "DBE62" select ARCH_X86 select CPU_AMD_GEODELX - select OPTION_TABLE select NORTHBRIDGE_AMD_GEODELX select SOUTHBRIDGE_AMD_CS5536 select PIRQ_TABLE Index: mainboard/emulation/Kconfig =================================================================== --- mainboard/emulation/Kconfig (revision 1076) +++ mainboard/emulation/Kconfig (working copy) @@ -28,7 +28,6 @@ bool "QEMU x86" select ARCH_X86 select CPU_I586 - select OPTION_TABLE select NORTHBRIDGE_INTEL_I440BXEMULATION select SOUTHBRIDGE_INTEL_I82371EB help Index: mainboard/gigabyte/Kconfig =================================================================== --- mainboard/gigabyte/Kconfig (revision 1076) +++ mainboard/gigabyte/Kconfig (working copy) @@ -26,7 +26,6 @@ config BOARD_GIGABYTE_M57SLI bool "GA-M57SLI-S4" select ARCH_X86 - select OPTION_TABLE select CPU_AMD_K8 select NORTHBRIDGE_AMD_K8 select SOUTHBRIDGE_NVIDIA_MCP55 Index: mainboard/jetway/Kconfig =================================================================== --- mainboard/jetway/Kconfig (revision 1076) +++ mainboard/jetway/Kconfig (working copy) @@ -25,7 +25,6 @@ bool "J7F2 Series (INCOMPLETE)" select ARCH_X86 select CPU_VIA_C7 - select OPTION_TABLE select NORTHBRIDGE_VIA_CN700 select SOUTHBRIDGE_VIA_VT8237 select SUPERIO_FINTEK_F71805F Index: mainboard/kontron/Kconfig =================================================================== --- mainboard/kontron/Kconfig (revision 1076) +++ mainboard/kontron/Kconfig (working copy) @@ -27,7 +27,6 @@ bool "986LCD-M" select ARCH_X86 select CPU_INTEL_CORE2 - select OPTION_TABLE select NORTHBRIDGE_INTEL_I945 select SOUTHBRIDGE_INTEL_I82801GX select SUPERIO_WINBOND_W83627THG Index: mainboard/pcengines/Kconfig =================================================================== --- mainboard/pcengines/Kconfig (revision 1076) +++ mainboard/pcengines/Kconfig (working copy) @@ -27,7 +27,6 @@ bool "ALIX.1C" select ARCH_X86 select CPU_AMD_GEODELX - select OPTION_TABLE select NORTHBRIDGE_AMD_GEODELX select SOUTHBRIDGE_AMD_CS5536 select SUPERIO_WINBOND_W83627HF @@ -39,7 +38,6 @@ bool "ALIX.2C3" select ARCH_X86 select CPU_AMD_GEODELX - select OPTION_TABLE select NORTHBRIDGE_AMD_GEODELX select SOUTHBRIDGE_AMD_CS5536 select PIRQ_TABLE Index: mainboard/via/Kconfig =================================================================== --- mainboard/via/Kconfig (revision 1076) +++ mainboard/via/Kconfig (working copy) @@ -26,7 +26,6 @@ bool "EPIA-CN" select ARCH_X86 select CPU_VIA_C7 - select OPTION_TABLE select NORTHBRIDGE_VIA_CN700 select SOUTHBRIDGE_VIA_VT8237 select SUPERIO_VIA_VT1211 Index: arch/x86/Kconfig =================================================================== --- arch/x86/Kconfig (revision 1076) +++ arch/x86/Kconfig (working copy) @@ -141,13 +141,6 @@ help Configure for the type of crossbar on the mainboard. -config OPTION_TABLE - boolean - help - This option is used to determine whether the mainboard has - a battery backed up real time clock with CMOS NVRAM. - It is usually set in mainboard/*/Kconfig. - config PIRQ_TABLE boolean help
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
