16 files changed, 131 insertions, 225 deletions
diff --git a/src/mainboard/tyan/Kconfig b/src/mainboard/tyan/Kconfig
index 77998f1b51..6af48a2d8e 100644
--- a/src/mainboard/tyan/Kconfig
+++ b/src/mainboard/tyan/Kconfig
@@ -16,10 +16,43 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+if VENDOR_TYAN
 
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_TYAN
+
+config BOARD_TYAN_S1846
+	bool "S1846 (Tsunami ATX)"
+config BOARD_TYAN_S2735
+	bool "S2735 (Tiger i7501R)"
+config BOARD_TYAN_S2850
+	bool "S2850 (Tomcat K8S)"
+config BOARD_TYAN_S2875
+	bool "S2875 (Tiger K8W)"
+config BOARD_TYAN_S2880
+	bool "S2880 (Thunder K8S)"
+config BOARD_TYAN_S2881
+	bool "S2881 (Thunder K8SR)"
+config BOARD_TYAN_S2882
+	bool "S2882 (Thunder K8S Pro)"
+config BOARD_TYAN_S2885
+	bool "S2885 (Thunder K8W)"
+config BOARD_TYAN_S2891
+	bool "S2891 (Thunder K8SRE)"
+config BOARD_TYAN_S2892
+	bool "S2892 (Thunder K8SE)"
+config BOARD_TYAN_S2895
+	bool "S2895 (Thunder K8WE)"
+config BOARD_TYAN_S2912
+	bool "S2912 (Thunder n3600R)"
+config BOARD_TYAN_S2912_FAM10
+	bool "S2912 Fam10 (Thunder n3600R)"
+config BOARD_TYAN_S4880
+	bool "S4880 (Thunder K8QS)"
+config BOARD_TYAN_S4882
+	bool "S4882 (Thunder K8QS Pro)"
+
+endchoice
 
 source "src/mainboard/tyan/s1846/Kconfig"
 source "src/mainboard/tyan/s2735/Kconfig"
@@ -37,5 +70,12 @@ source "src/mainboard/tyan/s2912_fam10/Kconfig"
 source "src/mainboard/tyan/s4880/Kconfig"
 source "src/mainboard/tyan/s4882/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "Tyan"
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x10f1
 
+endif # VENDOR_TYAN
diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig
index 2d50ad3773..cd64746b53 100644
--- a/src/mainboard/tyan/s1846/Kconfig
+++ b/src/mainboard/tyan/s1846/Kconfig
@@ -16,9 +16,10 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+if BOARD_TYAN_S1846
 
-config BOARD_TYAN_S1846
-	bool "S1846 (Tsunami ATX)"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
@@ -31,10 +32,9 @@ config BOARD_TYAN_S1846
 config MAINBOARD_DIR
 	string
 	default tyan/s1846
-	depends on BOARD_TYAN_S1846
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S1846"
-	depends on BOARD_TYAN_S1846
 
+endif # BOARD_TYAN_S1846
diff --git a/src/mainboard/tyan/s2735/Kconfig b/src/mainboard/tyan/s2735/Kconfig
index 30fe9ebbb0..10f32a04c1 100644
--- a/src/mainboard/tyan/s2735/Kconfig
+++ b/src/mainboard/tyan/s2735/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2735
-	bool "S2735 (Tiger i7501R)"
+if BOARD_TYAN_S2735
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7501
@@ -19,40 +21,33 @@ config BOARD_TYAN_S2735
 config MAINBOARD_DIR
 	string
 	default tyan/s2735
-	depends on BOARD_TYAN_S2735
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcf000
-	depends on BOARD_TYAN_S2735
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x1000
-	depends on BOARD_TYAN_S2735
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2735"
-	depends on BOARD_TYAN_S2735
 
 config IRQ_SLOT_COUNT
 	int
 	default 15
-	depends on BOARD_TYAN_S2735
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_TYAN_S2735
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2735
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2735
-	depends on BOARD_TYAN_S2735
 
+endif # BOARD_TYAN_S2735
diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig
index 788096bf6f..0d56519bd9 100644
--- a/src/mainboard/tyan/s2850/Kconfig
+++ b/src/mainboard/tyan/s2850/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2850
-	bool "S2850 (Tomcat K8S)"
+if BOARD_TYAN_S2850
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -16,55 +18,45 @@ config BOARD_TYAN_S2850
 config MAINBOARD_DIR
 	string
 	default tyan/s2850
-	depends on BOARD_TYAN_S2850
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2850"
-	depends on BOARD_TYAN_S2850
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2850
-	depends on BOARD_TYAN_S2850
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S2850
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2850
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 1
-	depends on BOARD_TYAN_S2850
 
 config IRQ_SLOT_COUNT
 	int
 	default 12
