Various fixes to Kconfig: All kconfig-boards should have a

complete set of variables now, though they might still have
the wrong values.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4728 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/Kconfig b/src/Kconfig
index b2508bbc8a84808b7c8f782afc8ac915468ea7ba..273d770a5fdbe6c1cc08cc0bf36c25ffce4b968f 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -61,6 +61,10 @@ config CPU_ADDR_BITS
        int
        default 36
 
+config AGP_APERTURE_SIZE
+       hex
+       default 0
+
 config XIP_ROM_BASE
        hex
        default 0xfffe0000

diff --git a/src/console/Kconfig b/src/console/Kconfig
index fb72cdbeb9c6d480bac42ef39b08dc674c4414c5..697e3587fe6cdd2d8f4df0924d5d9fa2c856ae4a 100644 (file)
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -24,6 +24,11 @@ config TTYS0_BAUD
        depends on SERIAL_SET_SPEED
        default 115200
 
+config TTYS0_LCS
+       int
+       default 3
+       depends on CONSOLE_SERIAL8250
+
 config USBDEBUG_DIRECT
        bool "USB debug dongle support. Not supported on all chipsets."
        default n

diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 54b01758827ac70bd2f16f915b9eda84cc4df9a0..ebe5dec07fefe9fb3e7f345dd3ab4fad781572ee 100644 (file)
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -21,6 +21,10 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE
        hex
        default 0
 
+config MAX_PHYSICAL_CPUS
+       int
+       default 1
+
 config SMP
        bool
        default y if MAX_CPUS != 1
@@ -39,3 +43,10 @@ config SSE
        help
                Set this in socket or model if the CPU has SSE. 
                If the CPUs for the socket always have MX, set it there. 
+
+config VAR_MTRR_HOLE
+       bool
+       default y
+       help
+               Unset this if you don't want the MTRR code to use
+               subtractive MTRRs

diff --git a/src/cpu/intel/model_1067x/Kconfig b/src/cpu/intel/model_1067x/Kconfig
index 55b5eb737bbc029992eebb25cc6a1708331f82b7..43e7d7d77f65e7fcd776214e2838b2fd2cbd2950 100644 (file)
--- a/src/cpu/intel/model_1067x/Kconfig
+++ b/src/cpu/intel/model_1067x/Kconfig
@@ -1,5 +1,5 @@
 config CPU_INTEL_CORE2
        bool
-       default y
+       default n
        select SMP
        select HAVE_MOVNTI

diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index b6ae9967e591ef2b566fabfc02566d938f999c39..a3b9330e64e12dd3fec145fff6c9099b0d499745 100644 (file)
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -6,6 +6,14 @@ config WAIT_BEFORE_CPUS_INIT
        bool
        default n
 
+config UDELAY_IO
+       bool
+       default n
+
+config UDELAY_LAPIC
+       bool
+       default n
+
 config UDELAY_TSC
        bool
        default n

diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index f0d3a904ced3f52395dc93317f0761c10857a318..e04c01922dfb6e54f336cfcde33187511f238506 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -147,3 +147,7 @@ config PCI_ROM_RUN
        default y
        depends on BOARD_AMD_SERENGETI_CHEETAH
 
+config IRQ_SLOT_COUNT
+       int
+       default 11
+       depends on BOARD_AMD_SERENGETI_CHEETAH

diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index f1ab0ffbc57a031796e652b9977c85b59d8409d3..0a39eae9ced71eb12af813ee17296a66a558279e 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -115,3 +115,8 @@ config HT_CHAIN_END_UNITID_BASE
        default 0x20
        depends on BOARD_ASUS_M2V_MX_SE
 
+# FIXME?
+config IRQ_SLOT_COUNT
+       int
+       default 11
+       depends on BOARD_ASUS_M2V_MX_SE

diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig
index 6eeef3c7aa5e959a4657ff95a32b637821f05193..49c4ae86afe7798f39eacf278df60ae862696670 100644 (file)
--- a/src/mainboard/dell/s1850/Kconfig
+++ b/src/mainboard/dell/s1850/Kconfig
@@ -48,3 +48,7 @@ config USE_INIT
        default n
        depends on BOARD_DELL_S1850
 
+config IRQ_SLOT_COUNT
+       int
+       default 9
+       depends on BOARD_DELL_S1850

diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig
index daf4ba70cf462eb994c009dedb75238bc071ddf1..452fcb43095da0e0635022f989febcbebf9828ac 100644 (file)
--- a/src/mainboard/emulation/qemu-x86/Kconfig
+++ b/src/mainboard/emulation/qemu-x86/Kconfig
@@ -15,3 +15,8 @@ config MAINBOARD_PART_NUMBER
        string
        default "QEMU-x86"
        depends on BOARD_EMULATION_QEMU_X86
+
+config IRQ_SLOT_COUNT
+       int
+       default 6
+       depends on BOARD_EMULATION_QEMU_X86

diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig
index 3fd47e9f94bafd70c369d4a4622a3f0139a3b40f..b67a79266376be173c3c87b92cf8ee1bd33d0b08 100644 (file)
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -18,7 +18,6 @@ config BOARD_GIGABYTE_M57SLI
        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
        select HAVE_ACPI_TABLES
        select K8_REV_F_SUPPORT
-       select HAVE_FANCTL
  
 config MAINBOARD_DIR
        string
@@ -144,3 +143,14 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
        hex
        default 0x2b80
        depends on BOARD_GIGABYTE_M57SLI
+
+config IRQ_SLOT_COUNT
+       int
+       default 11
+       depends on BOARD_GIGABYTE_M57SLI
+
+# not globally defined yet, so can't "select" this
+config HAVE_FANCTL
+       bool
+       default y
+       depends on BOARD_GIGABYTE_M57SLI

diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig
index b3dbf5fd214487482bc6c78718c2b5d3d06d3dc6..41bae818eff4b9e86c080d835e0116e383b60796 100644 (file)
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/src/mainboard/intel/eagleheights/Kconfig
@@ -53,3 +53,12 @@ config MMCONF_BASE_ADDRESS
        default 0xe0000000
        depends on BOARD_INTEL_EAGLEHEIGHTS
 
+config IRQ_SLOT_COUNT
+       int
+       default 18
+       depends on BOARD_INTEL_EAGLEHEIGHTS
+
+config MAX_PHYSICAL_CPUS
+       int
+       default 2
+       depends on BOARD_INTEL_EAGLEHEIGHTS

diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 8da87cc2669259adac5b7dcd5e6eb9a167557176..d76ccc26c0601b189dc2fd8a9229434b0300039f 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -45,3 +45,13 @@ config MMCONF_BASE_ADDRESS
        hex
        default 0xf0000000
        depends on BOARD_KONTRON_986LCD_M
+
+config IRQ_SLOT_COUNT
+       int
+       default 18
+       depends on BOARD_KONTRON_986LCD_M
+
+config MAX_PHYSICAL_CPUS
+       int
+       default 2
+       depends on BOARD_KONTRON_986LCD_M

diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig
index 4ed5e6d2908619fd162b530b4def48e29b28d7a9..89fa61971d474d5c4415c66682fe73daef8599a9 100644 (file)
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -116,3 +116,7 @@ config PCI_ROM_RUN
        default y
        depends on BOARD_SUNW_ULTRA40
 
+config IRQ_SLOT_COUNT
+       int
+       default 11
+       depends on BOARD_SUNW_ULTRA40

diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index e1b1e16b0fb29db1f8afc7c83954bb2c5cd989aa..38e1d9b04893062e33fed05e93f5204d0c179937 100644 (file)
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -116,3 +116,7 @@ config PCI_ROM_RUN
        default y
        depends on BOARD_SUPERMICRO_H8DME
 
+config IRQ_SLOT_COUNT
+       int
+       default 11
+       depends on BOARD_SUPERMICRO_H8DME

diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig
index f72ba12ddff272cac5108a4c132e76648d6479bf..5833ff04ba4b8644df0ba1bcc8d80f14dcbf3695 100644 (file)
--- a/src/mainboard/tyan/s1846/Kconfig
+++ b/src/mainboard/tyan/s1846/Kconfig
@@ -42,3 +42,8 @@ config HAVE_OPTION_TABLE
        default n
        depends on BOARD_TYAN_S1846
 
+#Override manually, as in Config.lb (FIXME)
+config IRQ_SLOT_COUNT
+       int
+       default 0
+       depends on BOARD_TYAN_S1846

diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig
index 101349b3e778d58580ca3b5f9a72c63abf3c43d3..6103be882654cc49548bbfdcc6123c8e8b90f299 100644 (file)
--- a/src/mainboard/tyan/s2850/Kconfig
+++ b/src/mainboard/tyan/s2850/Kconfig
@@ -53,3 +53,8 @@ config USE_INIT
        bool
        default n
        depends on BOARD_TYAN_S2850
+
+config IRQ_SLOT_COUNT
+       int
+       default 12
+       depends on BOARD_TYAN_S2850

diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig
index 93e01c8273ecf9bc212b4edb88aa09e9e14aa12d..0e04059031611a8d1858c37f192a5d4cb471de1e 100644 (file)
--- a/src/mainboard/tyan/s2875/Kconfig
+++ b/src/mainboard/tyan/s2875/Kconfig
@@ -59,3 +59,8 @@ config USE_INIT
        bool
        default n
        depends on BOARD_TYAN_S2875
+
+config IRQ_SLOT_COUNT
+       int
+       default 13
+       depends on BOARD_TYAN_S2875

diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig
index 24c6295d0b08e89a17c7e399b2fd70a932640980..1a88ee39613bd09bb7207c101d831e0056d401e6 100644 (file)
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -125,3 +125,7 @@ config HAVE_ACPI_TABLES
        default n
        depends on BOARD_TYAN_S2881
 
+config IRQ_SLOT_COUNT
+       int
+       default 9
+       depends on BOARD_TYAN_S2881

diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig
index a36a1b2af3b35657ebd901d161f53c1d07de29d9..13222f3cf5ef2951c2bcd96d37048e3382f003cc 100644 (file)
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -125,3 +125,7 @@ config HAVE_ACPI_TABLES
        default y
        depends on BOARD_TYAN_S2891
 
+config IRQ_SLOT_COUNT
+       int
+       default 11
+       depends on BOARD_TYAN_S2891

diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig
index 49b7dba15cab2f4ae4353afdd98514697d07a5eb..ee19983f43463dc565d72d3046c5750949f5523e 100644 (file)
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -125,3 +125,7 @@ config HAVE_ACPI_TABLES
        default y
        depends on BOARD_TYAN_S2892
 
+config IRQ_SLOT_COUNT
+       int
+       default 11
+       depends on BOARD_TYAN_S2892

diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig
index 7d5981dde1a2f121eaa14681557c37818e51624c..84dc1b14a1db5a17d996aac366463eb42b5bcf46 100644 (file)
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -125,3 +125,7 @@ config HAVE_ACPI_TABLES
        default y
        depends on BOARD_TYAN_S2895
 
+config IRQ_SLOT_COUNT
+       int
+       default 11
+       depends on BOARD_TYAN_S2895

diff --git a/src/mainboard/via/epia-n/Kconfig b/src/mainboard/via/epia-n/Kconfig
index d457988e1cc9a97737e474a55713454543b48ac0..399d1827251b41effc1601aa65762ec73d990428 100644 (file)
--- a/src/mainboard/via/epia-n/Kconfig
+++ b/src/mainboard/via/epia-n/Kconfig
@@ -36,3 +36,13 @@ config RAMBASE
        hex
        default 0x4000
        depends on BOARD_VIA_EPIA_N
+
+config IRQ_SLOT_COUNT
+       int
+       default 7
+       depends on BOARD_VIA_EPIA_N
+
+config EPIA_VT8237R_INIT
+       bool
+       default y
+       depends on BOARD_VIA_EPIA_N

diff --git a/src/mainboard/via/epia/Kconfig b/src/mainboard/via/epia/Kconfig
index d1b7be6f11d498978f54faedf6e091f3c260a8f3..31e1d9caae2cc995e142ed4177c1b9ce44bc15b6 100644 (file)
--- a/src/mainboard/via/epia/Kconfig
+++ b/src/mainboard/via/epia/Kconfig
@@ -31,3 +31,8 @@ config RAMBASE
        hex
        default 0x4000
        depends on BOARD_VIA_EPIA
+
+config IRQ_SLOT_COUNT
+       int
+       default 5
+       depends on BOARD_VIA_EPIA