summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2009-10-18 13:47:30 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-10-18 13:47:30 +0000
commite405327b46523ea93f84d29798b394c43a0f0f52 (patch)
treed7e0399c5b975e0544d10d784b10e4411995796c
parent5c57df6c1a672218254c2625dd2bc949dacf469f (diff)
downloadcoreboot-e405327b46523ea93f84d29798b394c43a0f0f52.tar.xz
Simplify Kconfig files by using "select" where possible (trivial).
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4806 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/cpu/amd/model_10xxx/Kconfig24
-rw-r--r--src/cpu/amd/model_fxx/Kconfig24
-rw-r--r--src/cpu/amd/socket_F_1207/Kconfig12
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/Kconfig11
-rw-r--r--src/mainboard/kontron/kt690/Kconfig6
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Kconfig5
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Kconfig5
-rw-r--r--src/mainboard/tyan/s2912_fam10/Kconfig11
-rw-r--r--src/northbridge/amd/amdfam10/Kconfig12
-rw-r--r--src/northbridge/amd/amdk8/Kconfig6
-rw-r--r--src/northbridge/amd/lx/Kconfig5
-rw-r--r--src/southbridge/nvidia/ck804/Kconfig12
12 files changed, 23 insertions, 110 deletions
diff --git a/src/cpu/amd/model_10xxx/Kconfig b/src/cpu/amd/model_10xxx/Kconfig
index a13a86f32a..3f80baf9e6 100644
--- a/src/cpu/amd/model_10xxx/Kconfig
+++ b/src/cpu/amd/model_10xxx/Kconfig
@@ -1,31 +1,15 @@
config CPU_AMD_MODEL_10XXX
bool
-
-config HAVE_INIT_TIMER
- bool
- default y
- depends on CPU_AMD_MODEL_10XXX
-
-config HAVE_MOVNTI
- bool
- default y
- depends on CPU_AMD_MODEL_10XXX
+ select HAVE_INIT_TIMER
+ select HAVE_MOVNTI
+ select USE_PRINTK_IN_CAR
+ select USE_DCACHE_RAM
config CPU_ADDR_BITS
int
default 48
depends on CPU_AMD_MODEL_10XXX
-config USE_PRINTK_IN_CAR
- bool
- default y
- depends on CPU_AMD_MODEL_10XXX
-
-config USE_DCACHE_RAM
- bool
- default y
- depends on CPU_AMD_MODEL_10XXX
-
config DCACHE_RAM_BASE
hex
default 0xc4000
diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig
index e103377fd1..b291b646e5 100644
--- a/src/cpu/amd/model_fxx/Kconfig
+++ b/src/cpu/amd/model_fxx/Kconfig
@@ -1,31 +1,15 @@
config CPU_AMD_MODEL_FXX
bool
-
-config HAVE_INIT_TIMER
- bool
- default y
- depends on CPU_AMD_MODEL_FXX
-
-config HAVE_MOVNTI
- bool
- default y
- depends on CPU_AMD_MODEL_FXX
+ select HAVE_INIT_TIMER
+ select HAVE_MOVNTI
+ select USE_PRINTK_IN_CAR
+ select USE_DCACHE_RAM
config CPU_ADDR_BITS
int
default 40
depends on CPU_AMD_MODEL_FXX
-config USE_PRINTK_IN_CAR
- bool
- default y
- depends on CPU_AMD_MODEL_FXX
-
-config USE_DCACHE_RAM
- bool
- default y
- depends on CPU_AMD_MODEL_FXX
-
config DCACHE_RAM_BASE
hex
default 0xc8000
diff --git a/src/cpu/amd/socket_F_1207/Kconfig b/src/cpu/amd/socket_F_1207/Kconfig
index 19b5b20ceb..ae7d87a210 100644
--- a/src/cpu/amd/socket_F_1207/Kconfig
+++ b/src/cpu/amd/socket_F_1207/Kconfig
@@ -1,6 +1,8 @@
config CPU_AMD_SOCKET_F_1207
bool
select CPU_AMD_MODEL_10XXX
+ select PCI_IO_CFG_EXT
+ select CAR_FAM10
config CPU_SOCKET_TYPE
hex
@@ -13,11 +15,6 @@ config DIMM_SUPPORT
default 0x0104
depends on CPU_AMD_SOCKET_F_1207
-config PCI_IO_CFG_EXT
- bool
- default y
- depends on CPU_AMD_SOCKET_F_1207
-
config EXT_RT_TBL_SUPPORT
bool
default n
@@ -28,11 +25,6 @@ config EXT_CONF_SUPPORT
default n
depends on CPU_AMD_SOCKET_F_1207
-config CAR_FAM10
- bool
- default y
- depends on CPU_AMD_SOCKET_F_1207
-
config CBB
hex
default 0x0
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index 36a8460f45..6cc991c3f7 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -19,6 +19,8 @@ config BOARD_AMD_SERENGETI_CHEETAH_FAM10
select AMDMCT
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
+ select ENABLE_APIC_EXT_ID
+ select LIFT_BSP_APIC_ID
config MAINBOARD_DIR
string
@@ -121,12 +123,3 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
default 0x1022
depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
-config ENABLE_APIC_EXT_ID
- bool
- default y
- depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
-
-config LIFT_BSP_APIC_ID
- bool
- default y
- depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig
index 0d939306d5..068fd9a143 100644
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -18,6 +18,7 @@ config BOARD_KONTRON_KT690
select IOAPIC
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_512
+ select SB_HT_CHAIN_UNITID_OFFSET_ONLY
config MAINBOARD_DIR
string
@@ -99,11 +100,6 @@ config SB_HT_CHAIN_ON_BUS0
default 1
depends on BOARD_KONTRON_KT690
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
- bool
- default y
- depends on BOARD_KONTRON_KT690
-
config HT_CHAIN_END_UNITID_BASE
hex
default 0x1
diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig
index 40bdd07483..0b8da81d25 100644
--- a/src/mainboard/supermicro/x6dhe_g/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g/Kconfig
@@ -9,6 +9,7 @@ config BOARD_SUPERMICRO_X6DHE_G
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_1024
+ select DRIVERS_GENERIC_DEBUG
config MAINBOARD_DIR
string
@@ -55,7 +56,3 @@ config IRQ_SLOT_COUNT
default 15
depends on BOARD_SUPERMICRO_X6DHE_G
-config DRIVERS_GENERIC_DEBUG
- bool
- default y
- depends on BOARD_SUPERMICRO_X6DHE_G
diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig
index f999212e31..3593a2613f 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig
@@ -9,6 +9,7 @@ config BOARD_SUPERMICRO_X6DHE_G2
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select BOARD_ROMSIZE_KB_1024
+ select DRIVERS_GENERIC_DEBUG
config MAINBOARD_DIR
string
@@ -55,7 +56,3 @@ config IRQ_SLOT_COUNT
default 15
depends on BOARD_SUPERMICRO_X6DHE_G2
-config DRIVERS_GENERIC_DEBUG
- bool
- default y
- depends on BOARD_SUPERMICRO_X6DHE_G2
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index eb841dbd7e..e4aee22236 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -16,6 +16,8 @@ config BOARD_TYAN_S2912_FAM10
select MEM_TRAIN_SEQ
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select BOARD_ROMSIZE_KB_1024
+ select ENABLE_APIC_EXT_ID
+ select AMDMCT
config MAINBOARD_DIR
string
@@ -147,12 +149,3 @@ config AMD_UCODE_PATCH_FILE
default "mc_patch_01000095.h"
depends on BOARD_TYAN_S2912_FAM10
-config ENABLE_APIC_EXT_ID
- bool
- default y
- depends on BOARD_TYAN_S2912_FAM10
-
-config AMDMCT
- bool
- default y
- depends on BOARD_TYAN_S2912_FAM10
diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig
index 2c626625e2..b8b334514b 100644
--- a/src/northbridge/amd/amdfam10/Kconfig
+++ b/src/northbridge/amd/amdfam10/Kconfig
@@ -20,20 +20,12 @@
config NORTHBRIDGE_AMD_AMDFAM10
bool
select HAVE_HIGH_TABLES
+ select HYPERTRANSPORT_PLUGIN_SUPPORT
+ select HT3_SUPPORT
config AGP_APERTURE_SIZE
hex
default 0x4000000
depends on NORTHBRIDGE_AMD_AMDFAM10
-config HYPERTRANSPORT_PLUGIN_SUPPORT
- bool
- default y
- depends on NORTHBRIDGE_AMD_AMDFAM10
-
-config HT3_SUPPORT
- bool
- default y
- depends on NORTHBRIDGE_AMD_AMDFAM10
-
source src/northbridge/amd/amdfam10/root_complex/Kconfig
diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig
index 10fec83fdf..1337a11d0b 100644
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -20,6 +20,7 @@
config NORTHBRIDGE_AMD_AMDK8
bool
select HAVE_HIGH_TABLES
+ select HYPERTRANSPORT_PLUGIN_SUPPORT
config AGP_APERTURE_SIZE
hex
@@ -31,9 +32,4 @@ config K8_HT_FREQ_1G_SUPPORT
default n
depends on NORTHBRIDGE_AMD_AMDK8
-config HYPERTRANSPORT_PLUGIN_SUPPORT
- bool
- default y
- depends on NORTHBRIDGE_AMD_AMDK8
-
source src/northbridge/amd/amdk8/root_complex/Kconfig
diff --git a/src/northbridge/amd/lx/Kconfig b/src/northbridge/amd/lx/Kconfig
index 4989654dd8..002cc8a7aa 100644
--- a/src/northbridge/amd/lx/Kconfig
+++ b/src/northbridge/amd/lx/Kconfig
@@ -1,7 +1,4 @@
config NORTHBRIDGE_AMD_LX
bool
+ select HAVE_HIGH_TABLES
-config HAVE_HIGH_TABLES
- bool
- default y
- depends on NORTHBRIDGE_AMD_LX
diff --git a/src/southbridge/nvidia/ck804/Kconfig b/src/southbridge/nvidia/ck804/Kconfig
index 221b78a238..92c8fbabdc 100644
--- a/src/southbridge/nvidia/ck804/Kconfig
+++ b/src/southbridge/nvidia/ck804/Kconfig
@@ -1,13 +1,5 @@
config SOUTHBRIDGE_NVIDIA_CK804
bool
-
-config HAVE_HARD_RESET
- bool
- default y
- depends on SOUTHBRIDGE_NVIDIA_CK804
-
-config IOAPIC
- bool
- default y
- depends on SOUTHBRIDGE_NVIDIA_CK804
+ select HAVE_HARD_RESET
+ select IOAPIC