10 files changed, 77 insertions, 146 deletions
diff --git a/src/mainboard/msi/Kconfig b/src/mainboard/msi/Kconfig
index 5070294962..c2f1595877 100644
--- a/src/mainboard/msi/Kconfig
+++ b/src/mainboard/msi/Kconfig
@@ -16,10 +16,31 @@
 ## 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_MSI
 
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_MSI
+
+config BOARD_MSI_MS_6119
+	bool "MS-6119"
+config BOARD_MSI_MS_6147
+	bool "MS-6147"
+config BOARD_MSI_MS_6156
+	bool "MS-6156"
+config BOARD_MSI_MS_6178
+	bool "MS-6178"
+config BOARD_MSI_MS7135
+	bool "MS-7135 (K8N Neo3)"
+config BOARD_MSI_MS7260
+	bool "MS-7260 (K9N Neo)"
+config BOARD_MSI_MS9185
+	bool "MS-9185 (K9SD Master-S2R)"
+config BOARD_MSI_MS9282
+	bool "MS-9282 (K9SD Master)"
+config BOARD_MSI_MS9652_FAM10
+	bool "MS-9652 Fam10 (Speedster K9ND)"
+
+endchoice
 
 source "src/mainboard/msi/ms6119/Kconfig"
 source "src/mainboard/msi/ms6147/Kconfig"
@@ -31,5 +52,12 @@ source "src/mainboard/msi/ms9185/Kconfig"
 source "src/mainboard/msi/ms9282/Kconfig"
 source "src/mainboard/msi/ms9652_fam10/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "MSI"
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x1462
 
+endif # VENDOR_MSI
diff --git a/src/mainboard/msi/ms6119/Kconfig b/src/mainboard/msi/ms6119/Kconfig
index e786f4f02c..a11f9cf338 100644
--- a/src/mainboard/msi/ms6119/Kconfig
+++ b/src/mainboard/msi/ms6119/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_MSI_MS_6119
 
-config BOARD_MSI_MS_6119
-	bool "MS-6119"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
@@ -32,15 +33,13 @@ config BOARD_MSI_MS_6119
 config MAINBOARD_DIR
 	string
 	default msi/ms6119
-	depends on BOARD_MSI_MS_6119
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-6119"
-	depends on BOARD_MSI_MS_6119
 
 config IRQ_SLOT_COUNT
 	int
 	default 7
-	depends on BOARD_MSI_MS_6119
 
+endif # BOARD_MSI_MS_6119
diff --git a/src/mainboard/msi/ms6147/Kconfig b/src/mainboard/msi/ms6147/Kconfig
index 1e443a42ae..198618f974 100644
--- a/src/mainboard/msi/ms6147/Kconfig
+++ b/src/mainboard/msi/ms6147/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_MSI_MS_6147
 
-config BOARD_MSI_MS_6147
-	bool "MS-6147"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
@@ -32,15 +33,13 @@ config BOARD_MSI_MS_6147
 config MAINBOARD_DIR
 	string
 	default msi/ms6147
-	depends on BOARD_MSI_MS_6147
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-6147"
-	depends on BOARD_MSI_MS_6147
 
 config IRQ_SLOT_COUNT
 	int
 	default 8
-	depends on BOARD_MSI_MS_6147
 
+endif # BOARD_MSI_MS_6147
diff --git a/src/mainboard/msi/ms6156/Kconfig b/src/mainboard/msi/ms6156/Kconfig
index 5dcd212be3..ba132650ed 100644
--- a/src/mainboard/msi/ms6156/Kconfig
+++ b/src/mainboard/msi/ms6156/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_MSI_MS_6156
 
-config BOARD_MSI_MS_6156
-	bool "MS-6156"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
@@ -32,15 +33,13 @@ config BOARD_MSI_MS_6156
 config MAINBOARD_DIR
 	string
 	default msi/ms6156
-	depends on BOARD_MSI_MS_6156
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-6156"
-	depends on BOARD_MSI_MS_6156
 
 config IRQ_SLOT_COUNT
 	int
 	default 7
-	depends on BOARD_MSI_MS_6156
 
+endif # BOARD_MSI_MS_6156
diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig
index 605b6504bc..fc8f425d29 100644
--- a/src/mainboard/msi/ms6178/Kconfig
+++ b/src/mainboard/msi/ms6178/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_MSI_MS_6178
 
-config BOARD_MSI_MS_6178
-	bool "MS-6178"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
@@ -33,21 +34,18 @@ config BOARD_MSI_MS_6178
 config MAINBOARD_DIR
 	string
 	default msi/ms6178
-	depends on BOARD_MSI_MS_6178
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-6178"
-	depends on BOARD_MSI_MS_6178
 
 config IRQ_SLOT_COUNT
 	int
 	default 4
-	depends on BOARD_MSI_MS_6178
 
 # No need to override the chipset FALLBACK_VGA_BIOS_ID.
 config FALLBACK_VGA_BIOS_FILE
 	string
 	default "i810.vga"
