Re-integrate "USE_OPTION_TABLE" code.
authorEdwin Beasant <edwin_beasant@virtensys.com>
Tue, 6 Jul 2010 21:05:04 +0000 (21:05 +0000)
committerMyles Watson <mylesgw@gmail.com>
Tue, 6 Jul 2010 21:05:04 +0000 (21:05 +0000)
Signed-off-by: Edwin Beasant <edwin_beasant@virtensys.com>
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5653 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

224 files changed:
src/Kconfig
src/arch/i386/boot/coreboot_table.c
src/arch/i386/init/bootblock_normal.c
src/cpu/amd/dualcore/dualcore.c
src/cpu/amd/model_10xxx/init_cpus.c
src/cpu/amd/model_fxx/init_cpus.c
src/cpu/amd/quadcore/quadcore.c
src/include/pc80/mc146818rtc.h
src/mainboard/a-trend/atc-6220/Kconfig
src/mainboard/a-trend/atc-6240/Kconfig
src/mainboard/abit/be6-ii_v2_0/Kconfig
src/mainboard/advantech/pcm-5820/Kconfig
src/mainboard/amd/db800/Kconfig
src/mainboard/amd/dbm690t/Kconfig
src/mainboard/amd/dbm690t/romstage.c
src/mainboard/amd/mahogany/Kconfig
src/mainboard/amd/mahogany/romstage.c
src/mainboard/amd/mahogany_fam10/Kconfig
src/mainboard/amd/mahogany_fam10/romstage.c
src/mainboard/amd/norwich/Kconfig
src/mainboard/amd/pistachio/Kconfig
src/mainboard/amd/pistachio/romstage.c
src/mainboard/amd/rumba/Kconfig
src/mainboard/amd/serengeti_cheetah/Kconfig
src/mainboard/amd/serengeti_cheetah/ap_romstage.c
src/mainboard/amd/serengeti_cheetah/romstage.c
src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
src/mainboard/amd/tilapia_fam10/Kconfig
src/mainboard/amd/tilapia_fam10/romstage.c
src/mainboard/arima/hdama/Kconfig
src/mainboard/arima/hdama/romstage.c
src/mainboard/artecgroup/dbe61/Kconfig
src/mainboard/asi/mb_5blgp/Kconfig
src/mainboard/asi/mb_5blmp/Kconfig
src/mainboard/asrock/939a785gmh/Kconfig
src/mainboard/asrock/939a785gmh/romstage.c
src/mainboard/asus/a8n_e/Kconfig
src/mainboard/asus/a8n_e/romstage.c
src/mainboard/asus/a8v-e_se/Kconfig
src/mainboard/asus/a8v-e_se/romstage.c
src/mainboard/asus/m2v-mx_se/romstage.c
src/mainboard/asus/mew-am/Kconfig
src/mainboard/asus/mew-vm/Kconfig
src/mainboard/asus/p2b-d/Kconfig
src/mainboard/asus/p2b-ds/Kconfig
src/mainboard/asus/p2b-f/Kconfig
src/mainboard/asus/p2b-ls/Kconfig
src/mainboard/asus/p2b/Kconfig
src/mainboard/asus/p3b-f/Kconfig
src/mainboard/axus/tc320/Kconfig
src/mainboard/azza/pt-6ibd/Kconfig
src/mainboard/bcom/winnet100/Kconfig
src/mainboard/bcom/winnetp680/Kconfig
src/mainboard/biostar/m6tba/Kconfig
src/mainboard/broadcom/blast/Kconfig
src/mainboard/broadcom/blast/romstage.c
src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
src/mainboard/dell/s1850/Kconfig
src/mainboard/dell/s1850/romstage.c
src/mainboard/digitallogic/adl855pc/Kconfig
src/mainboard/digitallogic/adl855pc/romstage.c
src/mainboard/digitallogic/msm586seg/Kconfig
src/mainboard/digitallogic/msm586seg/romstage.c
src/mainboard/digitallogic/msm800sev/Kconfig
src/mainboard/eaglelion/5bcm/Kconfig
src/mainboard/ecs/p6iwp-fe/Kconfig
src/mainboard/emulation/qemu-x86/Kconfig
src/mainboard/emulation/qemu-x86/romstage.c
src/mainboard/getac/p470/Kconfig
src/mainboard/getac/p470/romstage.c
src/mainboard/gigabyte/ga-6bxc/Kconfig
src/mainboard/gigabyte/ga-6bxe/Kconfig
src/mainboard/gigabyte/ga_2761gxdk/Kconfig
src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c
src/mainboard/gigabyte/ga_2761gxdk/romstage.c
src/mainboard/gigabyte/m57sli/Kconfig
src/mainboard/gigabyte/m57sli/ap_romstage.c
src/mainboard/gigabyte/m57sli/romstage.c
src/mainboard/hp/dl145_g3/Kconfig
src/mainboard/hp/dl145_g3/romstage.c
src/mainboard/hp/e_vectra_p2706t/Kconfig
src/mainboard/ibase/mb899/Kconfig
src/mainboard/ibase/mb899/romstage.c
src/mainboard/ibm/e325/Kconfig
src/mainboard/ibm/e325/romstage.c
src/mainboard/ibm/e326/Kconfig
src/mainboard/ibm/e326/romstage.c
src/mainboard/iei/pcisa-lx-800-r10/Kconfig
src/mainboard/intel/d810e2cb/Kconfig
src/mainboard/intel/d945gclf/Kconfig
src/mainboard/intel/d945gclf/romstage.c
src/mainboard/intel/eagleheights/Kconfig
src/mainboard/intel/eagleheights/romstage.c
src/mainboard/intel/jarrell/Kconfig
src/mainboard/intel/jarrell/romstage.c
src/mainboard/intel/mtarvon/Kconfig
src/mainboard/intel/mtarvon/romstage.c
src/mainboard/intel/truxton/Kconfig
src/mainboard/intel/truxton/romstage.c
src/mainboard/intel/xe7501devkit/Kconfig
src/mainboard/intel/xe7501devkit/romstage.c
src/mainboard/iwill/dk8_htx/Kconfig
src/mainboard/iwill/dk8_htx/romstage.c
src/mainboard/iwill/dk8s2/Kconfig
src/mainboard/iwill/dk8s2/romstage.c
src/mainboard/iwill/dk8x/Kconfig
src/mainboard/iwill/dk8x/romstage.c
src/mainboard/jetway/j7f24/Kconfig
src/mainboard/kontron/986lcd-m/Kconfig
src/mainboard/kontron/986lcd-m/romstage.c
src/mainboard/kontron/kt690/Kconfig
src/mainboard/kontron/kt690/romstage.c
src/mainboard/lippert/frontrunner/Kconfig
src/mainboard/lippert/roadrunner-lx/Kconfig
src/mainboard/lippert/spacerunner-lx/Kconfig
src/mainboard/mitac/6513wu/Kconfig
src/mainboard/msi/ms6119/Kconfig
src/mainboard/msi/ms6147/Kconfig
src/mainboard/msi/ms6156/Kconfig
src/mainboard/msi/ms6178/Kconfig
src/mainboard/msi/ms7135/Kconfig
src/mainboard/msi/ms7135/romstage.c
src/mainboard/msi/ms7260/Kconfig
src/mainboard/msi/ms7260/ap_romstage.c
src/mainboard/msi/ms7260/romstage.c
src/mainboard/msi/ms9185/Kconfig
src/mainboard/msi/ms9185/romstage.c
src/mainboard/msi/ms9282/Kconfig
src/mainboard/msi/ms9282/romstage.c
src/mainboard/msi/ms9652_fam10/Kconfig
src/mainboard/msi/ms9652_fam10/romstage.c
src/mainboard/nec/powermate2000/Kconfig
src/mainboard/newisys/khepri/Kconfig
src/mainboard/newisys/khepri/romstage.c
src/mainboard/nokia/ip530/Kconfig
src/mainboard/nvidia/l1_2pvv/Kconfig
src/mainboard/nvidia/l1_2pvv/ap_romstage.c
src/mainboard/nvidia/l1_2pvv/romstage.c
src/mainboard/olpc/btest/Kconfig
src/mainboard/olpc/rev_a/Kconfig
src/mainboard/pcengines/alix1c/Kconfig
src/mainboard/rca/rm4100/Kconfig
src/mainboard/roda/rk886ex/Kconfig
src/mainboard/roda/rk886ex/romstage.c
src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
src/mainboard/sunw/ultra40/Kconfig
src/mainboard/sunw/ultra40/romstage.c
src/mainboard/supermicro/h8dme/Kconfig
src/mainboard/supermicro/h8dme/ap_romstage.c
src/mainboard/supermicro/h8dme/romstage.c
src/mainboard/supermicro/h8dmr/Kconfig
src/mainboard/supermicro/h8dmr/ap_romstage.c
src/mainboard/supermicro/h8dmr/romstage.c
src/mainboard/supermicro/h8dmr_fam10/Kconfig
src/mainboard/supermicro/h8dmr_fam10/romstage.c
src/mainboard/supermicro/h8qme_fam10/Kconfig
src/mainboard/supermicro/h8qme_fam10/romstage.c
src/mainboard/supermicro/x6dai_g/Kconfig
src/mainboard/supermicro/x6dai_g/romstage.c
src/mainboard/supermicro/x6dhe_g/Kconfig
src/mainboard/supermicro/x6dhe_g/romstage.c
src/mainboard/supermicro/x6dhe_g2/Kconfig
src/mainboard/supermicro/x6dhe_g2/romstage.c
src/mainboard/supermicro/x6dhr_ig/Kconfig
src/mainboard/supermicro/x6dhr_ig/romstage.c
src/mainboard/supermicro/x6dhr_ig2/Kconfig
src/mainboard/supermicro/x6dhr_ig2/romstage.c
src/mainboard/technexion/tim5690/Kconfig
src/mainboard/technexion/tim5690/romstage.c
src/mainboard/technexion/tim8690/Kconfig
src/mainboard/technexion/tim8690/romstage.c
src/mainboard/technologic/ts5300/Kconfig
src/mainboard/technologic/ts5300/romstage.c
src/mainboard/televideo/tc7020/Kconfig
src/mainboard/thomson/ip1000/Kconfig
src/mainboard/traverse/geos/Kconfig
src/mainboard/tyan/s1846/Kconfig
src/mainboard/tyan/s2735/romstage.c
src/mainboard/tyan/s2850/Kconfig
src/mainboard/tyan/s2850/romstage.c
src/mainboard/tyan/s2875/Kconfig
src/mainboard/tyan/s2875/romstage.c
src/mainboard/tyan/s2880/Kconfig
src/mainboard/tyan/s2880/romstage.c
src/mainboard/tyan/s2881/Kconfig
src/mainboard/tyan/s2881/romstage.c
src/mainboard/tyan/s2882/Kconfig
src/mainboard/tyan/s2882/romstage.c
src/mainboard/tyan/s2885/Kconfig
src/mainboard/tyan/s2885/romstage.c
src/mainboard/tyan/s2891/Kconfig
src/mainboard/tyan/s2891/romstage.c
src/mainboard/tyan/s2892/Kconfig
src/mainboard/tyan/s2892/romstage.c
src/mainboard/tyan/s2895/Kconfig
src/mainboard/tyan/s2895/romstage.c
src/mainboard/tyan/s2912/Kconfig
src/mainboard/tyan/s2912/ap_romstage.c
src/mainboard/tyan/s2912/romstage.c
src/mainboard/tyan/s2912_fam10/Kconfig
src/mainboard/tyan/s2912_fam10/romstage.c
src/mainboard/tyan/s4880/Kconfig
src/mainboard/tyan/s4880/romstage.c
src/mainboard/tyan/s4882/Kconfig
src/mainboard/tyan/s4882/romstage.c
src/mainboard/via/epia-cn/Kconfig
src/mainboard/via/epia-m/Kconfig
src/mainboard/via/epia-m700/Kconfig
src/mainboard/via/epia-n/Kconfig
src/mainboard/via/epia/Kconfig
src/mainboard/via/pc2500e/Kconfig
src/mainboard/via/pc2500e/romstage.c
src/mainboard/via/vt8454c/Kconfig
src/mainboard/winent/pl6064/Kconfig
src/mainboard/wyse/s50/Kconfig
src/northbridge/amd/amdk8/coherent_ht.c
src/northbridge/amd/amdk8/raminit.c
src/northbridge/intel/i945/raminit.c
src/pc80/Makefile.inc
src/pc80/mc146818rtc.c
src/pc80/mc146818rtc_early.c
src/pc80/serial.c
util/options/build_opt_tbl.c