-	depends on BOARD_TYAN_S2850
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 1
-	depends on BOARD_TYAN_S2850
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_TYAN_S2850
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 0
-	depends on BOARD_TYAN_S2850
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_TYAN_S2850
 
+endif # BOARD_TYAN_S2850
diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig
index bb8f410804..3eaaca57be 100644
--- a/src/mainboard/tyan/s2875/Kconfig
+++ b/src/mainboard/tyan/s2875/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2875
-	bool "S2875 (Tiger K8W)"
+if BOARD_TYAN_S2875
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -17,60 +19,49 @@ config BOARD_TYAN_S2875
 config MAINBOARD_DIR
 	string
 	default tyan/s2875
-	depends on BOARD_TYAN_S2875
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2875"
-	depends on BOARD_TYAN_S2875
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2875
-	depends on BOARD_TYAN_S2875
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S2875
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_TYAN_S2875
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2875
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_TYAN_S2875
 
 config IRQ_SLOT_COUNT
 	int
 	default 13
-	depends on BOARD_TYAN_S2875
 
 config HT_CHAIN_UNITID_BASE
 	hex
-        default 1
-        depends on BOARD_TYAN_S2875
+	default 1
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
-        default 0x20
-        depends on BOARD_TYAN_S2875
+	default 0x20
 
 config SB_HT_CHAIN_ON_BUS0
-        int
-        default 0
-        depends on BOARD_TYAN_S2875
+	int
+	default 0
 
 config APIC_ID_OFFSET
 	hex
-        default 0x0
-        depends on BOARD_TYAN_S2875
+	default 0x0
 
+endif # BOARD_TYAN_S2875
diff --git a/src/mainboard/tyan/s2880/Kconfig b/src/mainboard/tyan/s2880/Kconfig
index 0e12c21b19..cc85c5b0a7 100644
--- a/src/mainboard/tyan/s2880/Kconfig
+++ b/src/mainboard/tyan/s2880/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2880
-	bool "S2880 (Thunder K8S)"
+if BOARD_TYAN_S2880
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -17,59 +19,49 @@ config BOARD_TYAN_S2880
 config MAINBOARD_DIR
 	string
 	default tyan/s2880
-	depends on BOARD_TYAN_S2880
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_TYAN_S2880
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 0
-	depends on BOARD_TYAN_S2880
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2880"
-	depends on BOARD_TYAN_S2880
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2880
-	depends on BOARD_TYAN_S2880
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S2880
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2880
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2880
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_TYAN_S2880
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_TYAN_S2880
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_TYAN_S2880
 
 config IRQ_SLOT_COUNT
 	int
 	default 13
-	depends on BOARD_TYAN_S2880
+
+endif # BOARD_TYAN_S2880
diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig
index eae991c17a..d502cd7aa8 100644
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2881
-	bool "S2881 (Thunder K8SR)"
+if BOARD_TYAN_S2881
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -19,59 +21,49 @@ config BOARD_TYAN_S2881
 config MAINBOARD_DIR
 	string
 	default tyan/s2881
-	depends on BOARD_TYAN_S2881
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_TYAN_S2881
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_TYAN_S2881
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2881"
-	depends on BOARD_TYAN_S2881
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2881
-	depends on BOARD_TYAN_S2881
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S2881
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_TYAN_S2881
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2881
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_TYAN_S2881
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0xa
-	depends on BOARD_TYAN_S2881
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x6
-	depends on BOARD_TYAN_S2881
 
 config IRQ_SLOT_COUNT
 	int
 	default 9
-	depends on BOARD_TYAN_S2881
+
+endif # BOARD_TYAN_S2881
diff --git a/src/mainboard/tyan/s2882/Kconfig b/src/mainboard/tyan/s2882/Kconfig
index 1c12f41131..52ea2e104f 100644
--- a/src/mainboard/tyan/s2882/Kconfig
+++ b/src/mainboard/tyan/s2882/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2882
-	bool "S2882 (Thunder K8S Pro)"
+if BOARD_TYAN_S2882
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -18,59 +20,49 @@ config BOARD_TYAN_S2882
 config MAINBOARD_DIR
 	string
 	default tyan/s2882
-	depends on BOARD_TYAN_S2882
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_TYAN_S2882
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 0
-	depends on BOARD_TYAN_S2882
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2882"
-	depends on BOARD_TYAN_S2882
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2882
-	depends on BOARD_TYAN_S2882
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S2882
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_TYAN_S2882
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2882
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_TYAN_S2882
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_TYAN_S2882
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_TYAN_S2882
 
 config IRQ_SLOT_COUNT
 	int
 	default 15