-	depends on BOARD_MSI_MS_6178
 
+endif # BOARD_MSI_MS_6178
diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig
index 2ccca0fe19..e6996ab0ba 100644
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_MSI_MS7135
-	bool "MS-7135 (K8N Neo3)"
+if BOARD_MSI_MS7135
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_754
 	select NORTHBRIDGE_AMD_AMDK8
@@ -17,79 +19,65 @@ config BOARD_MSI_MS7135
 config MAINBOARD_DIR
 	string
 	default msi/ms7135
-	depends on BOARD_MSI_MS7135
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_MSI_MS7135
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_MSI_MS7135
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_MSI_MS7135
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-7135"
-	depends on BOARD_MSI_MS7135
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x7135
-	depends on BOARD_MSI_MS7135
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_MSI_MS7135
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_MSI_MS7135
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 1
-	depends on BOARD_MSI_MS7135
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_MSI_MS7135
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0
-	depends on BOARD_MSI_MS7135
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_MSI_MS7135
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_MSI_MS7135
 
 config IRQ_SLOT_COUNT
 	int
 	default 13
-	depends on BOARD_MSI_MS7135
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_MSI_MS7135
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x8000
-	depends on BOARD_MSI_MS7135
+
+endif # BOARD_MSI_MS7135
diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig
index 13c54e4d6d..f89bfe005e 100644
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/src/mainboard/msi/ms7260/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_MSI_MS7260
-	bool "MS-7260 (K9N Neo)"
+if BOARD_MSI_MS7260
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
 	select NORTHBRIDGE_AMD_AMDK8
@@ -19,94 +21,77 @@ config BOARD_MSI_MS7260
 config MAINBOARD_DIR
 	string
 	default msi/ms7260
-	depends on BOARD_MSI_MS7260
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_MSI_MS7260
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_MSI_MS7260
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_MSI_MS7260
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_MSI_MS7260
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_MSI_MS7260
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_MSI_MS7260
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-7260"
-	depends on BOARD_MSI_MS7260
 
 config PCI_64BIT_PREF_MEM
 	bool
-        default n
-	depends on BOARD_MSI_MS7260
+	default n
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_MSI_MS7260
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_MSI_MS7260
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 1
-	depends on BOARD_MSI_MS7260
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_MSI_MS7260
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_MSI_MS7260
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_MSI_MS7260
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_MSI_MS7260
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1462
-	depends on BOARD_MSI_MS7260
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x7260
-	depends on BOARD_MSI_MS7260
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_MSI_MS7260
+
+endif # BOARD_MSI_MS7260
diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig
index b80a03c632..646d002677 100644
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/src/mainboard/msi/ms9185/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_MSI_MS9185
-	bool "MS-9185 (K9SD Master-S2R)"
+if BOARD_MSI_MS9185
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
@@ -20,75 +22,61 @@ config BOARD_MSI_MS9185
 config MAINBOARD_DIR
 	string
 	default msi/ms9185
-	depends on BOARD_MSI_MS9185
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcc000
-	depends on BOARD_MSI_MS9185
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x04000
-	depends on BOARD_MSI_MS9185
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_MSI_MS9185
 
 config APIC_ID_OFFSET
 	hex
 	default 0x8
-	depends on BOARD_MSI_MS9185
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_MSI_MS9185
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-9185"
-	depends on BOARD_MSI_MS9185
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_MSI_MS9185
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_MSI_MS9185
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_MSI_MS9185
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_MSI_MS9185
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x6
-	depends on BOARD_MSI_MS9185
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_MSI_MS9185
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_MSI_MS9185
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2b80
-	depends on BOARD_MSI_MS9185
 
+endif # BOARD_MSI_MS9185
diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig
index 81e4548b28..365d2c3d2f 100644
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/src/mainboard/msi/ms9282/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_MSI_MS9282
-	bool "MS-9282 (K9SD Master)"
+if BOARD_MSI_MS9282
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
@@ -18,89 +20,73 @@ config BOARD_MSI_MS9282
 config MAINBOARD_DIR
 	string
 	default msi/ms9282
-	depends on BOARD_MSI_MS9282
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcc000
-	depends on BOARD_MSI_MS9282
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x04000
-	depends on BOARD_MSI_MS9282
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_MSI_MS9282
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_MSI_MS9282
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_MSI_MS9282
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-9282"
-	depends on BOARD_MSI_MS9282
 
 config PCI_64BIT_PREF_MEM
 	bool
-        default n
-	depends on BOARD_MSI_MS9282
+	default n
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_MSI_MS9282
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_MSI_MS9282
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_MSI_MS9282
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_MSI_MS9282
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_MSI_MS9282
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_MSI_MS9282
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_MSI_MS9282
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1462
-	depends on BOARD_MSI_MS9282
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x9282
-	depends on BOARD_MSI_MS9282
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_MSI_MS9282
+
+endif # BOARD_MSI_MS9282
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index b355dc9f39..212cd7037a 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_MSI_MS9652_FAM10
-	bool "MS-9652 Fam10 (Speedster K9ND)"
+if BOARD_MSI_MS9652_FAM10
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F_1207
 	select NORTHBRIDGE_AMD_AMDFAM10
