From 0e9a92545d0be44487f9bc5ad6ab26af5badf125 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 6 Oct 2009 20:48:07 +0000 Subject: [PATCH] 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 Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4728 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/Kconfig | 4 ++++ src/console/Kconfig | 5 +++++ src/cpu/Kconfig | 11 +++++++++++ src/cpu/intel/model_1067x/Kconfig | 2 +- src/cpu/x86/Kconfig | 8 ++++++++ src/mainboard/amd/serengeti_cheetah/Kconfig | 4 ++++ src/mainboard/asus/m2v-mx_se/Kconfig | 5 +++++ src/mainboard/dell/s1850/Kconfig | 4 ++++ src/mainboard/emulation/qemu-x86/Kconfig | 5 +++++ src/mainboard/gigabyte/m57sli/Kconfig | 12 +++++++++++- src/mainboard/intel/eagleheights/Kconfig | 9 +++++++++ src/mainboard/kontron/986lcd-m/Kconfig | 10 ++++++++++ src/mainboard/sunw/ultra40/Kconfig | 4 ++++ src/mainboard/supermicro/h8dme/Kconfig | 4 ++++ src/mainboard/tyan/s1846/Kconfig | 5 +++++ src/mainboard/tyan/s2850/Kconfig | 5 +++++ src/mainboard/tyan/s2875/Kconfig | 5 +++++ src/mainboard/tyan/s2881/Kconfig | 4 ++++ src/mainboard/tyan/s2891/Kconfig | 4 ++++ src/mainboard/tyan/s2892/Kconfig | 4 ++++ src/mainboard/tyan/s2895/Kconfig | 4 ++++ src/mainboard/via/epia-n/Kconfig | 10 ++++++++++ src/mainboard/via/epia/Kconfig | 5 +++++ 23 files changed, 131 insertions(+), 2 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index b2508bbc8..273d770a5 100644 --- 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 fb72cdbeb..697e3587f 100644 --- 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 54b017588..ebe5dec07 100644 --- 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 55b5eb737..43e7d7d77 100644 --- 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 b6ae9967e..a3b9330e6 100644 --- 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 f0d3a904c..e04c01922 100644 --- 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 f1ab0ffbc..0a39eae9c 100644 --- 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 6eeef3c7a..49c4ae86a 100644 --- 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 daf4ba70c..452fcb430 100644 --- 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 3fd47e9f9..b67a79266 100644 --- 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 b3dbf5fd2..41bae818e 100644 --- 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 8da87cc26..d76ccc26c 100644 --- 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 4ed5e6d29..89fa61971 100644 --- 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 e1b1e16b0..38e1d9b04 100644 --- 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 f72ba12dd..5833ff04b 100644 --- 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 101349b3e..6103be882 100644 --- 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 93e01c827..0e0405903 100644 --- 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 24c6295d0..1a88ee396 100644 --- 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 a36a1b2af..13222f3cf 100644 --- 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 49b7dba15..ee19983f4 100644 --- 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 7d5981dde..84dc1b14a 100644 --- 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 d457988e1..399d18272 100644 --- 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 d1b7be6f1..31e1d9caa 100644 --- 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 -- 2.25.1