-	depends on BOARD_TYAN_S2882
+
+endif # BOARD_TYAN_S2882
diff --git a/src/mainboard/tyan/s2885/Kconfig b/src/mainboard/tyan/s2885/Kconfig
index 95f0f7f68f..9509ca61cb 100644
--- a/src/mainboard/tyan/s2885/Kconfig
+++ b/src/mainboard/tyan/s2885/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2885
-	bool "S2885 (Thunder K8W)"
+if BOARD_TYAN_S2885
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -19,59 +21,49 @@ config BOARD_TYAN_S2885
 config MAINBOARD_DIR
 	string
 	default tyan/s2885
-	depends on BOARD_TYAN_S2885
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_TYAN_S2885
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_TYAN_S2885
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2885"
-	depends on BOARD_TYAN_S2885
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2885
-	depends on BOARD_TYAN_S2885
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S2885
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_TYAN_S2885
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2885
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_TYAN_S2885
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0xa
-	depends on BOARD_TYAN_S2885
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x6
-	depends on BOARD_TYAN_S2885
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_TYAN_S2885
+
+endif # BOARD_TYAN_S2885
diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig
index ef09eb29d7..34711b9515 100644
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2891
-	bool "S2891 (Thunder K8SRE)"
+if BOARD_TYAN_S2891
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -20,59 +22,49 @@ config BOARD_TYAN_S2891
 config MAINBOARD_DIR
 	string
 	default tyan/s2891
-	depends on BOARD_TYAN_S2891
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_TYAN_S2891
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_TYAN_S2891
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2891"
-	depends on BOARD_TYAN_S2891
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2891
-	depends on BOARD_TYAN_S2891
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S2891
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_TYAN_S2891
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2891
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_TYAN_S2891
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0
-	depends on BOARD_TYAN_S2891
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_TYAN_S2891
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_TYAN_S2891
+
+endif # BOARD_TYAN_S2891
diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig
index ddef376104..45a8d09fca 100644
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2892
-	bool "S2892 (Thunder K8SE)"
+if BOARD_TYAN_S2892
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -19,64 +21,53 @@ config BOARD_TYAN_S2892
 config MAINBOARD_DIR
 	string
 	default tyan/s2892
-	depends on BOARD_TYAN_S2892
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_TYAN_S2892
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_TYAN_S2892
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2892"
-	depends on BOARD_TYAN_S2892
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2892
-	depends on BOARD_TYAN_S2892
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S2892
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_TYAN_S2892
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2892
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_TYAN_S2892
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0
-	depends on BOARD_TYAN_S2892
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_TYAN_S2892
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_TYAN_S2892
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_TYAN_S2892
+
+endif # BOARD_TYAN_S2892
diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig
index 07a5af27cb..d3d3856a5b 100644
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2895
-	bool "S2895 (Thunder K8WE)"
+if BOARD_TYAN_S2895
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -19,64 +21,53 @@ config BOARD_TYAN_S2895
 config MAINBOARD_DIR
 	string
 	default tyan/s2895
-	depends on BOARD_TYAN_S2895
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_TYAN_S2895
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_TYAN_S2895
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2895"
-	depends on BOARD_TYAN_S2895
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2895
-	depends on BOARD_TYAN_S2895
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S2895
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_TYAN_S2895
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2895
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_TYAN_S2895
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0
-	depends on BOARD_TYAN_S2895
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_TYAN_S2895
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_TYAN_S2895
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_TYAN_S2895
+
+endif # BOARD_TYAN_S2895
diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig
index 233f2aede3..27fcbb2cb5 100644
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2912
-	bool "S2912 (Thunder n3600R)"
+if BOARD_TYAN_S2912
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
@@ -19,89 +21,73 @@ config BOARD_TYAN_S2912
 config MAINBOARD_DIR
 	string
 	default tyan/s2912
-	depends on BOARD_TYAN_S2912
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_TYAN_S2912
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_TYAN_S2912
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_TYAN_S2912
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_TYAN_S2912
 
 config MEM_TRAIN_SEQ
 	int
 	default 1
-	depends on BOARD_TYAN_S2912
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_TYAN_S2912
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2912"
-	depends on BOARD_TYAN_S2912
 
 config PCI_64BIT_PREF_MEM
 	bool
-        default n
-	depends on BOARD_TYAN_S2912
+	default n
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S2912
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_TYAN_S2912
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2912
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_TYAN_S2912
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_TYAN_S2912
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_TYAN_S2912
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_TYAN_S2912
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2912
-	depends on BOARD_TYAN_S2912
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_TYAN_S2912
+
+endif # BOARD_TYAN_S2912
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index 564a37847e..d1a3233282 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S2912_FAM10
-	bool "S2912 Fam10 (Thunder n3600R)"
+if BOARD_TYAN_S2912_FAM10
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F_1207
 	select NORTHBRIDGE_AMD_AMDFAM10