@@ -20,216 +22,175 @@ config BOARD_MSI_MS9652_FAM10
 config MAINBOARD_DIR
 	string
 	default msi/ms9652_fam10
-	depends on BOARD_MSI_MS9652_FAM10
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc4000
-	depends on BOARD_MSI_MS9652_FAM10
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x0c000
-	depends on BOARD_MSI_MS9652_FAM10
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x04000
-	depends on BOARD_MSI_MS9652_FAM10
 
 config GENERATE_PIRQ_TABLE
 	bool
 	default y
-	depends on BOARD_MSI_MS9652_FAM10
 
 # Define to 0 because the IRQ slot count is
 # determined dynamically for this board.
 config IRQ_SLOT_COUNT
 	int
 	default 0
-	depends on BOARD_MSI_MS9652_FAM10
 
 config MAX_CPUS
 	int
 	default 8
-	depends on BOARD_MSI_MS9652_FAM10
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_MSI_MS9652_FAM10
 
 config LOGICAL_CPUS
 	bool
 	default y
-	depends on BOARD_MSI_MS9652_FAM10
 
 config IOAPIC
 	bool
 	default y
-	depends on BOARD_MSI_MS9652_FAM10
 
 config SMP
 	bool
 	default y
-	depends on BOARD_MSI_MS9652_FAM10
 
 config STACK_SIZE
 	hex
 	default 0x20000
-	depends on BOARD_MSI_MS9652_FAM10
 
 config HEAP_SIZE
 	hex
 	default 0x20000
-	depends on BOARD_MSI_MS9652_FAM10
 
 config USE_OPTION_TABLE
 	bool
 	default n
-	depends on BOARD_MSI_MS9652_FAM10
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-9652"
-	depends on BOARD_MSI_MS9652_FAM10
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1462
-	depends on BOARD_MSI_MS9652_FAM10
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x9652
-	depends on BOARD_MSI_MS9652_FAM10
 
 config RAMBASE
 	hex
 	default 0x00200000
-	depends on BOARD_MSI_MS9652_FAM10
 
 config TTYS0_BAUD
 	int
 	default 115200
-	depends on BOARD_MSI_MS9652_FAM10
 
 config TTYS0_BASE
 	hex
 	default 0x3f8
-	depends on BOARD_MSI_MS9652_FAM10
 
 config TTYS0_LCS
 	int
 	default 3
-	depends on BOARD_MSI_MS9652_FAM10
 
 config DEFAULT_CONSOLE_LOGLEVEL
 	int
 	default 9
-	depends on BOARD_MSI_MS9652_FAM10
 
 config MAXIMUM_CONSOLE_LOGLEVEL
 	int
 	default 9
-	depends on BOARD_MSI_MS9652_FAM10
 
 config MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 	bool
 	default y
-	depends on BOARD_MSI_MS9652_FAM10
 
 config CONSOLE_SERIAL8250
 	bool
 	default y
-	depends on BOARD_MSI_MS9652_FAM10
 
 config CONSOLE_VGA
 	bool
 	default y
-	depends on BOARD_MSI_MS9652_FAM10
 
 config PCI_ROM_RUN
 	bool
 	default y
-	depends on BOARD_MSI_MS9652_FAM10
 
 config USBDEBUG
 	bool
 	default n
-	depends on BOARD_MSI_MS9652_FAM10
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_MSI_MS9652_FAM10
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_MSI_MS9652_FAM10
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_MSI_MS9652_FAM10
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x00
-	depends on BOARD_MSI_MS9652_FAM10
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_MSI_MS9652_FAM10
 
 config VAR_MTRR_HOLE
 	bool
 	default n
-	depends on BOARD_MSI_MS9652_FAM10
 
 config SERIAL_CPU_INIT
 	bool
 	default y
-	depends on BOARD_MSI_MS9652_FAM10
 
 config APIC_ID_OFFSET
 	hex
 	default 0x00
-	depends on BOARD_MSI_MS9652_FAM10
 
 config LIFT_BSP_APIC_ID
 	bool
 	default 1
-	depends on BOARD_MSI_MS9652_FAM10
 
 config RAMTOP
 	hex
 	default 0x1000000
-	depends on BOARD_MSI_MS9652_FAM10
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_MSI_MS9652_FAM10
 
 config WAIT_BEFORE_CPUS_INIT
 	bool
 	default n
-	depends on BOARD_MSI_MS9652_FAM10
 
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000096.h"
-	depends on BOARD_MSI_MS9652_FAM10
 
 config ID_SECTION_OFFSET
 	hex
 	default 0x80
-	depends on BOARD_MSI_MS9652_FAM10
 
 config HT3_SUPPORT
 	bool
 	default y
-	depends on BOARD_MSI_MS9652_FAM10
+
+endif # BOARD_MSI_MS9652_FAM10