index afddca93754be0d806f19f3f4a9e6943b01572c0..fd1ed1aa5a665629471795cf4e9b4027e7ec93e0 100644 (file)
@@ -83,6 +83,7 @@ config CCACHE
 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 @@ config HAVE_MAINBOARD_RESOURCES
        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
index 8053fc1333608ba97f4185890c1f287fb27bf31f..f44e3dd5007ef9cdaa97a5bc76b9e21f0d34caee 100644 (file)
@@ -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 @@ static struct lb_mainboard *lb_mainboard(struct lb_header *header)
        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 @@ unsigned long write_coreboot_table(
        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... */
index 0e5bd25556d88f30a860a8be37b38cc440e3ce3b..1f3f6c2ea58a3902e10b176452844774c1e3cb71 100644 (file)
@@ -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)
 {
index 99a0dbbb8be822b12d430120caf4a727d3810d27..f13a62cbe7fa01bf09e8b158e2e8863145a6ab72 100644 (file)
@@ -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 @@ static inline void start_other_cores(void)
        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
        }
 
index 48a32f8e2646f0de6517a54ed9329eb80fd4e289..43a62256f5eea2f5174746625d08fb4936a024d5 100644 (file)
@@ -109,13 +109,12 @@ static void for_each_ap(u32 bsp_apicid, u32 core_range, process_ap_t process_ap,
        /* 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 */
index fb8fbaa9d29676047e41a1d6233cd9f665d782c4..3fad4e19e33af8714b9edb12799676ab5ad0753f 100644 (file)
@@ -36,13 +36,12 @@ static void for_each_ap(u32 bsp_apicid, u32 core_range, process_ap_t process_ap,
        /* 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();
index cb256c4d7dbda303876aa270ef6475cdddb748ef..e0659892ef9fe8ee5aef9746fc5d5ec4af615cd3 100644 (file)
@@ -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
index cd8c8181aa8154e6948d4444dd95b19d83575a7f..0abb2a6b4b5f91437f9c3d5a6ca7631402dcc687 100644 (file)
  * 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 */
index 36c7b7c81493823adb84e6f96daff99f8f8d4453..41325289015811a6706bce4627286f2518a73cb1 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index 54aa628d318984d2750e04d316281da58edfb050..6295b46ae698139f9f41c369da7a69177186b828 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index e28e678ef6193fac0f9d53d6ab906a3d6cfeaaa1..851820e0ca1e33d4714c35a4948cf055e5c3978e 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index ecf32faebc3704f9458e5e9473d503d9d8d84a78..9b79e59a081f87f7c5567a54bbd6695558d28156 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index 95cd0e7b978cac3c8257bab8a68b76106510d8ce..e25af727ef6a445d25178393d49b44d78cf623af 100644 (file)
@@ -22,11 +22,6 @@ config MAINBOARD_PART_NUMBER
        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
index 0ba834dcc97a07010adc708834ef030356cbb8a0..3071da61a5747d376eedb0eb7550489951201e62 100644 (file)
@@ -11,6 +11,7 @@ config BOARD_AMD_DBM690T
        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
index 005de2c4094afedb613347abc5cfa301c0f32fbc..5988b75cd7b1855ec08a7c4f71b8ebbb52d7e71e 100644 (file)
@@ -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>
index 2723da112652ac9ac88473cb24528ef15ea5dfc2..f159ad325fcc3cda6ebb7deea5e89af49c736175 100644 (file)
@@ -11,6 +11,7 @@ config BOARD_AMD_MAHOGANY
        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
index af0b5cd163fbdf633602555b4016eca972a18dde..1b3275599e7b5ed0de0b446dddd69004f19bf621 100644 (file)
@@ -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>
index 339b9e81db49f972bdc268286eaff35f915e82aa..8c66e4663056a4f8f38a6a38aa99ff4841d2acc7 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_AMD_MAHOGANY_FAM10
        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
index fa08e357b30dcfefbe26b11d235239230734b77f..707d7f2a7bda1fb6469b424805812e4d5d0a5d98 100644 (file)
@@ -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>
index 007d8502d2125244f5bff717a177f2cd1e9613f7..2dd968882cd073ad927cb834a8d34fb433c61564 100644 (file)
@@ -21,11 +21,6 @@ config MAINBOARD_PART_NUMBER
        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
index 9e866b23e491cd7976b3925c2bce6707e382efd7..a15163db2324a7a228ab460294e88d6bd49dfb8d 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_AMD_PISTACHIO
        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
index 58806e8ba90ffdb249bd1f2aa040d8d78f548670..182fab8a0b958c12d18bc92b6d9475e5b41a38d1 100644 (file)
@@ -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>
index 20aa08a431edb4fe4361401720746fde6fc3728d..98bea7e33c825462579fa03736436f276f5af5b0 100644 (file)
@@ -38,11 +38,6 @@ config MAINBOARD_PART_NUMBER
        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
index 9aba165cc2a8dee8d2653456b5f68bc67a7c12da..2640d231ff382f14f41bdabeafe2a1f1fe5a3ea0 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_AMD_SERENGETI_CHEETAH
        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
index f132ec727cc5f158803c8a78710a078230314661..3d7a514dea1c84ab49e65343f7b16faa0fb26fa3 100644 (file)
@@ -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"
 
index f89ea846abc2dce221e7c9eddde9825e01ea78d4..65cabe9a4ff6a76402e0fd852459b2e2cdfb6aa7 100644 (file)
@@ -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>
index 94a44ea57931b1943c0bc54ac14871c5f589174a..a25bac4ae9299402fc03932de2e0b73aff8f4512 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_AMD_SERENGETI_CHEETAH_FAM10
        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
index 038fbedff9129d4512c0f862de94d9f4c7fe8b70..742700575b422168c44a37d3e81ada52edcdff32 100644 (file)
@@ -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>
index 1a6c59e3c02077cd9e63510b6feb2887ef248a35..ca527b5783812e6ea9dad4cc60c3ba9f020dbf3e 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_AMD_TILAPIA_FAM10
        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
index d8458d7fb17ed64da815a15ddc821797cfb23d74..70ba6a7e00beaf6ac70c5c743d0a532136d07d4f 100644 (file)
@@ -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>
index 521f7ff491e4286a60655eb5803f82ed1d0931cc..6b2e5947de26f822af40039791daa8a79a4bda17 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_ARIMA_HDAMA
        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
index cdbea42bde222c892f1acb12041ac34cad1f0563..78332f838a92ad55865bf3796a415443b787e2c0 100644 (file)
@@ -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"
 
index 6803b93756674171950370c03fc87567c82bb2b2..dfb82c695c30c3f734e0d011ea431945f6c9e057 100644 (file)
@@ -21,11 +21,6 @@ config MAINBOARD_PART_NUMBER
        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
index bce92ab8939030c2753ab09e28cf8ad7268b6f93..1734536f383e9ceac83c59ec433290c79023c5c2 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index 76706b1e4eb1510ecaeb116a681b26671b804b90..6434c7878bfdb6d1d1a05cd59fbfe8de314031e8 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index 6736e30c0c32ab6c147ffc502fd9fd345c23b5c6..2ff4a43a606ca1f3a39bd89bd00c65f74c2806eb 100644 (file)
@@ -13,6 +13,7 @@ config BOARD_ASROCK_939A785GMH
        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
index 8060b4a3d65dc91bcd83a41e3573ba758760f67c..76c4414b75215c656cd931806305460f62240035 100644 (file)
@@ -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>
index 19a6d86a3e24702905bb436fc0e6567362ca4024..a624e2b01122ec4bcdeacd30d7ffe585d46934ee 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_ASUS_A8N_E
        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
index 8f2d6ba3dc7645a39130bbb5b51322dbe7b8f78b..4b101d1c9cb50b0d31d786b102de28ce327d788e 100644 (file)
@@ -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"
index d0dfaf50fd7b6828c70145f2b274cbd9f04b5d28..f794b2a9f38bac59b05290fd907b115d5082f652 100644 (file)
@@ -10,6 +10,7 @@ config BOARD_ASUS_A8V_E_SE
        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
index 4bed32b02ce457161de1f1add17afe93c4041c59..1f56947eed4a659d75ac620b5b24efaa00d1650b 100644 (file)
@@ -44,8 +44,7 @@ unsigned int get_sbdn(unsigned bus);
 #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"
index 2ee0fb0ef9c3728baaa4b4839c74ddef09a6b158..03086ec1283c6302b2493d67ad368063bddb37ff 100644 (file)
@@ -49,8 +49,7 @@ unsigned int get_sbdn(unsigned bus);
 #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"
index c0a5da9875e0169ce3ebcd30160bb1ae39ae5ca6..fc0691cb079daa82e6bccaaccf5bdd761063759f 100644 (file)
@@ -41,11 +41,6 @@ config MAINBOARD_PART_NUMBER
        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
index cab90cc46aea23d709bb0790612b52904f816fa8..886bb5b2ab7d8e03f1572cf65296f74e9bd536c7 100644 (file)
@@ -25,6 +25,7 @@ config BOARD_ASUS_MEW_VM
        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
index 1847c798504aed6b467af8daa49408a77dd59d6d..db9b3e895f39ece58dce3a3f82568c25551740ca 100644 (file)
@@ -42,11 +42,6 @@ config MAINBOARD_PART_NUMBER
        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
index 1448d8146d403fb7216eb6d5545d43f5aabc5eea..23a96facab9fb73d3fc6f73b6f1f7e28f9fac0df 100644 (file)
@@ -42,11 +42,6 @@ config MAINBOARD_PART_NUMBER
        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
index 0de9b252a638d362f160e53ee25db3e0c6acefad..bddc276179862774d1c27046543f3a5918c070eb 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index 5b836d098693a381bfabc927d6012965b5869b96..181d1b4cec157888d527ec2c1ac97297e16602d4 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index d60267be35cfcc10c29466034b2100e94cd51684..b5ae83e475f315e70477e8d762ef8bf0c6a7567c 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index fb3fda8e9b28db480c22686f5886dcef65931ff9..5815f6b0876ec3b04fe9cd93c83b4bb39a2d9eff 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index b391f798e077513fe8c319e173c5874cf3396174..6ff4d4f27fef6f4375cd419e4a1d285a41e65572 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index 7c40b6f42795fc9ebc442dc697488f11fdae10f8..74adf71a3b340b91d7cf0a62f5900e0731c7dec3 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index 7518c4bc9f6eee8dc574332216ea022e05647c2e..14979e8fc51066b200b21e3e868580e6e0393da2 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index 0bc7b2f12b2cf9c29a84388cc65a5adb7f2da740..d02bcfbcf19c2623220e70095929206255f363aa 100644 (file)
@@ -6,6 +6,7 @@ config BOARD_BCOM_WINNETP680
        select SOUTHBRIDGE_VIA_VT8237R
        select SUPERIO_WINBOND_W83697HF
        select HAVE_PIRQ_TABLE
+       select HAVE_OPTION_TABLE
        select UDELAY_TSC
        select BOARD_ROMSIZE_KB_512
 
index cf98c86f69dc8b8a1b2767be4c5c9381388aaa7e..f96333206c9bb20e63d6c9f8f191f935700d575d 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index d2408a36bd2db28dc2c6bd343a2d16040229be1e..bd9573411fdb975fe028492826ac8c1a99aacff6 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_BROADCOM_BLAST
        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
index ada56b0016afb9f860db4f253b48ded6b3e530a5..47b9fd24d749f13c222105de2991a5f48d991a67 100644 (file)
@@ -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"
 
index 1c79a7924bf93b12e820a1cc66fb840bc112dff4..f4701baa19ff969122d8b434d0f186959f547038 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index 7ac83f254d6d974fe2c896d2e08cbe8a1ad8fbb6..1b0b27bdec583b7410e2ff23a07b281e817ddd67 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_DELL_S1850
        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
index b45fe90d582a82866d6c3aed5f734e33c0b6374c..c2533d72e5027d308db27e1c1549649c32361fe4 100644 (file)
@@ -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"
index 78da8f1b1b9b02ff5a64f529cf9598f05edd2169..31b27ed17a9567e79d517c10caf4d1cea3369254 100644 (file)
@@ -5,6 +5,7 @@ config BOARD_DIGITALLOGIC_ADL855PC
        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
index 424b2e1ed944c85e86c1ce2c0fde67e9380fb4cc..097ecde8f1b8c24c5445f7027474736443dda27d 100644 (file)
@@ -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"
index e667a03fef2241809a08411ae1d950c12a030b57..5f1abe3e5287de0a19ba968abc05d005c7badaa2 100644 (file)
@@ -3,6 +3,7 @@ config BOARD_DIGITALLOGIC_MSM586SEG
        select ARCH_X86
        select CPU_AMD_SC520
        select HAVE_PIRQ_TABLE
+       select HAVE_OPTION_TABLE
        select BOARD_ROMSIZE_KB_512
        select ROMCC
 
index c93648f60d705615d45aa2f611becec86e27a1c7..7fbf9d39b63e97adc48388781029858a775e176a 100644 (file)
@@ -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"
index 06ac45645fe0b89af73df073199411a68721bad0..4e89beb3937416dddd6265b168c0c8a3a35a9959 100644 (file)
@@ -22,11 +22,6 @@ config MAINBOARD_PART_NUMBER
        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
index 2770aa7f9bf3b5736ca40695b4b243de71b84025..0fbd990264a7144d0241a0095629b07a2c503929 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index bb2a06daddc8ce37aadf3e0b06b5db82e760261a..5748a5712a393bc964c55f70712f6e168792ae2b 100644 (file)
@@ -42,11 +42,6 @@ config MAINBOARD_PART_NUMBER
        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
index 27a334d073a8e89bd5f7f2a0ce9d060d556eda45..72f3c273c665ab0a7129a5491fd8070bfabd316c 100644 (file)
@@ -3,6 +3,7 @@ config BOARD_EMULATION_QEMU_X86
        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
index 7460a7bde1bf0bdff85c4e4d5690057822db05a6..6f78dea9685fdffdeb2bb533b4aebf840ac8bcfe 100644 (file)
@@ -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"
index 1c94c263ab219c5d9df1bd6f4867b086cad178e9..fb117b316b6048e253928bc26d773b1e80b97752 100644 (file)
@@ -31,6 +31,7 @@ config BOARD_GETAC_P470
        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
index c3a0b767133bb9197359badab428ef0c98b74649..451f5d9d8a50b9c965c88952284cc5f949064bf6 100644 (file)
@@ -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>
index 184ed729ed4b7b6355ac85288253a3ba7535bcd5..46c76475ccde394c416923a73fff026ec8ea62fd 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index 01106f285ad5fac078fcbda20aed4c1d63df680c..dc8e6bece6eba4960dfc9c9a226e8aec9083221b 100644 (file)
@@ -41,11 +41,6 @@ config MAINBOARD_PART_NUMBER
        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
index 728c40caf9e2faf604e4fdddef1a76cf34df1344..549dbfea75b61476faefbbcfa31fa29737aab6cd 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_GIGABYTE_GA_2761GXDK
        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
index a7a4dbdfaae80079be74630ab48106f9d2892c17..7644ab49ba593bbf2aa5b28362f89adc5dfc6e72 100644 (file)
@@ -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"
index 5162000b0550cdb768907d740a182cd5ca8696a6..bcead81e9e338da590c8f7e49b96fd585724c386 100644 (file)
@@ -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
index b36261e53344fa76daf7bc18ffd7ddc3e79233fd..6f7635ef08f1467061689449da15bcdb4055e487 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_GIGABYTE_M57SLI
        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
index 61ca908248dfc405399ee7feab4128306564b6dd..d429b4cd3124d2ee16ac459247a69b3ab34abacc 100644 (file)
@@ -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"
index 18c6e9280e4262e4eca034a6af88387b9d07d56d..e37d81e8a0481b61eab93b0998564927c3af311f 100644 (file)
@@ -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
index 3d70aac6d74c973239ca45cc221a6e82fb19ae46..ee7bca4e9fb3f2ee5fa2c50bc608dc746c27f81e 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_HP_DL145_G3
        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
index dec92c3ec817543e6a3931795022caedeb1174e0..fb0d5eb5d5a3ea74ea97a16d4ecafce5accfa7b2 100644 (file)
@@ -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"
index 67118c0793576d5b2c01d8ce174ccd6c6379f6af..57131e94b019ba27e930bf2025b7b981d9800b9a 100644 (file)
@@ -44,11 +44,6 @@ config MAINBOARD_PART_NUMBER
        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
index 2875973dea2129c898cd296db2f81243e7fe47f6..77c0eb177e127510ccc9b9053b8116af70b89424 100644 (file)
@@ -11,6 +11,7 @@ config BOARD_IBASE_MB899
        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
index dc10e4cbdb664c73016b654973e95db8898e5f4d..8d4ca81254283cad1a16c0bd047081719208ce13 100644 (file)
@@ -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>
index c0e5ebe014f249721b1ed4f7e28255591a6334ce..e8c068965cf99a6a51b6767457b06860d0fca30f 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_IBM_E325
        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
index a63f9587f7c876664f86627554c2fc7b9ef83d37..a05feea6b8e31e97ff8d342156680edfe7464baa 100644 (file)
@@ -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"
 
index 48b8f72f95442a419c0a65ee6d3429d6d2823134..e1b53ec3afa8c45903e7cfb105939f7e60252ac8 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_IBM_E326
        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
index db2439a55a7ce361e33b88038d154dbfc721324e..859368962027a7d2aba1549a055cf89d9dd84684 100644 (file)
@@ -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"
 
index 2678c149b1ce5d8d0b65caeb59f842c53586e489..c1116343ecab46bb324154fba24d3378a3625dec 100644 (file)
@@ -21,11 +21,6 @@ config MAINBOARD_PART_NUMBER
        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
index a74d3748406b19ca8a116efe03e862276759da53..4df00c966281fbb1e4d2df5668a4eae33c6c3e82 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index b9c396da61d0347722fb21832f7b216db90ffec8..61b7340dbfa4565d03087bbfa230ca66641cb3d8 100644 (file)
@@ -29,6 +29,7 @@ config BOARD_INTEL_D945GCLF
        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
index 6f32fe5f86768ab33a2e2e92aa5d6db62f9dbf11..43681a2d14f64132e8524db68e8c54097ff4c852 100644 (file)
@@ -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>
index d04e79eafea4dc574e3778fb9de575f76be7db12..dbb7d164e9af585c5b617ada1061b9d0487e343d 100644 (file)
@@ -6,6 +6,7 @@ config BOARD_INTEL_EAGLEHEIGHTS
        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
index cc6966b074f17e844bfe2332590396f736e718d9..1d7c8d50281afe01282280a7024473549efc8251 100644 (file)
@@ -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>
index e5d5314f97f88f7769b9ffc86211ff465bbad70d..aef112c9ba43ef7182044efb80d20eec34a2d05c 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_INTEL_JARRELL
        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
index b6e74fac08be41f641095119e22e44db43efa5fc..1caf4b9548a0906936bf6d3fb94d78d3ef52a4b2 100644 (file)
@@ -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"
index cea70b1054d4b835c389512b92b0beb63aabe725..ce9d9a4f0cbd4e22d719be3917ddb3584458ba55 100644 (file)
@@ -22,11 +22,6 @@ config MAINBOARD_PART_NUMBER
        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
index 51df42d9f58e7e31a0b7797aed70a051a201ea26..6d9d92f764c5128f0fe9f3fba2ef7a27f862ed01 100644 (file)
@@ -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"
index 5a382d3088212f409e9b052b68e623728b4f1581..6b7a22061432496e84c0471d7f3df7d59372f413 100644 (file)
@@ -23,11 +23,6 @@ config MAINBOARD_PART_NUMBER
        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
index 3cbeeda63dea59e5ada7e4483d8dfb21a528546c..1a02f856ad5613a187f20040911c50d9d0639945 100644 (file)
@@ -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"
index a83c1bc0cab3822c54092ba2a7b46d5e28b3ad7a..5ce7021cf808b7e524273f31f619c64338c8d9e0 100644 (file)
@@ -12,7 +12,6 @@ config BOARD_INTEL_XE7501DEVKIT
        select HAVE_PIRQ_TABLE
        select HAVE_MP_TABLE
        select UDELAY_TSC
-       select HAVE_OPTION_TABLE
        select HAVE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_2048
 
index af96a09a485c8c3f8dfff4d830ce42ca1de93391..c04d63790ccc6290838858bb78fa571814ae94a7 100644 (file)
@@ -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"
index 02255b90b91abda4c4b29b029b93bad4a531ff1e..bf5cb81a8a873d5968e2380bd2fa252ef4c3e944 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_IWILL_DK8_HTX
        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
index 117113a9fbc9c13f4b440c5d05d8dd6c00e05284..1af5c2c55f5110f536795595e4ce8999d92d1fc7 100644 (file)
@@ -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>
index cd39edea95e1bc3c3b148e3be31d237f41d8c7b2..6f35928a810095070dd69203936932513ef836b8 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_IWILL_DK8S2
        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
index 84431296016ae563bc57eb1ea6fc12561dd72bd4..706014b9c28bdd1e850353913d684bef0413c756 100644 (file)
@@ -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>
index 9d518137d2d55b30ea389824ecb3c676ca2aba16..87ee7ea048f8f1f44378999f2f3b5f5b9ca2e0cd 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_IWILL_DK8X
        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
index 84431296016ae563bc57eb1ea6fc12561dd72bd4..706014b9c28bdd1e850353913d684bef0413c756 100644 (file)
@@ -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>
index e1afc27e8a163f215d5c833b48ff46f5213debcd..5742a5d2983b2f74f4fcdb8541b0039c1aab3144 100644 (file)
@@ -6,6 +6,7 @@ config BOARD_JETWAY_J7F24
        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
 
index 41670d22ff0fd94db74ce2ca1bf2264362875319..645637bf50a0bb487162b1c0af2d0e2fa56e48b4 100644 (file)
@@ -10,6 +10,7 @@ config BOARD_KONTRON_986LCD_M
        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
index 30c118e73bbd5e2a6678b60bba966a0012037291..5faf699129a308452eeaf4f7d6a84784baf54147 100644 (file)
@@ -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>
index 50b72a4bf25f977c7372220930de6ccf3099c448..933b87af28df93c6ce80837354ff1587791bf581 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_KONTRON_KT690
        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
index f30b23d3b68328cc4eda7544442c1ee9a9cfd879..9088a48da4299ab5b6d27d6af15cb7f1447f4aeb 100644 (file)
@@ -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>
index fa6d8ca53a17c6244a77bc84f264b21553290182..f99058b8cbf6e4db45c367b5250c01c43c717921 100644 (file)
@@ -19,11 +19,6 @@ config MAINBOARD_PART_NUMBER
        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
index ddd73db8e537c5c8abf4dc4e79ff954e455269e5..24ab417dcb21431cfb9b0be6726cc620236a273b 100644 (file)
@@ -22,11 +22,6 @@ config MAINBOARD_PART_NUMBER
        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
index fcba6ada75b780f6d79801f61458154c820228a8..dda7ecc14f9e3611bee158d24b728216915a0458 100644 (file)
@@ -22,11 +22,6 @@ config MAINBOARD_PART_NUMBER
        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
index 2f66733c8aee4d7323b6f6e53ac044c4b2cd3b0d..2bcd961d63299ef68387fedc6fe47df04fa9ad4f 100644 (file)
@@ -41,11 +41,6 @@ config MAINBOARD_PART_NUMBER
        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
index 3a49c9d3345bb57a8ef455c5a05de41ea3cc5b86..e786f4f02cc787293b228adb51793b05474a52cb 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index ff8a1f656395e21b69e2f06c7461807902b5557a..1e443a42aebafa9f0335ec26f50c7ad6dbf51127 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index 8d9ba810c9e80a38a6d4fb403e01c69221cf752a..5dcd212be3b00288df39751e152bb21083b85a40 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index b5cef0e6958281307c049005a1dc1cef1caee076..605b6504bcbf39d298b3ce2337588dc95104db80 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index 4617c9f8f9dab1ed3e4fd969a93bed62cf9af776..9f8529381a5cee0bf7da3514821bcba14a830f0b 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_MSI_MS7135
        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
index 67eb446c9c7e852db4aaa1673fc65c538127b4fc..50e75285aa34766a32cb14d84bdd75b08f8f6e85 100644 (file)
@@ -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"
index cce07a7f94d722f137d1708a3d208ee18ae1df11..1c1694bdb3ffa8c5cb64383f641d1ee6f0739d32 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_MSI_MS7260
        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
index 229e9bc397164e1cccdeeac9129580260f098108..5b88a6d989dfc7e97d804dd63854faadff5864fe 100644 (file)
@@ -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"
index ee2118e59ce85e69af4b912037cec93000b4fba0..1f0738fb69e6606036846ad889814a7f1151e7ee 100644 (file)
@@ -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
index ff9da6a965983cf6ee498fe190d50ba04193bcb3..602ba183bdc4abfb21f88ff6598dd7ebc60110cb 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_MSI_MS9185
        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
index 134cbe7c5ac59e1f81da8ca6a53ba9ee72e4c5a9..a2bf78bf1baed04165c3b25b8f5f6fc6c4d75737 100644 (file)
@@ -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>
index cf1896d2d7650bbdc59b15d5684da9e8a1581616..c72e49134ba98a66ef2951b9bedf0674147b9dd3 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_MSI_MS9282
        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
index f2581db7b448c0e8232f893fde92e0d96bee2db4..e7de60396038d5c8cb6876758939534e5975df17 100644 (file)
@@ -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>
index 499735cfb9ddb5f9c2817d6813e7d8dbbf88de9c..1f5528886941c6583338b82e4f88f04e7cc3389c 100644 (file)
@@ -49,11 +49,6 @@ config IRQ_SLOT_COUNT
        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
index 9d00a8d92ae1fc4e590e9ab2b9093a4e8f61bfd4..4b7fe8f1c785e1721e71a72136d08c9c5c0c2580 100644 (file)
@@ -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"
index 3a3158381a9973c121f5583fd8d9d71d8f0003e8..cb00e91a7a7f144edb7f1f61dc46ffc68c7fa31b 100644 (file)
@@ -41,11 +41,6 @@ config MAINBOARD_PART_NUMBER
        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
index 5e4955f888b975a554a80d6b066e3c6e82365bb8..92b759c78d3573e560e2362228d354061f22ef6a 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_NEWISYS_KHEPRI
        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
index 0ff7943cb103968ac17a1d34054556e5f33ffd14..72761f3907921bcb4e99215242cd755414b88f8c 100644 (file)
@@ -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"
 
index 51ada425f1daf5b3df6819ec21d5c90f05a6432c..12947c36948a0e928a2dfb84da636f2d050460a8 100644 (file)
@@ -42,11 +42,6 @@ config MAINBOARD_PART_NUMBER
        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
index ab361f175f0aa06d5f2caeb2e840d2c27c0370aa..5794521b3a163702f7331bd3626e8cbe1aac505f 100644 (file)
@@ -6,6 +6,7 @@ config BOARD_NVIDIA_L1_2PVV
        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
index 2e7b5aa9701b244bd64dbfc0feebe183e718ce93..8d3cb8d9c71950de11e9b532eb2a5a8b08577dd5 100644 (file)
@@ -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"
index 001173657a5a19edaa6ef87d6a3bd8637f50e907..dfdc57c7427ba1f79b5a9118eb52479aa035f4db 100644 (file)
@@ -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
index a2d119d411ddc1a8461c94967fee5647564cec24..9ed3a33a3683fef67a8ddfd7b585b53ac02100d7 100644 (file)
@@ -19,11 +19,6 @@ config MAINBOARD_PART_NUMBER
        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
index 65a37dddf0f2ca1c573bf327f84a5fcd9912d22b..fd8a712564bb3cd753a941a476b1d5a79a703f40 100644 (file)
@@ -19,11 +19,6 @@ config MAINBOARD_PART_NUMBER
        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
index 0ba52ce937dd37439854bc2459f52be7bc9b6154..4535588e4461f578e12ed8bdc10f23d107e51b9d 100644 (file)
@@ -22,11 +22,6 @@ config MAINBOARD_PART_NUMBER
        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
index 7464f887e2499ccfe60429bf1e1053a4b1f8affe..fbcf9070f33cd3cb40799d880c4fbda9d31a9381 100644 (file)
@@ -26,11 +26,6 @@ config MAINBOARD_PART_NUMBER
        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
index 02423c6615abace0589e4138137e9a8d5e7f4e14..7bb448c00902e09535d2a5b2f3df66ecb0021e28 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_RODA_RK886EX
        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
index eb9df6623c223814584f78c84a133dae2cc48ab3..19b29053e38c0184d1723fe3035d441330c245ce 100644 (file)
@@ -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>
index 0d922860f45583aaa17d0a8e0b1105e0c204ef19..a0a3de19d84f423264c3778ef7893e891e708c85 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index 608a067fa1ab7e05320bbae464f473852a058291..a218b0a08ee4508b09126a931b13af7d13c4138d 100644 (file)
@@ -6,6 +6,7 @@ config BOARD_SUNW_ULTRA40
        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
index 711ce0c49c28d6f0ea2d7fb0dbdbb74afb54ec13..9139e78a02f14ab5fa2bbfa1c72d476fe99db374 100644 (file)
@@ -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"
 
index 5852f2714e2915a490aec98f9ce6d236f69f15f0..76684b2f5e692ea3906dc8c528a52e104373cef7 100644 (file)
@@ -6,6 +6,7 @@ config BOARD_SUPERMICRO_H8DME
        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
index 3454cae31373400220275123d5c5b738c6461bde..8643bed96fdce486567e60abadecf62f2856fba8 100644 (file)
@@ -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"
index adfe7e353e80f611ddded144454ef78311980ca7..b55ebc275c3f7ffbbebcd997fa01f45a7d45d977 100644 (file)
@@ -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"
index ae74b7af47cf54fbdd6b58e9543963f0290dbd01..a0a06655c821f443e11d8386e307f3490208c568 100644 (file)
@@ -6,6 +6,7 @@ config BOARD_SUPERMICRO_H8DMR
        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
index 3454cae31373400220275123d5c5b738c6461bde..8643bed96fdce486567e60abadecf62f2856fba8 100644 (file)
@@ -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"
index b62b9877aeeb3806858d4c4bb52e5012041ac374..ca4c8eec74af6026a0ae174ebb358e126de898a0 100644 (file)
@@ -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"
index 1c7facc75bfc6ced8a2a38b9bf9dd29414998ab0..a3670737a6fbc3bc74522adb92790834fe189e9e 100644 (file)
@@ -6,6 +6,7 @@ config BOARD_SUPERMICRO_H8DMR_FAM10
        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
index 35b46485f4f9516ed23ff18f5739ec3bcc11d1fb..f14ae5f1ad52270aa8b7117b1b90c14668126dce 100644 (file)
@@ -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"
index 5ae140e6408ab6fae696fcd1e6eea7c4bafe2f27..9259b0b6f2c9c306d27bec1ddea13804b0dd02ce 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_SUPERMICRO_H8QME_FAM10
        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
index f9c03767d67cafd9ffb36d5d6dc98b25ce01c8f2..b400279653a7f89c26aea8e2639bb2fc194d7127 100644 (file)
@@ -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"
index a681b0076689c41a351da2f64fbb6b2c41a19561..66cc17df123920170a2921c45ca0282219e26745 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_SUPERMICRO_X6DAI_G
        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
index af54f80c61e06e76e70ddf2f00764c3c45e5dc3c..bfbb3bcb7fe6e953bf932629cdfd04d807c5618f 100644 (file)
@@ -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"
index cc55edb6d80a6e47cc987fbfb46ca02c6a8bb94c..e437283afc51fbc66aca06618b5e3f584a867118 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_SUPERMICRO_X6DHE_G
        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
index 4f219ad10bb32e13e1beb56340225ee917183ced..8151518eee7b27474136defb64c1dd3948468b67 100644 (file)
@@ -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"
index 4f0841a4023f2f3d62c0acbd61535f4a194ce2f6..b2ff1d10fc15877d9d56f140bbdcec389fc922e6 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_SUPERMICRO_X6DHE_G2
        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
index 1e0cddf727a25ba33d8e81b81b88199fd9a4dc1a..7f20e0a697275a804f3dbcd93d53fb834a560e6d 100644 (file)
@@ -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"
index 9366fe36f4a0f810cd9dc1a465973f5e1d56f45f..b650a8dedeb3eb948e58e23e3523574315f3e28e 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_SUPERMICRO_X6DHR_IG
        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
index b973dd9219f184e65a6610d348297c1bd2c1472d..1269eb97c2cbab6edb111f63cb9b5d8313335a8b 100644 (file)
@@ -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"
index ac3070fd408f71c5308660cdbff38c25490dff50..c1a335b3b4b41b0460b6b112ac7591dc83969fb0 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_SUPERMICRO_X6DHR_IG2
        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
index 97be98677d84482e86fe577fdc7cf3f0058050cf..245c03ed8c087dbb66c229e5bb4f42d5df4f1906 100644 (file)
@@ -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"
index 5541975eb20f32e3f429f5f99c0c3c546fe252f8..35b33ace7f7c31f8d81e9ab5ddce43dd0743a9f2 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_TECHNEXION_TIM5690
        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
index 5e17c072b028ced8629469d745b5277da48e7151..011e455b15e98ea9ccb5b59c66494bdda64737bb 100644 (file)
@@ -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>
index 76841a2c07e5e175b50788765198c587b4a6acfb..21609decc1f7b32384ba9ab83ad2087245a634a7 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_TECHNEXION_TIM8690
        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
index b6e214b2cc452e115eeff89a5fb5276a7f1a5ada..fd9db8fa50b8aa14c77402eda784f349b809f1cc 100644 (file)
@@ -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>
index a8e88c268cc2d7de205017acb73a8a95715f682c..442e7e55c85cc8cb0ddfec0b62e6182071a98510 100644 (file)
@@ -3,6 +3,7 @@ config BOARD_TECHNOLOGIC_TS5300
        select ARCH_X86
        select CPU_AMD_SC520
        select ROMCC
+       select HAVE_OPTION_TABLE
        select HAVE_PIRQ_TABLE
        select BOARD_ROMSIZE_KB_128
 
index 1827bfcf849a8977092dc9cee2bae50ff17a1484..dfded677a6f8e810655027c29978c34621947ba3 100644 (file)
@@ -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"
index 38cccdd31578a470e3d7e8c370d2b198c8f820f9..13d82cd56f46add6ce96cbea27131f9c408647fa 100644 (file)
@@ -40,11 +40,6 @@ config MAINBOARD_PART_NUMBER
        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
index 9934d0be36c733a25205b840321c570fd6309d32..33e40ede2f43dc4c7c6584d2eddcd56d727da649 100644 (file)
@@ -26,11 +26,6 @@ config MAINBOARD_PART_NUMBER
        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
index 4f3b2c6a74f3d99b22f86df8170335c6843e7f28..4147b37ba123f47e52f993744afe5d8bd1d10c00 100644 (file)
@@ -21,11 +21,6 @@ config MAINBOARD_PART_NUMBER
        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
index fda6f458f6c8f8d439f91dcd6b4e5d678b9fb030..2d50ad37738f5ec3ce860422e494f3e06780f22a 100644 (file)
@@ -38,7 +38,3 @@ config MAINBOARD_PART_NUMBER
        default "S1846"
        depends on BOARD_TYAN_S1846
 
-config HAVE_OPTION_TABLE
-       bool
-       default n
-       depends on BOARD_TYAN_S1846
index a292d99e1417eb1ff9718af2a21a854a4a285a7d..ddbc03d2a6e17ba6e9200637b372b6e392686ab3 100644 (file)
@@ -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"
 
index ed08c225edb28aee65086a3de43b93e406ac16e8..788096bf6fdc0c2b840516990832a0dac45374c4 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_TYAN_S2850
        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
index d51c4a86dd9400f27733106bf4d1cab59e3230d0..434e85d58ccaa39b351772c4b66ab5b2e4a35e1e 100644 (file)
@@ -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"
 
index e70f29ac59f2cfaa35fc18bf52fbcd16b1ee6a3f..bb8f4108042e09270f2109f5ae952d605c58bffb 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_TYAN_S2875
        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
index e074adb05667acf7ad5110021b56579c3ed9ccf0..85f365eaeed9e76e12f88a1d3657debf27e1c0b7 100644 (file)
@@ -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"
 
index 489701745d4c5908ca7f838302cf35d47192b8f5..0e12c21b199a8f741b5008739aae0cad2e775b0b 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_TYAN_S2880
        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
index 5a3139c3e4a9b458203d43dea651a8a7f0f8f679..0e6612aa8c1a011e87aeade465276fbed031ecb7 100644 (file)
@@ -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"
 
index e8d543c18dd84e8c6e79b633f416f1f591c60246..e12e95638bd274c9d9ba90dceb3e162589651c03 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_TYAN_S2881
        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
index a9a16ab73bbe147a3726f09e57d93c7827a60c0f..517ffe4302f6df73692b978640cc6c933d6ef960 100644 (file)
@@ -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"
 
index 5fe7eb8198a623b04c49652a2c114b0bd799d3ec..fdb486d1511ef88349593f742a8c435110c2409b 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_TYAN_S2882
        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
index 5d0b70e99cb2f7148447af65fda15e2f9db14c5e..ca12a0794fb0000b7a4f28f9102cd2977950a770 100644 (file)
@@ -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"
 
index 66b12d668873e9b1cb98c40ef0d23e12e6af9cbe..4abbba460682f94709bb4b71f9ac816f4340c110 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_TYAN_S2885
        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
index 0a05260605a023d7ad574219be58080f460786c2..8ebd9cdb5e0f4764b2c5d88ba8e337d28edddd2a 100644 (file)
@@ -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"
 
index 7fce557ce17219c4b7ccecedd0e7cb4318a23bd6..ef09eb29d7c52ff9e62a3e237b812af72ece98b8 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_TYAN_S2891
        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
index 289d44a5acb5508c85cac68cc4dbf06865891bae..4fce367322fcf7758b7688a46d152e889239c5d9 100644 (file)
@@ -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"
 
index 20c806e3101c09101be608c7bd6123cb899c7d51..ddef3761047f28a30a2759f79739c4ac7a304b97 100644 (file)
@@ -9,6 +9,7 @@ config BOARD_TYAN_S2892
        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
index cef89942a547e275527ba69e37d82f55a7d5876d..7edbf3b9271ef5070227e2350acd7202fdb5dd15 100644 (file)
@@ -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"
index f7775e14b3971916d3c439e49b01cd2bf0b5bd47..07a5af27cbcfc4fe7c32029cc584bfd0da77794b 100644 (file)
@@ -8,6 +8,7 @@ config BOARD_TYAN_S2895
        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
index 486aa8d95a95d832e7909227b560f678dea0e9ba..a8efb908ff0f2088ad1b801f1a6f2460cd9d2038 100644 (file)
@@ -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>
index c2a7ed00ddb8da777415f5c45a12710d100b75d0..533525afb9f3c95b145d57fe5bc77d57029e30db 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_TYAN_S2912
        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
index 1dff14236987ad3ec217d2d1cf6e5498086406ca..99036d0716fbd65d3716b665d5fc17fb1b7d88ca 100644 (file)
@@ -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"
index 822474bcf953228286b8383b91ed08b95d8a2706..6548f77e626a8135bc35860606b75a533f4ae4d7 100644 (file)
@@ -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
index 51e74ae3d58b4710b2acf7663e9fcab25f719609..f5b30059f56b99a6d4af9d1d5803767827884275 100644 (file)
@@ -6,6 +6,7 @@ config BOARD_TYAN_S2912_FAM10
        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
index 05beb124f748e845ff14c9a7fe0052930ca6d2cf..5792d34af7de692f0c7273cc6c39f5c5645a31d3 100644 (file)
@@ -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"
index 7f7b213169643f3cce7e7e2784b6bf4d15e5de78..695d7584b631893c198be33b09eca431b7097cbe 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_TYAN_S4880
        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
index bbc8560eed51c2c3eef7eaebe85889b6de2c01a5..7328cb4a267f45cdaffc81b12542184113e8bbcd 100644 (file)
@@ -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"
 
index c3394b9dc1e837e2e312e4597461fb4e21946214..6993d1226e28c853a04c7485d5c5ec9f4f13b96c 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_TYAN_S4882
        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
index 08f9f361cfc3369b8d68c811e5b35571b7e6c320..10537565e053705cf533b47252233706f8105dd1 100644 (file)
@@ -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"
 
index 4e50133e5e2ef3565456d2153cadffe9f8573b33..2066321c0c9685067248a48b40a941ee61e0306e 100644 (file)
@@ -5,6 +5,7 @@ config BOARD_VIA_EPIA_CN
        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
 
index f85641294e9074c34d7cc61cd5c3b2f8bece795c..b424a9d335492575e5388610ea50a4dff2f36963 100644 (file)
@@ -7,6 +7,7 @@ config BOARD_VIA_EPIA_M
        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
index 91bb11ccc58d65ccc5d850fa2c5ce890efa4c07b..175642662955516769bd888593c0a0c9acb3fe39 100644 (file)
@@ -5,6 +5,7 @@ config BOARD_VIA_EPIA_M700
        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
 
index 11a3815ac1d5a7835973e3e8f9393ee387a4e7b9..1356b7a21ab39f7536f45507ee6d68b3f3e37607 100644 (file)
@@ -6,6 +6,7 @@ config BOARD_VIA_EPIA_N
        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
index ddb3fe643bba2b72ced8e471b7102c66e9ea3ef5..05a9735a50f5f03ba8f7d3772be5e3afea0e8ddf 100644 (file)
@@ -5,6 +5,7 @@ config BOARD_VIA_EPIA
        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
index a23ec454cd2b6d6bce7d5220cb973546ce2df5e7..f2bf195003f24cbdefe4eee67b217d18ff198a47 100644 (file)
@@ -5,6 +5,7 @@ config BOARD_VIA_PC2500E
        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
index 71d916a82d3efb488c7f0f59ce5455a394bf3051..32a853cdb30be6e75cab07ce6efc69bc438224b1 100644 (file)
@@ -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"
index 62b3cd092efd6e4e9595e13c41e56d85d6097aa6..33b75b42d0281270347c44094c94f2450234f1a9 100644 (file)
@@ -5,6 +5,7 @@ config BOARD_VIA_VT8454C
        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
index 45f7a75995503bebfb080ae2cbec35dadfa90f62..a859563332cb2cd06d6a30ec5d5d6ffa60309fa1 100644 (file)
@@ -22,11 +22,6 @@ config MAINBOARD_PART_NUMBER
        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
index 7163e9da3592a0d5bf6e57605adfd09f9134c755..eb1d1e5cc50c6f25ccf6f57e87718f8f7ca52ac5 100644 (file)
@@ -39,11 +39,6 @@ config MAINBOARD_PART_NUMBER
        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
index 1b0feb123addc892f0f9801eb32621268739952c..293abc7067d27d1356a260d7b9b16decf68bdbd1 100644 (file)
@@ -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 @@ static void coherent_ht_finalize(unsigned nodes)
 #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 {
index 7ad1b8004c2c7b2b423012e34ad6843875518a78..8217464e37a28dfe29d78ebac614520c726bf168 100644 (file)
@@ -549,8 +549,7 @@ static void hw_enable_ecc(const struct mem_controller *ctrl)
        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 @@ static void order_dimms(const struct mem_controller *ctrl)
 {
        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 @@ static struct spd_set_memclk_result spd_set_memclk(const struct mem_controller *
        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;
index 1922fab4b60bec9e62eafb961db6da534f398578..b05a553c5a2daf1f3a23e34748e247813181fb0d 100644 (file)
@@ -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 @@ static void sdram_save_receive_enable(void)
        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++)
index 5ed40b38020e21f8ebc5769af95156dab4afee0e..b20f2b4161cf2c279674b39bbf301c0701155d03 100644 (file)
@@ -3,7 +3,7 @@ obj-y += isa-dma.o
 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
 
index 078bde273c793fc0f233d795dac1116e1265e269..23b834c06ad5994b3cdb0606392424e84e27a355 100644 (file)
@@ -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
  */
 # 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 @@ static void rtc_set_checksum(int range_start, int range_end, int cks_loc)
 
 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 @@ void rtc_init(int invalid)
        /* 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 @@ void rtc_init(int invalid)
 }
 
 
-#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
index fa1f388804b5ac0812827eee607ae3f5946ff695..ed1f0926f0ab72c24d544f0e37f43f630cdd39f0 100644 (file)
@@ -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_error(void)
 
 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 @@ static inline int do_normal_boot(void)
        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);
index 396a41914ee47ad4856b839bb017a49ce7c907ef..f7e4578221b8207046548b6a1a41a920d816a9cf 100644 (file)
@@ -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 @@ void uart_init(void)
        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 @@ void uart_init(void)
 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);
index 3660f4e2ab04e48ed19c143a7f9a2e2a167476f9..277203170d7c151cb0e36b214b6ae806fbbf7a36 100644 (file)
@@ -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"