[commit] r5653 - in trunk: src src/arch/i386/boot src/arch/i386/init src/cpu/amd/dualcore src/cpu/amd/model_10xxx src/cpu/amd/model_fxx src/cpu/amd/quadcore src/include/pc80 src/mainboard/a-trend/a...
Author: myles Date: Tue Jul 6 23:05:04 2010 New Revision: 5653 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5653 Log: Re-integrate "USE_OPTION_TABLE" code. Signed-off-by: Edwin Beasant <edwin_beasant@virtensys.com> Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Myles Watson <mylesgw@gmail.com> Modified: trunk/src/Kconfig trunk/src/arch/i386/boot/coreboot_table.c trunk/src/arch/i386/init/bootblock_normal.c trunk/src/cpu/amd/dualcore/dualcore.c trunk/src/cpu/amd/model_10xxx/init_cpus.c trunk/src/cpu/amd/model_fxx/init_cpus.c trunk/src/cpu/amd/quadcore/quadcore.c trunk/src/include/pc80/mc146818rtc.h trunk/src/mainboard/a-trend/atc-6220/Kconfig trunk/src/mainboard/a-trend/atc-6240/Kconfig trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig trunk/src/mainboard/advantech/pcm-5820/Kconfig trunk/src/mainboard/amd/db800/Kconfig trunk/src/mainboard/amd/dbm690t/Kconfig trunk/src/mainboard/amd/dbm690t/romstage.c trunk/src/mainboard/amd/mahogany/Kconfig trunk/src/mainboard/amd/mahogany/romstage.c trunk/src/mainboard/amd/mahogany_fam10/Kconfig trunk/src/mainboard/amd/mahogany_fam10/romstage.c trunk/src/mainboard/amd/norwich/Kconfig trunk/src/mainboard/amd/pistachio/Kconfig trunk/src/mainboard/amd/pistachio/romstage.c trunk/src/mainboard/amd/rumba/Kconfig trunk/src/mainboard/amd/serengeti_cheetah/Kconfig trunk/src/mainboard/amd/serengeti_cheetah/ap_romstage.c trunk/src/mainboard/amd/serengeti_cheetah/romstage.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c trunk/src/mainboard/amd/tilapia_fam10/Kconfig trunk/src/mainboard/amd/tilapia_fam10/romstage.c trunk/src/mainboard/arima/hdama/Kconfig trunk/src/mainboard/arima/hdama/romstage.c trunk/src/mainboard/artecgroup/dbe61/Kconfig trunk/src/mainboard/asi/mb_5blgp/Kconfig trunk/src/mainboard/asi/mb_5blmp/Kconfig trunk/src/mainboard/asrock/939a785gmh/Kconfig trunk/src/mainboard/asrock/939a785gmh/romstage.c trunk/src/mainboard/asus/a8n_e/Kconfig trunk/src/mainboard/asus/a8n_e/romstage.c trunk/src/mainboard/asus/a8v-e_se/Kconfig trunk/src/mainboard/asus/a8v-e_se/romstage.c trunk/src/mainboard/asus/m2v-mx_se/romstage.c trunk/src/mainboard/asus/mew-am/Kconfig trunk/src/mainboard/asus/mew-vm/Kconfig trunk/src/mainboard/asus/p2b-d/Kconfig trunk/src/mainboard/asus/p2b-ds/Kconfig trunk/src/mainboard/asus/p2b-f/Kconfig trunk/src/mainboard/asus/p2b-ls/Kconfig trunk/src/mainboard/asus/p2b/Kconfig trunk/src/mainboard/asus/p3b-f/Kconfig trunk/src/mainboard/axus/tc320/Kconfig trunk/src/mainboard/azza/pt-6ibd/Kconfig trunk/src/mainboard/bcom/winnet100/Kconfig trunk/src/mainboard/bcom/winnetp680/Kconfig trunk/src/mainboard/biostar/m6tba/Kconfig trunk/src/mainboard/broadcom/blast/Kconfig trunk/src/mainboard/broadcom/blast/romstage.c trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig trunk/src/mainboard/dell/s1850/Kconfig trunk/src/mainboard/dell/s1850/romstage.c trunk/src/mainboard/digitallogic/adl855pc/Kconfig trunk/src/mainboard/digitallogic/adl855pc/romstage.c trunk/src/mainboard/digitallogic/msm586seg/Kconfig trunk/src/mainboard/digitallogic/msm586seg/romstage.c trunk/src/mainboard/digitallogic/msm800sev/Kconfig trunk/src/mainboard/eaglelion/5bcm/Kconfig trunk/src/mainboard/ecs/p6iwp-fe/Kconfig trunk/src/mainboard/emulation/qemu-x86/Kconfig trunk/src/mainboard/emulation/qemu-x86/romstage.c trunk/src/mainboard/getac/p470/Kconfig trunk/src/mainboard/getac/p470/romstage.c trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig trunk/src/mainboard/gigabyte/ga-6bxe/Kconfig trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c trunk/src/mainboard/gigabyte/m57sli/Kconfig trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c trunk/src/mainboard/gigabyte/m57sli/romstage.c trunk/src/mainboard/hp/dl145_g3/Kconfig trunk/src/mainboard/hp/dl145_g3/romstage.c trunk/src/mainboard/hp/e_vectra_p2706t/Kconfig trunk/src/mainboard/ibase/mb899/Kconfig trunk/src/mainboard/ibase/mb899/romstage.c trunk/src/mainboard/ibm/e325/Kconfig trunk/src/mainboard/ibm/e325/romstage.c trunk/src/mainboard/ibm/e326/Kconfig trunk/src/mainboard/ibm/e326/romstage.c trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig trunk/src/mainboard/intel/d810e2cb/Kconfig trunk/src/mainboard/intel/d945gclf/Kconfig trunk/src/mainboard/intel/d945gclf/romstage.c trunk/src/mainboard/intel/eagleheights/Kconfig trunk/src/mainboard/intel/eagleheights/romstage.c trunk/src/mainboard/intel/jarrell/Kconfig trunk/src/mainboard/intel/jarrell/romstage.c trunk/src/mainboard/intel/mtarvon/Kconfig trunk/src/mainboard/intel/mtarvon/romstage.c trunk/src/mainboard/intel/truxton/Kconfig trunk/src/mainboard/intel/truxton/romstage.c trunk/src/mainboard/intel/xe7501devkit/Kconfig trunk/src/mainboard/intel/xe7501devkit/romstage.c trunk/src/mainboard/iwill/dk8_htx/Kconfig trunk/src/mainboard/iwill/dk8_htx/romstage.c trunk/src/mainboard/iwill/dk8s2/Kconfig trunk/src/mainboard/iwill/dk8s2/romstage.c trunk/src/mainboard/iwill/dk8x/Kconfig trunk/src/mainboard/iwill/dk8x/romstage.c trunk/src/mainboard/jetway/j7f24/Kconfig trunk/src/mainboard/kontron/986lcd-m/Kconfig trunk/src/mainboard/kontron/986lcd-m/romstage.c trunk/src/mainboard/kontron/kt690/Kconfig trunk/src/mainboard/kontron/kt690/romstage.c trunk/src/mainboard/lippert/frontrunner/Kconfig trunk/src/mainboard/lippert/roadrunner-lx/Kconfig trunk/src/mainboard/lippert/spacerunner-lx/Kconfig trunk/src/mainboard/mitac/6513wu/Kconfig trunk/src/mainboard/msi/ms6119/Kconfig trunk/src/mainboard/msi/ms6147/Kconfig trunk/src/mainboard/msi/ms6156/Kconfig trunk/src/mainboard/msi/ms6178/Kconfig trunk/src/mainboard/msi/ms7135/Kconfig trunk/src/mainboard/msi/ms7135/romstage.c trunk/src/mainboard/msi/ms7260/Kconfig trunk/src/mainboard/msi/ms7260/ap_romstage.c trunk/src/mainboard/msi/ms7260/romstage.c trunk/src/mainboard/msi/ms9185/Kconfig trunk/src/mainboard/msi/ms9185/romstage.c trunk/src/mainboard/msi/ms9282/Kconfig trunk/src/mainboard/msi/ms9282/romstage.c trunk/src/mainboard/msi/ms9652_fam10/Kconfig trunk/src/mainboard/msi/ms9652_fam10/romstage.c trunk/src/mainboard/nec/powermate2000/Kconfig trunk/src/mainboard/newisys/khepri/Kconfig trunk/src/mainboard/newisys/khepri/romstage.c trunk/src/mainboard/nokia/ip530/Kconfig trunk/src/mainboard/nvidia/l1_2pvv/Kconfig trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c trunk/src/mainboard/nvidia/l1_2pvv/romstage.c trunk/src/mainboard/olpc/btest/Kconfig trunk/src/mainboard/olpc/rev_a/Kconfig trunk/src/mainboard/pcengines/alix1c/Kconfig trunk/src/mainboard/rca/rm4100/Kconfig trunk/src/mainboard/roda/rk886ex/Kconfig trunk/src/mainboard/roda/rk886ex/romstage.c trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig trunk/src/mainboard/sunw/ultra40/Kconfig trunk/src/mainboard/sunw/ultra40/romstage.c trunk/src/mainboard/supermicro/h8dme/Kconfig trunk/src/mainboard/supermicro/h8dme/ap_romstage.c trunk/src/mainboard/supermicro/h8dme/romstage.c trunk/src/mainboard/supermicro/h8dmr/Kconfig trunk/src/mainboard/supermicro/h8dmr/ap_romstage.c trunk/src/mainboard/supermicro/h8dmr/romstage.c trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c trunk/src/mainboard/supermicro/x6dai_g/Kconfig trunk/src/mainboard/supermicro/x6dai_g/romstage.c trunk/src/mainboard/supermicro/x6dhe_g/Kconfig trunk/src/mainboard/supermicro/x6dhe_g/romstage.c trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig trunk/src/mainboard/supermicro/x6dhe_g2/romstage.c trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig trunk/src/mainboard/supermicro/x6dhr_ig/romstage.c trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig trunk/src/mainboard/supermicro/x6dhr_ig2/romstage.c trunk/src/mainboard/technexion/tim5690/Kconfig trunk/src/mainboard/technexion/tim5690/romstage.c trunk/src/mainboard/technexion/tim8690/Kconfig trunk/src/mainboard/technexion/tim8690/romstage.c trunk/src/mainboard/technologic/ts5300/Kconfig trunk/src/mainboard/technologic/ts5300/romstage.c trunk/src/mainboard/televideo/tc7020/Kconfig trunk/src/mainboard/thomson/ip1000/Kconfig trunk/src/mainboard/traverse/geos/Kconfig trunk/src/mainboard/tyan/s1846/Kconfig trunk/src/mainboard/tyan/s2735/romstage.c trunk/src/mainboard/tyan/s2850/Kconfig trunk/src/mainboard/tyan/s2850/romstage.c trunk/src/mainboard/tyan/s2875/Kconfig trunk/src/mainboard/tyan/s2875/romstage.c trunk/src/mainboard/tyan/s2880/Kconfig trunk/src/mainboard/tyan/s2880/romstage.c trunk/src/mainboard/tyan/s2881/Kconfig trunk/src/mainboard/tyan/s2881/romstage.c trunk/src/mainboard/tyan/s2882/Kconfig trunk/src/mainboard/tyan/s2882/romstage.c trunk/src/mainboard/tyan/s2885/Kconfig trunk/src/mainboard/tyan/s2885/romstage.c trunk/src/mainboard/tyan/s2891/Kconfig trunk/src/mainboard/tyan/s2891/romstage.c trunk/src/mainboard/tyan/s2892/Kconfig trunk/src/mainboard/tyan/s2892/romstage.c trunk/src/mainboard/tyan/s2895/Kconfig trunk/src/mainboard/tyan/s2895/romstage.c trunk/src/mainboard/tyan/s2912/Kconfig trunk/src/mainboard/tyan/s2912/ap_romstage.c trunk/src/mainboard/tyan/s2912/romstage.c trunk/src/mainboard/tyan/s2912_fam10/Kconfig trunk/src/mainboard/tyan/s2912_fam10/romstage.c trunk/src/mainboard/tyan/s4880/Kconfig trunk/src/mainboard/tyan/s4880/romstage.c trunk/src/mainboard/tyan/s4882/Kconfig trunk/src/mainboard/tyan/s4882/romstage.c trunk/src/mainboard/via/epia-cn/Kconfig trunk/src/mainboard/via/epia-m/Kconfig trunk/src/mainboard/via/epia-m700/Kconfig trunk/src/mainboard/via/epia-n/Kconfig trunk/src/mainboard/via/epia/Kconfig trunk/src/mainboard/via/pc2500e/Kconfig trunk/src/mainboard/via/pc2500e/romstage.c trunk/src/mainboard/via/vt8454c/Kconfig trunk/src/mainboard/winent/pl6064/Kconfig trunk/src/mainboard/wyse/s50/Kconfig trunk/src/northbridge/amd/amdk8/coherent_ht.c trunk/src/northbridge/amd/amdk8/raminit.c trunk/src/northbridge/intel/i945/raminit.c trunk/src/pc80/Makefile.inc trunk/src/pc80/mc146818rtc.c trunk/src/pc80/mc146818rtc_early.c trunk/src/pc80/serial.c trunk/util/options/build_opt_tbl.c Modified: trunk/src/Kconfig ============================================================================== --- trunk/src/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -83,6 +83,7 @@ config USE_OPTION_TABLE bool "Use CMOS for configuration values" default n + depends on HAVE_OPTION_TABLE help Enable this option if coreboot shall read options from the "CMOS" NVRAM instead of using hard coded values. @@ -189,13 +190,17 @@ bool default n +config USE_OPTION_TABLE + bool + default n + config HAVE_OPTION_TABLE bool - default y + default n help This variable specifies whether a given board has a cmos.layout file containing NVRAM/CMOS bit definitions. - It defaults to 'y' but can be changed to 'n' in mainboard/*/Kconfig. + It defaults to 'n' but can be selected in mainboard/*/Kconfig. config PIRQ_ROUTE bool Modified: trunk/src/arch/i386/boot/coreboot_table.c ============================================================================== --- trunk/src/arch/i386/boot/coreboot_table.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/arch/i386/boot/coreboot_table.c Tue Jul 6 23:05:04 2010 (r5653) @@ -29,7 +29,7 @@ #include <version.h> #include <device/device.h> #include <stdlib.h> -#if (CONFIG_HAVE_OPTION_TABLE == 1) +#if (CONFIG_USE_OPTION_TABLE == 1) #include <option_table.h> #endif @@ -188,7 +188,7 @@ return mainboard; } -#if (CONFIG_HAVE_OPTION_TABLE == 1) +#if (CONFIG_USE_OPTION_TABLE == 1) static struct cmos_checksum *lb_cmos_checksum(struct lb_header *header) { struct lb_record *rec; @@ -535,7 +535,7 @@ rom_table_end &= ~0xffff; printk(BIOS_DEBUG, "0x%08lx \n", rom_table_end); -#if (CONFIG_HAVE_OPTION_TABLE == 1) +#if (CONFIG_USE_OPTION_TABLE == 1) { struct lb_record *rec_dest = lb_new_record(head); /* Copy the option config table, it's already a lb_record... */ Modified: trunk/src/arch/i386/init/bootblock_normal.c ============================================================================== --- trunk/src/arch/i386/init/bootblock_normal.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/arch/i386/init/bootblock_normal.c Tue Jul 6 23:05:04 2010 (r5653) @@ -2,7 +2,7 @@ #include <arch/io.h> #include "arch/romcc_io.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> static void main(unsigned long bist) { Modified: trunk/src/cpu/amd/dualcore/dualcore.c ============================================================================== --- trunk/src/cpu/amd/dualcore/dualcore.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/cpu/amd/dualcore/dualcore.c Tue Jul 6 23:05:04 2010 (r5653) @@ -6,6 +6,7 @@ #endif #include "cpu/amd/dualcore/dualcore_id.c" +#include <pc80/mc146818rtc.h> static inline unsigned get_core_num_in_bsp(unsigned nodeid) { @@ -56,8 +57,7 @@ unsigned nodes; unsigned nodeid; - if (CONFIG_HAVE_OPTION_TABLE && - read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) { + if (read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0)) { return; // disable multi_core } Modified: trunk/src/cpu/amd/model_10xxx/init_cpus.c ============================================================================== --- trunk/src/cpu/amd/model_10xxx/init_cpus.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/cpu/amd/model_10xxx/init_cpus.c Tue Jul 6 23:05:04 2010 (r5653) @@ -109,13 +109,12 @@ /* get_nodes define in ht_wrapper.c */ nodes = get_nodes(); - disable_siblings = !CONFIG_LOGICAL_CPUS; - -#if CONFIG_LOGICAL_CPUS == 1 && CONFIG_HAVE_OPTION_TABLE == 1 - if (read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) { // 0 mean multi core + if (!CONFIG_LOGICAL_CPUS || + read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) { // 0 means multi core disable_siblings = 1; + } else { + disable_siblings = 0; } -#endif /* Assume that all node are same stepping, otherwise we can use use nb_cfg_54 from bsp for all nodes */ Modified: trunk/src/cpu/amd/model_fxx/init_cpus.c ============================================================================== --- trunk/src/cpu/amd/model_fxx/init_cpus.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/cpu/amd/model_fxx/init_cpus.c Tue Jul 6 23:05:04 2010 (r5653) @@ -36,13 +36,12 @@ /* get_nodes define in in_coherent_ht.c */ nodes = get_nodes(); - disable_siblings = !CONFIG_LOGICAL_CPUS; - -#if CONFIG_LOGICAL_CPUS == 1 && CONFIG_HAVE_OPTION_TABLE == 1 - if (read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) { // 0 mean multi core + if (!CONFIG_LOGICAL_CPUS || + read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) { // 0 means multi core disable_siblings = 1; + } else { + disable_siblings = 0; } -#endif /* here I assume that all node are same stepping, otherwise we can use use nb_cfg_54 from bsp for all nodes */ nb_cfg_54 = read_nb_cfg_54(); Modified: trunk/src/cpu/amd/quadcore/quadcore.c ============================================================================== --- trunk/src/cpu/amd/quadcore/quadcore.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/cpu/amd/quadcore/quadcore.c Tue Jul 6 23:05:04 2010 (r5653) @@ -18,7 +18,7 @@ */ #include <console/console.h> -#include <pc80/mc146818rtc_early.c> +#include <pc80/mc146818rtc.h> #include <northbridge/amd/amdht/ht_wrapper.c> #ifndef SET_NB_CFG_54 Modified: trunk/src/include/pc80/mc146818rtc.h ============================================================================== --- trunk/src/include/pc80/mc146818rtc.h Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/include/pc80/mc146818rtc.h Tue Jul 6 23:05:04 2010 (r5653) @@ -85,15 +85,48 @@ * LB_CKS_RANGE_START, LB_CKS_RANGE_END and LB_CKS_LOC are defined * in option_table.h */ +#if CONFIG_HAVE_OPTION_TABLE +#include <option_table.h> +#endif + +#ifndef UTIL_BUILD_OPTION_TABLE +#include <arch/io.h> +static inline unsigned char cmos_read(unsigned char addr) +{ + int offs = 0; + if (addr >= 128) { + offs = 2; + addr -= 128; + } + outb(addr, RTC_BASE_PORT + offs + 0); + return inb(RTC_BASE_PORT + offs + 1); +} -#if !defined(ASSEMBLY) && !defined(__PRE_RAM__) +static inline void cmos_write(unsigned char val, unsigned char addr) +{ + int offs = 0; + if (addr >= 128) { + offs = 2; + addr -= 128; + } + outb(addr, RTC_BASE_PORT + offs + 0); + outb(val, RTC_BASE_PORT + offs + 1); +} +#endif + +#if !defined(__ROMCC__) void rtc_init(int invalid); -#if CONFIG_USE_OPTION_TABLE == 1 +#if CONFIG_USE_OPTION_TABLE int get_option(void *dest, const char *name); +unsigned read_option(unsigned start, unsigned size, unsigned def); #else static inline int get_option(void *dest __attribute__((unused)), const char *name __attribute__((unused))) { return -2; } +static inline unsigned read_option(unsigned start, unsigned size, unsigned def) + { return def; } #endif +#else +#include <pc80/mc146818rtc_early.c> #endif #endif /* PC80_MC146818RTC_H */ Modified: trunk/src/mainboard/a-trend/atc-6220/Kconfig ============================================================================== --- trunk/src/mainboard/a-trend/atc-6220/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/a-trend/atc-6220/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "ATC-6220" depends on BOARD_A_TREND_ATC_6220 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_A_TREND_ATC_6220 - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/a-trend/atc-6240/Kconfig ============================================================================== --- trunk/src/mainboard/a-trend/atc-6240/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/a-trend/atc-6240/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "ATC-6240" depends on BOARD_A_TREND_ATC_6240 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_A_TREND_ATC_6240 - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig ============================================================================== --- trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "BE6-II V2.0" depends on BOARD_ABIT_BE6_II_V2_0 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ABIT_BE6_II_V2_0 - config IRQ_SLOT_COUNT int default 9 Modified: trunk/src/mainboard/advantech/pcm-5820/Kconfig ============================================================================== --- trunk/src/mainboard/advantech/pcm-5820/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/advantech/pcm-5820/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "PCM-5820" depends on BOARD_ADVANTECH_PCM_5820 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ADVANTECH_PCM_5820 - config IRQ_SLOT_COUNT int default 2 Modified: trunk/src/mainboard/amd/db800/Kconfig ============================================================================== --- trunk/src/mainboard/amd/db800/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/db800/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -22,11 +22,6 @@ default "DB800" depends on BOARD_AMD_DB800 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_AMD_DB800 - config IRQ_SLOT_COUNT int default 4 Modified: trunk/src/mainboard/amd/dbm690t/Kconfig ============================================================================== --- trunk/src/mainboard/amd/dbm690t/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/dbm690t/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -11,6 +11,7 @@ select GENERATE_ACPI_TABLES select GENERATE_MP_TABLE select GENERATE_PIRQ_TABLE + select HAVE_OPTION_TABLE select HAVE_MAINBOARD_RESOURCES select HAVE_BUS_CONFIG select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/amd/dbm690t/romstage.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/dbm690t/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -40,8 +40,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/amd/mahogany/Kconfig ============================================================================== --- trunk/src/mainboard/amd/mahogany/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/mahogany/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -11,6 +11,7 @@ select GENERATE_ACPI_TABLES select GENERATE_MP_TABLE select GENERATE_PIRQ_TABLE + select HAVE_OPTION_TABLE select HAVE_MAINBOARD_RESOURCES select HAVE_BUS_CONFIG select LIFT_BSP_APIC_ID Modified: trunk/src/mainboard/amd/mahogany/romstage.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/mahogany/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -40,8 +40,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/amd/mahogany_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/mahogany_fam10/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SUPERIO_ITE_IT8718F select BOARD_HAS_FADT select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select GENERATE_PIRQ_TABLE select GENERATE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/amd/mahogany_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/mahogany_fam10/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -45,7 +45,6 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" #include <console/console.h> #include "lib/ramtest.c" #include <cpu/amd/model_10xxx_rev.h> Modified: trunk/src/mainboard/amd/norwich/Kconfig ============================================================================== --- trunk/src/mainboard/amd/norwich/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/norwich/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -21,11 +21,6 @@ default "Norwich" depends on BOARD_AMD_NORWICH -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_AMD_NORWICH - config IRQ_SLOT_COUNT int default 6 Modified: trunk/src/mainboard/amd/pistachio/Kconfig ============================================================================== --- trunk/src/mainboard/amd/pistachio/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/pistachio/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SOUTHBRIDGE_AMD_SB600 select BOARD_HAS_FADT select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/amd/pistachio/romstage.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/pistachio/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -34,8 +34,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/amd/rumba/Kconfig ============================================================================== --- trunk/src/mainboard/amd/rumba/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/rumba/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -38,11 +38,6 @@ default "Rumba" depends on BOARD_AMD_RUMBA -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_AMD_RUMBA - config IRQ_SLOT_COUNT int default 2 Modified: trunk/src/mainboard/amd/serengeti_cheetah/Kconfig ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/serengeti_cheetah/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select SUPERIO_WINBOND_W83627HF select BOARD_HAS_FADT select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/amd/serengeti_cheetah/ap_romstage.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/ap_romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/serengeti_cheetah/ap_romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -18,8 +18,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include "pc80/serial.c" #include "./arch/i386/lib/printk_init.c" Modified: trunk/src/mainboard/amd/serengeti_cheetah/romstage.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/serengeti_cheetah/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -26,8 +26,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SUPERIO_WINBOND_W83627HF select BOARD_HAS_FADT select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -45,7 +45,6 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" #include <console/console.h> #include "lib/ramtest.c" #include <cpu/amd/model_10xxx_rev.h> Modified: trunk/src/mainboard/amd/tilapia_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/amd/tilapia_fam10/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/tilapia_fam10/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SUPERIO_ITE_IT8718F select BOARD_HAS_FADT select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select GENERATE_PIRQ_TABLE select GENERATE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/amd/tilapia_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/tilapia_fam10/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/amd/tilapia_fam10/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -45,7 +45,6 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" #include <console/console.h> #include "lib/ramtest.c" #include <cpu/amd/model_10xxx_rev.h> Modified: trunk/src/mainboard/arima/hdama/Kconfig ============================================================================== --- trunk/src/mainboard/arima/hdama/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/arima/hdama/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_NSC_PC87360 select HAVE_PIRQ_TABLE + select HAVE_OPTION_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM Modified: trunk/src/mainboard/arima/hdama/romstage.c ============================================================================== --- trunk/src/mainboard/arima/hdama/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/arima/hdama/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -5,8 +5,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/artecgroup/dbe61/Kconfig ============================================================================== --- trunk/src/mainboard/artecgroup/dbe61/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/artecgroup/dbe61/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -21,11 +21,6 @@ default "DBE61" depends on BOARD_ARTECGROUP_DBE61 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ARTECGROUP_DBE61 - config IRQ_SLOT_COUNT int default 3 Modified: trunk/src/mainboard/asi/mb_5blgp/Kconfig ============================================================================== --- trunk/src/mainboard/asi/mb_5blgp/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asi/mb_5blgp/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "MB-5BLGP" depends on BOARD_ASI_MB_5BLGP -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ASI_MB_5BLGP - config IRQ_SLOT_COUNT int default 3 Modified: trunk/src/mainboard/asi/mb_5blmp/Kconfig ============================================================================== --- trunk/src/mainboard/asi/mb_5blmp/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asi/mb_5blmp/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "MB-5BLMP" depends on BOARD_ASI_MB_5BLMP -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ASI_MB_5BLMP - config IRQ_SLOT_COUNT int default 5 Modified: trunk/src/mainboard/asrock/939a785gmh/Kconfig ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asrock/939a785gmh/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -13,6 +13,7 @@ select GENERATE_MP_TABLE select GENERATE_PIRQ_TABLE select HAVE_MAINBOARD_RESOURCES + select HAVE_OPTION_TABLE select HAVE_BUS_CONFIG select LIFT_BSP_APIC_ID select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/asrock/939a785gmh/romstage.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asrock/939a785gmh/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -41,8 +41,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/asus/a8n_e/Kconfig ============================================================================== --- trunk/src/mainboard/asus/a8n_e/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/a8n_e/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_NVIDIA_CK804 select SUPERIO_ITE_IT8712F select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/asus/a8n_e/romstage.c ============================================================================== --- trunk/src/mainboard/asus/a8n_e/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/a8n_e/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -38,8 +38,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include "cpu/x86/lapic/boot_cpu.c" #include "northbridge/amd/amdk8/reset_test.c" #include "superio/ite/it8712f/it8712f_early_serial.c" Modified: trunk/src/mainboard/asus/a8v-e_se/Kconfig ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/a8v-e_se/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -10,6 +10,7 @@ select SUPERIO_WINBOND_W83627EHG select USE_PRINTK_IN_CAR select USE_DCACHE_RAM + select HAVE_OPTION_TABLE select HAVE_ACPI_TABLES select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/asus/a8v-e_se/romstage.c ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/a8v-e_se/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -44,8 +44,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/raminit.h" Modified: trunk/src/mainboard/asus/m2v-mx_se/romstage.c ============================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/m2v-mx_se/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -49,8 +49,7 @@ #include <arch/romcc_io.h> #include <cpu/amd/mtrr.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> #include "northbridge/amd/amdk8/raminit.h" Modified: trunk/src/mainboard/asus/mew-am/Kconfig ============================================================================== --- trunk/src/mainboard/asus/mew-am/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/mew-am/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -41,11 +41,6 @@ default "MEW-AM" depends on BOARD_ASUS_MEW_AM -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ASUS_MEW_AM - config IRQ_SLOT_COUNT int default 8 Modified: trunk/src/mainboard/asus/mew-vm/Kconfig ============================================================================== --- trunk/src/mainboard/asus/mew-vm/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/mew-vm/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -25,6 +25,7 @@ select SOUTHBRIDGE_INTEL_I82801AX select SUPERIO_SMSC_LPC47B272 select ROMCC + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/asus/p2b-d/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p2b-d/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/p2b-d/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -42,11 +42,6 @@ default "P2B-D" depends on BOARD_ASUS_P2B_D -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ASUS_P2B_D - config IRQ_SLOT_COUNT int default 6 Modified: trunk/src/mainboard/asus/p2b-ds/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p2b-ds/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/p2b-ds/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -42,11 +42,6 @@ default "P2B-DS" depends on BOARD_ASUS_P2B_DS -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ASUS_P2B_DS - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/asus/p2b-f/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p2b-f/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/p2b-f/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "P2B-F" depends on BOARD_ASUS_P2B_F -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ASUS_P2B_F - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/asus/p2b-ls/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p2b-ls/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/p2b-ls/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "P2B-LS" depends on BOARD_ASUS_P2B_LS -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ASUS_P2B_LS - config IRQ_SLOT_COUNT int default 8 Modified: trunk/src/mainboard/asus/p2b/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p2b/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/p2b/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "P2B" depends on BOARD_ASUS_P2B -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ASUS_P2B - config IRQ_SLOT_COUNT int default 6 Modified: trunk/src/mainboard/asus/p3b-f/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p3b-f/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/asus/p3b-f/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "P3B-F" depends on BOARD_ASUS_P3B_F -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ASUS_P3B_F - config IRQ_SLOT_COUNT int default 8 Modified: trunk/src/mainboard/axus/tc320/Kconfig ============================================================================== --- trunk/src/mainboard/axus/tc320/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/axus/tc320/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "TC320" depends on BOARD_AXUS_TC320 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_AXUS_TC320 - # Soldered NIC, internal USB, no real PCI slots. config IRQ_SLOT_COUNT int Modified: trunk/src/mainboard/azza/pt-6ibd/Kconfig ============================================================================== --- trunk/src/mainboard/azza/pt-6ibd/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/azza/pt-6ibd/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "PT-6IBD" depends on BOARD_AZZA_PT_6IBD -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_AZZA_PT_6IBD - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/bcom/winnet100/Kconfig ============================================================================== --- trunk/src/mainboard/bcom/winnet100/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/bcom/winnet100/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "WinNET100" depends on BOARD_BCOM_WINNET100 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_BCOM_WINNET100 - # Soldered NIC, internal USB, no real PCI slots. config IRQ_SLOT_COUNT int Modified: trunk/src/mainboard/bcom/winnetp680/Kconfig ============================================================================== --- trunk/src/mainboard/bcom/winnetp680/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/bcom/winnetp680/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -6,6 +6,7 @@ select SOUTHBRIDGE_VIA_VT8237R select SUPERIO_WINBOND_W83697HF select HAVE_PIRQ_TABLE + select HAVE_OPTION_TABLE select UDELAY_TSC select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/biostar/m6tba/Kconfig ============================================================================== --- trunk/src/mainboard/biostar/m6tba/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/biostar/m6tba/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "M6TBA" depends on BOARD_BIOSTAR_M6TBA -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_BIOSTAR_M6TBA - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/broadcom/blast/Kconfig ============================================================================== --- trunk/src/mainboard/broadcom/blast/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/broadcom/blast/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SOUTHBRIDGE_BROADCOM_BCM5785 select SUPERIO_NSC_PC87417 select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/broadcom/blast/romstage.c ============================================================================== --- trunk/src/mainboard/broadcom/blast/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/broadcom/blast/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -11,8 +11,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig ============================================================================== --- trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "Deskpro EN SFF P600" depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600 - config IRQ_SLOT_COUNT int default 5 Modified: trunk/src/mainboard/dell/s1850/Kconfig ============================================================================== --- trunk/src/mainboard/dell/s1850/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/dell/s1850/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SUPERIO_NSC_PC8374 select ROMCC select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE Modified: trunk/src/mainboard/dell/s1850/romstage.c ============================================================================== --- trunk/src/mainboard/dell/s1850/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/dell/s1850/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -5,8 +5,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" Modified: trunk/src/mainboard/digitallogic/adl855pc/Kconfig ============================================================================== --- trunk/src/mainboard/digitallogic/adl855pc/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/digitallogic/adl855pc/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -5,6 +5,7 @@ select NORTHBRIDGE_INTEL_I855 select SOUTHBRIDGE_INTEL_I82801DX select SUPERIO_WINBOND_W83627HF + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_1024 Modified: trunk/src/mainboard/digitallogic/adl855pc/romstage.c ============================================================================== --- trunk/src/mainboard/digitallogic/adl855pc/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/digitallogic/adl855pc/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -4,10 +4,9 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -//#include "option_table.h" #include <stdlib.h> #include "pc80/udelay_io.c" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801dx/i82801dx.h" Modified: trunk/src/mainboard/digitallogic/msm586seg/Kconfig ============================================================================== --- trunk/src/mainboard/digitallogic/msm586seg/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/digitallogic/msm586seg/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -3,6 +3,7 @@ select ARCH_X86 select CPU_AMD_SC520 select HAVE_PIRQ_TABLE + select HAVE_OPTION_TABLE select BOARD_ROMSIZE_KB_512 select ROMCC Modified: trunk/src/mainboard/digitallogic/msm586seg/romstage.c ============================================================================== --- trunk/src/mainboard/digitallogic/msm586seg/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/digitallogic/msm586seg/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -4,7 +4,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h" Modified: trunk/src/mainboard/digitallogic/msm800sev/Kconfig ============================================================================== --- trunk/src/mainboard/digitallogic/msm800sev/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/digitallogic/msm800sev/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -22,11 +22,6 @@ default "MSM800SEV" depends on BOARD_DIGITALLOGIC_MSM800SEV -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_DIGITALLOGIC_MSM800SEV - config IRQ_SLOT_COUNT int default 9 Modified: trunk/src/mainboard/eaglelion/5bcm/Kconfig ============================================================================== --- trunk/src/mainboard/eaglelion/5bcm/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/eaglelion/5bcm/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "5BCM" depends on BOARD_EAGLELION_5BCM -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_EAGLELION_5BCM - config IRQ_SLOT_COUNT int default 2 Modified: trunk/src/mainboard/ecs/p6iwp-fe/Kconfig ============================================================================== --- trunk/src/mainboard/ecs/p6iwp-fe/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/ecs/p6iwp-fe/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -42,11 +42,6 @@ default "P6IWP-FE" depends on BOARD_ECS_P6IWP_FE -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_ECS_P6IWP_FE - config IRQ_SLOT_COUNT int default 10 Modified: trunk/src/mainboard/emulation/qemu-x86/Kconfig ============================================================================== --- trunk/src/mainboard/emulation/qemu-x86/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/emulation/qemu-x86/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -3,6 +3,7 @@ select ARCH_X86 select SOUTHBRIDGE_INTEL_I82371EB select ROMCC + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_256 select WARNINGS_ARE_ERRORS Modified: trunk/src/mainboard/emulation/qemu-x86/romstage.c ============================================================================== --- trunk/src/mainboard/emulation/qemu-x86/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/emulation/qemu-x86/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -5,8 +5,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "pc80/udelay_io.c" #include "lib/delay.c" Modified: trunk/src/mainboard/getac/p470/Kconfig ============================================================================== --- trunk/src/mainboard/getac/p470/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/getac/p470/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -31,6 +31,7 @@ select GENERATE_ACPI_TABLES select GENERATE_PIRQ_TABLE select GENERATE_MP_TABLE + select HAVE_OPTION_TABLE select HAVE_HARD_RESET select HAVE_ACPI_RESUME select HAVE_ACPI_SLIC Modified: trunk/src/mainboard/getac/p470/romstage.c ============================================================================== --- trunk/src/mainboard/getac/p470/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/getac/p470/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -31,8 +31,7 @@ #include <device/pnp_def.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/x86/bist.h> Modified: trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "GA-6BXC" depends on BOARD_GIGABYTE_GA_6BXC -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_GIGABYTE_GA_6BXC - config IRQ_SLOT_COUNT int default 6 Modified: trunk/src/mainboard/gigabyte/ga-6bxe/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ga-6bxe/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/gigabyte/ga-6bxe/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -41,11 +41,6 @@ default "GA-6BXE" depends on BOARD_GIGABYTE_GA_6BXE -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_GIGABYTE_GA_6BXE - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_SIS_SIS966 select SUPERIO_ITE_IT8716F select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -41,8 +41,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include "pc80/serial.c" #include "lib/uart8250.c" Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -50,8 +50,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #if CONFIG_USBDEBUG Modified: trunk/src/mainboard/gigabyte/m57sli/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/gigabyte/m57sli/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SUPERIO_ITE_IT8716F select SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/gigabyte/m57sli/ap_romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -39,8 +39,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include "pc80/serial.c" #include "lib/uart8250.c" Modified: trunk/src/mainboard/gigabyte/m57sli/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/gigabyte/m57sli/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -48,8 +48,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #if CONFIG_USBDEBUG Modified: trunk/src/mainboard/hp/dl145_g3/Kconfig ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/hp/dl145_g3/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SOUTHBRIDGE_BROADCOM_BCM5785 select SUPERIO_NSC_PC87417 select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/hp/dl145_g3/romstage.c ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/hp/dl145_g3/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -54,8 +54,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/hp/e_vectra_p2706t/Kconfig ============================================================================== --- trunk/src/mainboard/hp/e_vectra_p2706t/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/hp/e_vectra_p2706t/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -44,11 +44,6 @@ default "e-Vectra P2706T" depends on BOARD_HP_E_VECTRA_P2706T -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_HP_E_VECTRA_P2706T - config IRQ_SLOT_COUNT int default 3 Modified: trunk/src/mainboard/ibase/mb899/Kconfig ============================================================================== --- trunk/src/mainboard/ibase/mb899/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/ibase/mb899/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -11,6 +11,7 @@ select GENERATE_PIRQ_TABLE select GENERATE_MP_TABLE select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_ACPI_RESUME select HAVE_MAINBOARD_RESOURCES select MMCONF_SUPPORT Modified: trunk/src/mainboard/ibase/mb899/romstage.c ============================================================================== --- trunk/src/mainboard/ibase/mb899/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/ibase/mb899/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -34,8 +34,7 @@ #include "superio/winbond/w83627ehg/w83627ehg.h" -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/x86/bist.h> Modified: trunk/src/mainboard/ibm/e325/Kconfig ============================================================================== --- trunk/src/mainboard/ibm/e325/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/ibm/e325/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8111 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_NSC_PC87366 + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/ibm/e325/romstage.c ============================================================================== --- trunk/src/mainboard/ibm/e325/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/ibm/e325/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -7,8 +7,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/ibm/e326/Kconfig ============================================================================== --- trunk/src/mainboard/ibm/e326/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/ibm/e326/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8111 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_NSC_PC87366 + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/ibm/e326/romstage.c ============================================================================== --- trunk/src/mainboard/ibm/e326/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/ibm/e326/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -7,8 +7,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig ============================================================================== --- trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -21,11 +21,6 @@ default "PCISA-LX-800-R10" depends on BOARD_IEI_PCISA_LX_800_R10 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_IEI_PCISA_LX_800_R10 - config IRQ_SLOT_COUNT int default 9 Modified: trunk/src/mainboard/intel/d810e2cb/Kconfig ============================================================================== --- trunk/src/mainboard/intel/d810e2cb/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/d810e2cb/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "D810E2CB" depends on BOARD_INTEL_D810E2CB -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_INTEL_D810E2CB - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/intel/d945gclf/Kconfig ============================================================================== --- trunk/src/mainboard/intel/d945gclf/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/d945gclf/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -29,6 +29,7 @@ select GENERATE_ACPI_TABLES select GENERATE_PIRQ_TABLE select GENERATE_MP_TABLE + select HAVE_OPTION_TABLE select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE Modified: trunk/src/mainboard/intel/d945gclf/romstage.c ============================================================================== --- trunk/src/mainboard/intel/d945gclf/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/d945gclf/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -33,8 +33,7 @@ #include "superio/smsc/lpc47m15x/lpc47m15x.h" -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/x86/bist.h> Modified: trunk/src/mainboard/intel/eagleheights/Kconfig ============================================================================== --- trunk/src/mainboard/intel/eagleheights/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/eagleheights/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -6,6 +6,7 @@ select SOUTHBRIDGE_INTEL_I3100 select SUPERIO_INTEL_I3100 select SUPERIO_SMSC_SMSCSUPERIO + select HAVE_OPTION_TABLE select HAVE_HARD_RESET select BOARD_HAS_HARD_RESET select BOARD_HAS_FADT Modified: trunk/src/mainboard/intel/eagleheights/romstage.c ============================================================================== --- trunk/src/mainboard/intel/eagleheights/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/eagleheights/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -29,8 +29,7 @@ #include <device/pnp_def.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/x86/bist.h> Modified: trunk/src/mainboard/intel/jarrell/Kconfig ============================================================================== --- trunk/src/mainboard/intel/jarrell/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/jarrell/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select ROMCC select HAVE_HARD_RESET select BOARD_HAS_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select UDELAY_TSC Modified: trunk/src/mainboard/intel/jarrell/romstage.c ============================================================================== --- trunk/src/mainboard/intel/jarrell/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/jarrell/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -5,8 +5,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" Modified: trunk/src/mainboard/intel/mtarvon/Kconfig ============================================================================== --- trunk/src/mainboard/intel/mtarvon/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/mtarvon/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -22,11 +22,6 @@ default "3100 devkit (Mt. Arvon)" depends on BOARD_INTEL_MTARVON -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_INTEL_MTARVON - config IRQ_SLOT_COUNT int default 1 Modified: trunk/src/mainboard/intel/mtarvon/romstage.c ============================================================================== --- trunk/src/mainboard/intel/mtarvon/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/mtarvon/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -26,7 +26,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i3100/i3100_early_smbus.c" Modified: trunk/src/mainboard/intel/truxton/Kconfig ============================================================================== --- trunk/src/mainboard/intel/truxton/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/truxton/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -23,11 +23,6 @@ default "Truxton" depends on BOARD_INTEL_TRUXTON -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_INTEL_TRUXTON - config IRQ_SLOT_COUNT int default 1 Modified: trunk/src/mainboard/intel/truxton/romstage.c ============================================================================== --- trunk/src/mainboard/intel/truxton/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/truxton/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -26,7 +26,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include "pc80/udelay_io.c" #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/intel/xe7501devkit/Kconfig ============================================================================== --- trunk/src/mainboard/intel/xe7501devkit/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/xe7501devkit/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -12,7 +12,6 @@ select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select UDELAY_TSC - select HAVE_OPTION_TABLE select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_2048 Modified: trunk/src/mainboard/intel/xe7501devkit/romstage.c ============================================================================== --- trunk/src/mainboard/intel/xe7501devkit/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/intel/xe7501devkit/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -6,8 +6,7 @@ #include <cpu/x86/lapic.h> #include <arch/cpu.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801cx/i82801cx_early_smbus.c" Modified: trunk/src/mainboard/iwill/dk8_htx/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/iwill/dk8_htx/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select SUPERIO_WINBOND_W83627HF select BOARD_HAS_FADT select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/iwill/dk8_htx/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/iwill/dk8_htx/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -26,8 +26,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/iwill/dk8s2/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/iwill/dk8s2/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF select HAVE_PIRQ_TABLE + select HAVE_OPTION_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM Modified: trunk/src/mainboard/iwill/dk8s2/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/iwill/dk8s2/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -26,8 +26,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/iwill/dk8x/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8x/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/iwill/dk8x/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8111 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627THF + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/iwill/dk8x/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8x/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/iwill/dk8x/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -26,8 +26,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/jetway/j7f24/Kconfig ============================================================================== --- trunk/src/mainboard/jetway/j7f24/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/jetway/j7f24/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -6,6 +6,7 @@ select NORTHBRIDGE_VIA_CN700 select SOUTHBRIDGE_VIA_VT8237R select SUPERIO_FINTEK_F71805F + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/kontron/986lcd-m/Kconfig ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/kontron/986lcd-m/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -10,6 +10,7 @@ select GENERATE_ACPI_TABLES select GENERATE_PIRQ_TABLE select GENERATE_MP_TABLE + select HAVE_OPTION_TABLE select HAVE_HARD_RESET select HAVE_ACPI_RESUME select HAVE_MAINBOARD_RESOURCES Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/kontron/986lcd-m/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -42,8 +42,7 @@ #include "superio/winbond/w83627thg/w83627thg.h" -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/x86/bist.h> Modified: trunk/src/mainboard/kontron/kt690/Kconfig ============================================================================== --- trunk/src/mainboard/kontron/kt690/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/kontron/kt690/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SOUTHBRIDGE_AMD_SB600 select SUPERIO_WINBOND_W83627DHG select BOARD_HAS_FADT + select HAVE_OPTION_TABLE select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE Modified: trunk/src/mainboard/kontron/kt690/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/kontron/kt690/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -41,8 +41,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/lippert/frontrunner/Kconfig ============================================================================== --- trunk/src/mainboard/lippert/frontrunner/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/lippert/frontrunner/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -19,11 +19,6 @@ default "Cool Frontrunner" depends on BOARD_LIPPERT_FRONTRUNNER -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_LIPPERT_FRONTRUNNER - config IRQ_SLOT_COUNT int default 2 Modified: trunk/src/mainboard/lippert/roadrunner-lx/Kconfig ============================================================================== --- trunk/src/mainboard/lippert/roadrunner-lx/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/lippert/roadrunner-lx/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -22,11 +22,6 @@ default "Cool RoadRunner-LX" depends on BOARD_LIPPERT_ROADRUNNER_LX -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_LIPPERT_ROADRUNNER_LX - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/lippert/spacerunner-lx/Kconfig ============================================================================== --- trunk/src/mainboard/lippert/spacerunner-lx/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/lippert/spacerunner-lx/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -22,11 +22,6 @@ default "Cool SpaceRunner-LX" depends on BOARD_LIPPERT_SPACERUNNER_LX -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_LIPPERT_SPACERUNNER_LX - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/mitac/6513wu/Kconfig ============================================================================== --- trunk/src/mainboard/mitac/6513wu/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/mitac/6513wu/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -41,11 +41,6 @@ default "6513WU" depends on BOARD_MITAC_6513WU -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_MITAC_6513WU - config IRQ_SLOT_COUNT int default 8 Modified: trunk/src/mainboard/msi/ms6119/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms6119/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms6119/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "MS-6119" depends on BOARD_MSI_MS_6119 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_MSI_MS_6119 - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/msi/ms6147/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms6147/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms6147/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "MS-6147" depends on BOARD_MSI_MS_6147 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_MSI_MS_6147 - config IRQ_SLOT_COUNT int default 8 Modified: trunk/src/mainboard/msi/ms6156/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms6156/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms6156/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "MS-6156" depends on BOARD_MSI_MS_6156 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_MSI_MS_6156 - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/msi/ms6178/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms6178/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms6178/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "MS-6178" depends on BOARD_MSI_MS_6178 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_MSI_MS_6178 - config IRQ_SLOT_COUNT int default 4 Modified: trunk/src/mainboard/msi/ms7135/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms7135/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms7135/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SUPERIO_WINBOND_W83627THF select HAVE_BUS_CONFIG select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_DCACHE_RAM Modified: trunk/src/mainboard/msi/ms7135/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7135/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms7135/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -38,8 +38,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include "cpu/x86/lapic/boot_cpu.c" #include "northbridge/amd/amdk8/reset_test.c" #include "superio/winbond/w83627hf/w83627hf_early_serial.c" Modified: trunk/src/mainboard/msi/ms7260/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms7260/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms7260/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627EHG select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/msi/ms7260/ap_romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/ap_romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms7260/ap_romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -36,8 +36,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include "pc80/serial.c" #include "console/console.c" Modified: trunk/src/mainboard/msi/ms7260/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms7260/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -52,8 +52,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #if CONFIG_USBDEBUG Modified: trunk/src/mainboard/msi/ms9185/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms9185/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms9185/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SOUTHBRIDGE_BROADCOM_BCM5785 select SUPERIO_NSC_PC87417 select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/msi/ms9185/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms9185/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -47,8 +47,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/msi/ms9282/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms9282/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms9282/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627EHG select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/msi/ms9282/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9282/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms9282/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -42,8 +42,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/msi/ms9652_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms9652_fam10/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -49,11 +49,6 @@ default 0 depends on BOARD_MSI_MS9652_FAM10 -config HAVE_OPTION_TABLE - bool - default y - depends on BOARD_MSI_MS9652_FAM10 - config MAX_CPUS int default 8 Modified: trunk/src/mainboard/msi/ms9652_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/msi/ms9652_fam10/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -43,7 +43,6 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" #include <console/console.h> #if CONFIG_USBDEBUG #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" Modified: trunk/src/mainboard/nec/powermate2000/Kconfig ============================================================================== --- trunk/src/mainboard/nec/powermate2000/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/nec/powermate2000/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -41,11 +41,6 @@ default "PowerMate 2000" depends on BOARD_NEC_POWERMATE_2000 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_NEC_POWERMATE_2000 - config IRQ_SLOT_COUNT int default 5 Modified: trunk/src/mainboard/newisys/khepri/Kconfig ============================================================================== --- trunk/src/mainboard/newisys/khepri/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/newisys/khepri/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8111 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/newisys/khepri/romstage.c ============================================================================== --- trunk/src/mainboard/newisys/khepri/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/newisys/khepri/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -12,8 +12,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/nokia/ip530/Kconfig ============================================================================== --- trunk/src/mainboard/nokia/ip530/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/nokia/ip530/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -42,11 +42,6 @@ default "IP530" depends on BOARD_NOKIA_IP530 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_NOKIA_IP530 - config IRQ_SLOT_COUNT int default 22 Modified: trunk/src/mainboard/nvidia/l1_2pvv/Kconfig ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/nvidia/l1_2pvv/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -6,6 +6,7 @@ select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627EHG + select HAVE_OPTION_TABLE select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE Modified: trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/nvidia/l1_2pvv/ap_romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -39,8 +39,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include "pc80/serial.c" #include "lib/uart8250.c" Modified: trunk/src/mainboard/nvidia/l1_2pvv/romstage.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -48,8 +48,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #if CONFIG_USBDEBUG Modified: trunk/src/mainboard/olpc/btest/Kconfig ============================================================================== --- trunk/src/mainboard/olpc/btest/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/olpc/btest/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -19,11 +19,6 @@ default "btest" depends on BOARD_OLPC_BTEST -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_OLPC_BTEST - config IRQ_SLOT_COUNT int default 2 Modified: trunk/src/mainboard/olpc/rev_a/Kconfig ============================================================================== --- trunk/src/mainboard/olpc/rev_a/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/olpc/rev_a/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -19,11 +19,6 @@ default "rev_a" depends on BOARD_OLPC_REV_A -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_OLPC_REV_A - config IRQ_SLOT_COUNT int default 2 Modified: trunk/src/mainboard/pcengines/alix1c/Kconfig ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/pcengines/alix1c/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -22,11 +22,6 @@ default "ALIX.1C" depends on BOARD_PCENGINES_ALIX1C -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_PCENGINES_ALIX1C - config IRQ_SLOT_COUNT int default 5 Modified: trunk/src/mainboard/rca/rm4100/Kconfig ============================================================================== --- trunk/src/mainboard/rca/rm4100/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/rca/rm4100/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -26,11 +26,6 @@ default "RM4100" depends on BOARD_RCA_RM4100 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_RCA_RM4100 - config DCACHE_RAM_BASE hex default 0xffdf8000 Modified: trunk/src/mainboard/roda/rk886ex/Kconfig ============================================================================== --- trunk/src/mainboard/roda/rk886ex/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/roda/rk886ex/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select SUPERIO_SMSC_LPC47N227 select SUPERIO_RENESAS_M3885X select BOARD_HAS_FADT + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select MMCONF_SUPPORT Modified: trunk/src/mainboard/roda/rk886ex/romstage.c ============================================================================== --- trunk/src/mainboard/roda/rk886ex/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/roda/rk886ex/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -35,8 +35,7 @@ #include <device/pnp_def.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/x86/bist.h> Modified: trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig ============================================================================== --- trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "SY-6BA+ III" depends on BOARD_SOYO_SY_6BA_PLUS_III -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_SOYO_SY_6BA_PLUS_III - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/sunw/ultra40/Kconfig ============================================================================== --- trunk/src/mainboard/sunw/ultra40/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/sunw/ultra40/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -6,6 +6,7 @@ select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_CK804 select SUPERIO_SMSC_LPC47M10X + select HAVE_OPTION_TABLE select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE Modified: trunk/src/mainboard/sunw/ultra40/romstage.c ============================================================================== --- trunk/src/mainboard/sunw/ultra40/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/sunw/ultra40/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -14,8 +14,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/supermicro/h8dme/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/h8dme/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -6,6 +6,7 @@ select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF + select HAVE_OPTION_TABLE select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE Modified: trunk/src/mainboard/supermicro/h8dme/ap_romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/ap_romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/h8dme/ap_romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -39,8 +39,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include "pc80/serial.c" #include "console/console.c" Modified: trunk/src/mainboard/supermicro/h8dme/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/h8dme/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -43,8 +43,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/supermicro/h8dmr/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/h8dmr/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -6,6 +6,7 @@ select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF + select HAVE_OPTION_TABLE select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE Modified: trunk/src/mainboard/supermicro/h8dmr/ap_romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/ap_romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/h8dmr/ap_romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -39,8 +39,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include "pc80/serial.c" #include "console/console.c" Modified: trunk/src/mainboard/supermicro/h8dmr/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/h8dmr/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -46,8 +46,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -6,6 +6,7 @@ select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -41,7 +41,6 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -41,7 +41,6 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/supermicro/x6dai_g/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dai_g/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/x6dai_g/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select ROMCC select HAVE_HARD_RESET select BOARD_HAS_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_1024 Modified: trunk/src/mainboard/supermicro/x6dai_g/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dai_g/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/x6dai_g/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -5,8 +5,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "pc80/udelay_io.c" Modified: trunk/src/mainboard/supermicro/x6dhe_g/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/x6dhe_g/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select ROMCC select HAVE_HARD_RESET select BOARD_HAS_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_1024 Modified: trunk/src/mainboard/supermicro/x6dhe_g/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/x6dhe_g/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -5,8 +5,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "pc80/udelay_io.c" Modified: trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select ROMCC select HAVE_HARD_RESET select BOARD_HAS_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_1024 Modified: trunk/src/mainboard/supermicro/x6dhe_g2/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g2/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/x6dhe_g2/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -5,8 +5,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" Modified: trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select ROMCC select HAVE_HARD_RESET select BOARD_HAS_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_WATCHDOG_ON_BOOT Modified: trunk/src/mainboard/supermicro/x6dhr_ig/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/x6dhr_ig/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -5,8 +5,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" Modified: trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select ROMCC select HAVE_HARD_RESET select BOARD_HAS_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_WATCHDOG_ON_BOOT Modified: trunk/src/mainboard/supermicro/x6dhr_ig2/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig2/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/supermicro/x6dhr_ig2/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -5,8 +5,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "southbridge/intel/i82801ex/i82801ex_early_smbus.c" Modified: trunk/src/mainboard/technexion/tim5690/Kconfig ============================================================================== --- trunk/src/mainboard/technexion/tim5690/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/technexion/tim5690/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select SUPERIO_ITE_IT8712F select BOARD_HAS_FADT select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/technexion/tim5690/romstage.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/technexion/tim5690/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -40,8 +40,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/technexion/tim8690/Kconfig ============================================================================== --- trunk/src/mainboard/technexion/tim8690/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/technexion/tim8690/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select SUPERIO_ITE_IT8712F select BOARD_HAS_FADT select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/technexion/tim8690/romstage.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/technexion/tim8690/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -40,8 +40,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/technologic/ts5300/Kconfig ============================================================================== --- trunk/src/mainboard/technologic/ts5300/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/technologic/ts5300/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -3,6 +3,7 @@ select ARCH_X86 select CPU_AMD_SC520 select ROMCC + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_128 Modified: trunk/src/mainboard/technologic/ts5300/romstage.c ============================================================================== --- trunk/src/mainboard/technologic/ts5300/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/technologic/ts5300/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -10,7 +10,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "cpu/x86/bist.h" Modified: trunk/src/mainboard/televideo/tc7020/Kconfig ============================================================================== --- trunk/src/mainboard/televideo/tc7020/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/televideo/tc7020/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -40,11 +40,6 @@ default "TC7020" depends on BOARD_TELEVIDEO_TC7020 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_TELEVIDEO_TC7020 - config IRQ_SLOT_COUNT int default 3 Modified: trunk/src/mainboard/thomson/ip1000/Kconfig ============================================================================== --- trunk/src/mainboard/thomson/ip1000/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/thomson/ip1000/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -26,11 +26,6 @@ default "IP1000" depends on BOARD_THOMSON_IP1000 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_THOMSON_IP1000 - config DCACHE_RAM_BASE hex default 0xffdf8000 Modified: trunk/src/mainboard/traverse/geos/Kconfig ============================================================================== --- trunk/src/mainboard/traverse/geos/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/traverse/geos/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -21,11 +21,6 @@ default "Geos" depends on BOARD_TRAVERSE_GEOS -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_TRAVERSE_GEOS - config IRQ_SLOT_COUNT int default 6 Modified: trunk/src/mainboard/tyan/s1846/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s1846/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s1846/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -38,7 +38,3 @@ default "S1846" depends on BOARD_TYAN_S1846 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_TYAN_S1846 Modified: trunk/src/mainboard/tyan/s2735/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2735/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2735/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -6,8 +6,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/tyan/s2850/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2850/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2850/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/tyan/s2850/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2850/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2850/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -7,8 +7,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/tyan/s2875/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2875/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2875/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/tyan/s2875/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2875/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2875/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -7,8 +7,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/tyan/s2880/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2880/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2880/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/tyan/s2880/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2880/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2880/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -7,8 +7,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/tyan/s2881/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2881/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2881/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select SUPERIO_WINBOND_W83627HF select HAVE_BUS_CONFIG select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/tyan/s2881/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2881/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2881/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -11,8 +11,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/tyan/s2882/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2882/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2882/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/tyan/s2882/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2882/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2882/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -7,8 +7,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/tyan/s2885/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2885/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2885/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select SUPERIO_WINBOND_W83627HF select HAVE_BUS_CONFIG select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/tyan/s2885/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2885/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2885/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -6,8 +6,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/tyan/s2891/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2891/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2891/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select SUPERIO_WINBOND_W83627HF select HAVE_BUS_CONFIG select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select SERIAL_CPU_INIT Modified: trunk/src/mainboard/tyan/s2891/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2891/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -12,8 +12,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/tyan/s2892/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2892/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2892/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -9,6 +9,7 @@ select SUPERIO_WINBOND_W83627HF select HAVE_BUS_CONFIG select HAVE_HARD_RESET + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select SERIAL_CPU_INIT Modified: trunk/src/mainboard/tyan/s2892/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2892/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2892/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -11,8 +11,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/tyan/s2895/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2895/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2895/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -8,6 +8,7 @@ select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_SMSC_LPC47B397 select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE Modified: trunk/src/mainboard/tyan/s2895/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2895/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2895/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -13,8 +13,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include <cpu/amd/model_fxx_rev.h> Modified: trunk/src/mainboard/tyan/s2912/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2912/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2912/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/tyan/s2912/ap_romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/ap_romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2912/ap_romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -39,8 +39,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include "pc80/serial.c" #include "console/console.c" Modified: trunk/src/mainboard/tyan/s2912/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2912/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -48,8 +48,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #if CONFIG_USBDEBUG Modified: trunk/src/mainboard/tyan/s2912_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2912_fam10/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -6,6 +6,7 @@ select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_WINBOND_W83627HF select HAVE_BUS_CONFIG + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/tyan/s2912_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s2912_fam10/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -43,7 +43,6 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" #include <console/console.h> #if CONFIG_USBDEBUG #include "southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c" Modified: trunk/src/mainboard/tyan/s4880/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s4880/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s4880/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8111 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/tyan/s4880/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s4880/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s4880/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -7,8 +7,7 @@ #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> #include <stdlib.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/tyan/s4882/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s4882/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s4882/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8111 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR Modified: trunk/src/mainboard/tyan/s4882/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s4882/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/tyan/s4882/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -6,8 +6,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <cpu/x86/lapic.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" Modified: trunk/src/mainboard/via/epia-cn/Kconfig ============================================================================== --- trunk/src/mainboard/via/epia-cn/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/via/epia-cn/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -5,6 +5,7 @@ select NORTHBRIDGE_VIA_CN700 select SOUTHBRIDGE_VIA_VT8237R select SUPERIO_VIA_VT1211 + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/via/epia-m/Kconfig ============================================================================== --- trunk/src/mainboard/via/epia-m/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/via/epia-m/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_RICOH_RL5C476 select SUPERIO_VIA_VT1211 select BOARD_HAS_FADT + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_256 Modified: trunk/src/mainboard/via/epia-m700/Kconfig ============================================================================== --- trunk/src/mainboard/via/epia-m700/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/via/epia-m700/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -5,6 +5,7 @@ select NORTHBRIDGE_VIA_VX800 select SUPERIO_WINBOND_W83697HF select BOARD_HAS_FADT + select HAVE_OPTION_TABLE select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/via/epia-n/Kconfig ============================================================================== --- trunk/src/mainboard/via/epia-n/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/via/epia-n/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -6,6 +6,7 @@ select SOUTHBRIDGE_VIA_VT8237R select SUPERIO_WINBOND_W83697HF select BOARD_HAS_FADT + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select EPIA_VT8237R_INIT Modified: trunk/src/mainboard/via/epia/Kconfig ============================================================================== --- trunk/src/mainboard/via/epia/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/via/epia/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -5,6 +5,7 @@ select NORTHBRIDGE_VIA_VT8601 select SOUTHBRIDGE_VIA_VT8231 select SUPERIO_WINBOND_W83627HF + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_256 select ROMCC Modified: trunk/src/mainboard/via/pc2500e/Kconfig ============================================================================== --- trunk/src/mainboard/via/pc2500e/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/via/pc2500e/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -5,6 +5,7 @@ select NORTHBRIDGE_VIA_CN700 select SOUTHBRIDGE_VIA_VT8237R select SUPERIO_ITE_IT8716F + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select SMP Modified: trunk/src/mainboard/via/pc2500e/romstage.c ============================================================================== --- trunk/src/mainboard/via/pc2500e/romstage.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/via/pc2500e/romstage.c Tue Jul 6 23:05:04 2010 (r5653) @@ -25,8 +25,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" Modified: trunk/src/mainboard/via/vt8454c/Kconfig ============================================================================== --- trunk/src/mainboard/via/vt8454c/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/via/vt8454c/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -5,6 +5,7 @@ select NORTHBRIDGE_VIA_CX700 select SUPERIO_VIA_VT1211 select BOARD_HAS_FADT + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE # select MMCONF_SUPPORT Modified: trunk/src/mainboard/winent/pl6064/Kconfig ============================================================================== --- trunk/src/mainboard/winent/pl6064/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/winent/pl6064/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -22,11 +22,6 @@ default "PL6064" depends on BOARD_WINENT_PL6064 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_WINENT_PL6064 - config IRQ_SLOT_COUNT int default 7 Modified: trunk/src/mainboard/wyse/s50/Kconfig ============================================================================== --- trunk/src/mainboard/wyse/s50/Kconfig Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/mainboard/wyse/s50/Kconfig Tue Jul 6 23:05:04 2010 (r5653) @@ -39,11 +39,6 @@ default "s50" depends on BOARD_WYSE_S50 -config HAVE_OPTION_TABLE - bool - default n - depends on BOARD_WYSE_S50 - config IRQ_SLOT_COUNT int default 3 Modified: trunk/src/northbridge/amd/amdk8/coherent_ht.c ============================================================================== --- trunk/src/northbridge/amd/amdk8/coherent_ht.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/northbridge/amd/amdk8/coherent_ht.c Tue Jul 6 23:05:04 2010 (r5653) @@ -68,6 +68,7 @@ #include <device/hypertransport_def.h> #include <stdlib.h> #include "arch/romcc_io.h" +#include <pc80/mc146818rtc.h> #include "amdk8.h" @@ -1594,8 +1595,7 @@ #if CONFIG_LOGICAL_CPUS==1 unsigned total_cpus; - if ((!CONFIG_HAVE_OPTION_TABLE) || - read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) == 0) { /* multi_core */ + if (read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) == 0) { /* multi_core */ total_cpus = verify_dualcore(nodes); } else { Modified: trunk/src/northbridge/amd/amdk8/raminit.c ============================================================================== --- trunk/src/northbridge/amd/amdk8/raminit.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/northbridge/amd/amdk8/raminit.c Tue Jul 6 23:05:04 2010 (r5653) @@ -549,8 +549,7 @@ if (nbcap & NBCAP_ECC) { dcl |= DCL_DimmEccEn; } - if (CONFIG_HAVE_OPTION_TABLE && - read_option(CMOS_VSTART_ECC_memory, CMOS_VLEN_ECC_memory, 1) == 0) { + if (read_option(CMOS_VSTART_ECC_memory, CMOS_VLEN_ECC_memory, 1) == 0) { dcl &= ~DCL_DimmEccEn; } pci_write_config32(ctrl->f2, DRAM_CONFIG_LOW, dcl); @@ -1102,8 +1101,7 @@ { unsigned long tom_k, base_k; - if ((!CONFIG_HAVE_OPTION_TABLE) || - read_option(CMOS_VSTART_interleave_chip_selects, CMOS_VLEN_interleave_chip_selects, 1) != 0) { + if (read_option(CMOS_VSTART_interleave_chip_selects, CMOS_VLEN_interleave_chip_selects, 1) != 0) { tom_k = interleave_chip_selects(ctrl); } else { printk(BIOS_DEBUG, "Interleaving disabled\n"); @@ -1406,7 +1404,7 @@ min_cycle_time = min_cycle_times[(value >> NBCAP_MEMCLK_SHIFT) & NBCAP_MEMCLK_MASK]; bios_cycle_time = min_cycle_times[ read_option(CMOS_VSTART_max_mem_clock, CMOS_VLEN_max_mem_clock, 0)]; - if (CONFIG_HAVE_OPTION_TABLE && bios_cycle_time > min_cycle_time) { + if (bios_cycle_time > min_cycle_time) { min_cycle_time = bios_cycle_time; } min_latency = 2; Modified: trunk/src/northbridge/intel/i945/raminit.c ============================================================================== --- trunk/src/northbridge/intel/i945/raminit.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/northbridge/intel/i945/raminit.c Tue Jul 6 23:05:04 2010 (r5653) @@ -19,6 +19,7 @@ #include <cpu/x86/mtrr.h> #include <cpu/x86/cache.h> +#include <pc80/mc146818rtc.h> #include <spd.h> #include "raminit.h" #include "i945.h" @@ -2671,7 +2672,7 @@ values[3] |= (reg32 >> (24 - 4)) & 0xf0; /* coreboot only uses bytes 0 - 127 for its CMOS values so far - * so we grad bytes 128 - 131 to save the receive enable values + * so we grab bytes 128 - 131 to save the receive enable values */ for (i=0; i<4; i++) Modified: trunk/src/pc80/Makefile.inc ============================================================================== --- trunk/src/pc80/Makefile.inc Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/pc80/Makefile.inc Tue Jul 6 23:05:04 2010 (r5653) @@ -3,7 +3,7 @@ obj-y += i8259.o obj-$(CONFIG_UDELAY_IO) += udelay_io.o obj-y += keyboard.o - +initobj-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.o initobj-$(CONFIG_USE_DCACHE_RAM) += serial.o subdirs-y += vga Modified: trunk/src/pc80/mc146818rtc.c ============================================================================== --- trunk/src/pc80/mc146818rtc.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/pc80/mc146818rtc.c Tue Jul 6 23:05:04 2010 (r5653) @@ -1,11 +1,7 @@ #include <console/console.h> -#include <arch/io.h> #include <pc80/mc146818rtc.h> #include <boot/coreboot_tables.h> #include <string.h> -#if CONFIG_HAVE_OPTION_TABLE -#include <option_table.h> -#endif /* control registers - Moto names */ @@ -76,29 +72,7 @@ # define RTC_VRT 0x80 /* valid RAM and time */ /**********************************************************************/ -static inline unsigned char cmos_read(unsigned char addr) -{ - int offs = 0; - if (addr >= 128) { - offs = 2; - addr -= 128; - } - outb(addr, RTC_BASE_PORT + offs + 0); - return inb(RTC_BASE_PORT + offs + 1); -} - -static inline void cmos_write(unsigned char val, unsigned char addr) -{ - int offs = 0; - if (addr >= 128) { - offs = 2; - addr -= 128; - } - outb(addr, RTC_BASE_PORT + offs + 0); - outb(val, RTC_BASE_PORT + offs + 1); -} - -#if CONFIG_HAVE_OPTION_TABLE +#if CONFIG_USE_OPTION_TABLE static int rtc_checksum_valid(int range_start, int range_end, int cks_loc) { int i; @@ -138,14 +112,14 @@ void rtc_init(int invalid) { -#if CONFIG_HAVE_OPTION_TABLE +#if CONFIG_USE_OPTION_TABLE unsigned char x; int cmos_invalid, checksum_invalid; #endif printk(BIOS_DEBUG, "RTC Init\n"); -#if CONFIG_HAVE_OPTION_TABLE +#if CONFIG_USE_OPTION_TABLE /* See if there has been a CMOS power problem. */ x = cmos_read(RTC_VALID); cmos_invalid = !(x & RTC_VRT); @@ -186,7 +160,7 @@ /* Setup the frequency it operates at */ cmos_write(RTC_FREQ_SELECT_DEFAULT, RTC_FREQ_SELECT); -#if CONFIG_HAVE_OPTION_TABLE +#if CONFIG_USE_OPTION_TABLE /* See if there is a LB CMOS checksum error */ checksum_invalid = !rtc_checksum_valid(LB_CKS_RANGE_START, LB_CKS_RANGE_END,LB_CKS_LOC); @@ -203,7 +177,7 @@ } -#if CONFIG_USE_OPTION_TABLE == 1 +#if CONFIG_USE_OPTION_TABLE /* This routine returns the value of the requested bits input bit = bit count from the beginning of the cmos image length = number of bits to include in the value Modified: trunk/src/pc80/mc146818rtc_early.c ============================================================================== --- trunk/src/pc80/mc146818rtc_early.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/pc80/mc146818rtc_early.c Tue Jul 6 23:05:04 2010 (r5653) @@ -1,8 +1,5 @@ #include <pc80/mc146818rtc.h> #include <fallback.h> -#if CONFIG_HAVE_OPTION_TABLE -#include <option_table.h> -#endif #ifndef CONFIG_MAX_REBOOT_CNT #error "CONFIG_MAX_REBOOT_CNT not defined" @@ -11,28 +8,6 @@ #error "CONFIG_MAX_REBOOT_CNT too high" #endif -static unsigned char cmos_read(unsigned char addr) -{ - int offs = 0; - if (addr >= 128) { - offs = 2; - addr -= 128; - } - outb(addr, RTC_BASE_PORT + offs + 0); - return inb(RTC_BASE_PORT + offs + 1); -} - -static void cmos_write(unsigned char val, unsigned char addr) -{ - int offs = 0; - if (addr >= 128) { - offs = 2; - addr -= 128; - } - outb(addr, RTC_BASE_PORT + offs + 0); - outb(val, RTC_BASE_PORT + offs + 1); -} - static int cmos_error(void) { unsigned char reg_d; @@ -43,7 +18,7 @@ static int cmos_chksum_valid(void) { -#if CONFIG_HAVE_OPTION_TABLE == 1 +#if CONFIG_USE_OPTION_TABLE unsigned char addr; unsigned long sum, old_sum; sum = 0; @@ -114,9 +89,9 @@ return (byte & (1<<1)); } -static inline unsigned read_option(unsigned start, unsigned size, unsigned def) +unsigned read_option(unsigned start, unsigned size, unsigned def) { -#if CONFIG_USE_OPTION_TABLE == 1 +#if CONFIG_USE_OPTION_TABLE unsigned byte; byte = cmos_read(start/8); return (byte >> (start & 7U)) & ((1U << size) - 1U); Modified: trunk/src/pc80/serial.c ============================================================================== --- trunk/src/pc80/serial.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/src/pc80/serial.c Tue Jul 6 23:05:04 2010 (r5653) @@ -1,5 +1,6 @@ #include <lib.h> /* Prototypes */ #include <arch/io.h> +#include "pc80/mc146818rtc.h" /* Base Address */ #ifndef CONFIG_TTYS0_BASE @@ -80,7 +81,7 @@ outb(0x01, CONFIG_TTYS0_BASE + UART_FCR); /* Set Baud Rate Divisor to 12 ==> 115200 Baud */ outb(0x80 | UART_LCS, CONFIG_TTYS0_BASE + UART_LCR); -#if CONFIG_USE_OPTION_TABLE == 1 +#if CONFIG_USE_OPTION_TABLE static const unsigned char divisor[] = { 1,2,3,6,12,24,48,96 }; unsigned ttys0_div, ttys0_index; ttys0_index = read_option(CMOS_VSTART_baud_rate, CMOS_VLEN_baud_rate, 0); @@ -101,7 +102,7 @@ extern void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs); void uart_init(void) { -#if CONFIG_USE_OPTION_TABLE == 1 +#if CONFIG_USE_OPTION_TABLE static const unsigned char divisor[] = { 1,2,3,6,12,24,48,96 }; unsigned ttys0_div, ttys0_index; ttys0_index = read_option(CMOS_VSTART_baud_rate, CMOS_VLEN_baud_rate, 0); Modified: trunk/util/options/build_opt_tbl.c ============================================================================== --- trunk/util/options/build_opt_tbl.c Tue Jul 6 22:36:36 2010 (r5652) +++ trunk/util/options/build_opt_tbl.c Tue Jul 6 23:05:04 2010 (r5653) @@ -25,6 +25,7 @@ #include <ctype.h> #include <errno.h> #include <libgen.h> +#define UTIL_BUILD_OPTION_TABLE #include "../../src/include/pc80/mc146818rtc.h" #include "../../src/include/boot/coreboot_tables.h"
participants (1)
-
repository service