@@ -20,109 +22,89 @@ config BOARD_TYAN_S2912_FAM10
 config MAINBOARD_DIR
 	string
 	default tyan/s2912_fam10
-	depends on BOARD_TYAN_S2912_FAM10
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc4000
-	depends on BOARD_TYAN_S2912_FAM10
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x0c000
-	depends on BOARD_TYAN_S2912_FAM10
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x04000
-	depends on BOARD_TYAN_S2912_FAM10
 
 config APIC_ID_OFFSET
 	hex
 	default 0
-	depends on BOARD_TYAN_S2912_FAM10
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_TYAN_S2912_FAM10
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_TYAN_S2912_FAM10
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2912 (Fam10)"
-	depends on BOARD_TYAN_S2912_FAM10
 
 config PCI_64BIT_PREF_MEM
 	bool
 	default n
-	depends on BOARD_TYAN_S2912_FAM10
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S2912_FAM10
 
 config MAX_CPUS
 	int
 	default 12
-	depends on BOARD_TYAN_S2912_FAM10
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_TYAN_S2912_FAM10
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_TYAN_S2912_FAM10
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_TYAN_S2912_FAM10
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_TYAN_S2912_FAM10
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_TYAN_S2912_FAM10
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2912
-	depends on BOARD_TYAN_S2912_FAM10
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_TYAN_S2912_FAM10
 
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000095.h"
-	depends on BOARD_TYAN_S2912_FAM10
 
 config RAMBASE
 	hex
 	default 0x200000
-	depends on BOARD_TYAN_S2912_FAM10
 
 config RAMTOP
 	hex
 	default 0x1000000
-	depends on BOARD_TYAN_S2912_FAM10
 
 config HEAP_SIZE
 	hex
 	default 0xc0000
-	depends on BOARD_TYAN_S2912_FAM10
+
+endif # BOARD_TYAN_S2912_FAM10
diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig
index 749c79a5af..0f0837bb9d 100644
--- a/src/mainboard/tyan/s4880/Kconfig
+++ b/src/mainboard/tyan/s4880/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S4880
-	bool "S4880 (Thunder K8QS)"
+if BOARD_TYAN_S4880
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -18,70 +20,57 @@ config BOARD_TYAN_S4880
 config MAINBOARD_DIR
 	string
 	default tyan/s4880
-	depends on BOARD_TYAN_S4880
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcf000
-	depends on BOARD_TYAN_S4880
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_TYAN_S4880
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_TYAN_S4880
 
 config K8_REV_F_SUPPORT
 	bool
 	default n
-	depends on BOARD_TYAN_S4880
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 0
-	depends on BOARD_TYAN_S4880
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S4880"
-	depends on BOARD_TYAN_S4880
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S4880
 
 config MAX_CPUS
 	int
 	default 8
-	depends on BOARD_TYAN_S4880
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 4
-	depends on BOARD_TYAN_S4880
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_TYAN_S4880
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_TYAN_S4880
 
 config IRQ_SLOT_COUNT
 	int
 	default 22
-	depends on BOARD_TYAN_S4880
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x4880
-	depends on BOARD_TYAN_S4880
 
+endif # BOARD_TYAN_S4880
diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig
index 4dcbbaa042..40d2d65efb 100644
--- a/src/mainboard/tyan/s4882/Kconfig
+++ b/src/mainboard/tyan/s4882/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_TYAN_S4882
-	bool "S4882 (Thunder K8QS Pro)"
+if BOARD_TYAN_S4882
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -18,70 +20,57 @@ config BOARD_TYAN_S4882
 config MAINBOARD_DIR
 	string
 	default tyan/s4882
-	depends on BOARD_TYAN_S4882
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcf000
-	depends on BOARD_TYAN_S4882
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_TYAN_S4882
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_TYAN_S4882
 
 config K8_REV_F_SUPPORT
 	bool
 	default n
-	depends on BOARD_TYAN_S4882
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 0
-	depends on BOARD_TYAN_S4882
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "S4882"
-	depends on BOARD_TYAN_S4882
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_TYAN_S4882
 
 config MAX_CPUS
 	int
 	default 8
-	depends on BOARD_TYAN_S4882
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 4
-	depends on BOARD_TYAN_S4882
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_TYAN_S4882
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_TYAN_S4882
 
 config IRQ_SLOT_COUNT
 	int
 	default 22
-	depends on BOARD_TYAN_S4882
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x4882
-	depends on BOARD_TYAN_S4882
 
+endif # BOARD_TYAN_S4882