Restructured all vendors' Kconfig files to no longer source the boards'

Kconfigs from within the choice/endchoice block.  This makes it possible to
define user visible board specific options.  Moved all vendor names and PCI
ids to the vendors' Kconfigs.  Now all options in each file depend on the same
symbol, so replaced all "depends on"s with a single "if".  Sorted boards
(sort -d), cleaned whitespace.

This patch also introduces a dummy option BOARD_SPECIFIC_OPTIONS, which is
always "y" and never used.  It it simply needed to have something to attach
the boards' "select" statements to.

Signed-off-by: Jens Rottmann <JRottmann@LiPPERTEmbedded.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5754 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

10 files changed, 83 insertions, 129 deletions

diff --git a/src/mainboard/supermicro/Kconfig b/src/mainboard/supermicro/Kconfig
index 1948784761..5ac7ddac36 100644
--- a/src/mainboard/supermicro/Kconfig
+++ b/src/mainboard/supermicro/Kconfig
@@ -1,16 +1,45 @@
+if VENDOR_SUPERMICRO
+
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_SUPERMICRO
+
+config BOARD_SUPERMICRO_H8DME
+	bool "H8DME-2"
+config BOARD_SUPERMICRO_H8DMR
+	bool "H8DMR-i2"
+config BOARD_SUPERMICRO_H8DMR_FAM10
+	bool "H8DMR-i2 (Fam10)"
+config BOARD_SUPERMICRO_H8QME_FAM10
+	bool "H8QME-2+ (Fam10)"
+config BOARD_SUPERMICRO_X6DAI_G
+	bool "X6DAi-G"
+config BOARD_SUPERMICRO_X6DHE_G2
+	bool "X6DHE-G2"
+config BOARD_SUPERMICRO_X6DHE_G
+	bool "X6DHE-G"
+config BOARD_SUPERMICRO_X6DHR_IG2
+	bool "X6DHR-iG2"
+config BOARD_SUPERMICRO_X6DHR_IG
+	bool "X6DHR-iG"
+
+endchoice
 
 source "src/mainboard/supermicro/h8dme/Kconfig"
 source "src/mainboard/supermicro/h8dmr/Kconfig"
 source "src/mainboard/supermicro/h8dmr_fam10/Kconfig"
 source "src/mainboard/supermicro/h8qme_fam10/Kconfig"
 source "src/mainboard/supermicro/x6dai_g/Kconfig"
-source "src/mainboard/supermicro/x6dhe_g/Kconfig"
 source "src/mainboard/supermicro/x6dhe_g2/Kconfig"
-source "src/mainboard/supermicro/x6dhr_ig/Kconfig"
+source "src/mainboard/supermicro/x6dhe_g/Kconfig"
 source "src/mainboard/supermicro/x6dhr_ig2/Kconfig"
+source "src/mainboard/supermicro/x6dhr_ig/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "Supermicro"
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x15d9
 
+endif # VENDOR_SUPERMICRO
diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index 9b8702256d..afe96bf2fb 100644
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_SUPERMICRO_H8DME
-	bool "H8DME-2"
+if BOARD_SUPERMICRO_H8DME
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
@@ -19,85 +21,69 @@ config BOARD_SUPERMICRO_H8DME
 config MAINBOARD_DIR
 	string
 	default supermicro/h8dme
-	depends on BOARD_SUPERMICRO_H8DME
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_SUPERMICRO_H8DME
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_SUPERMICRO_H8DME
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_SUPERMICRO_H8DME
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_SUPERMICRO_H8DME
 
 config MEM_TRAIN_SEQ
 	int
 	default 1
-	depends on BOARD_SUPERMICRO_H8DME
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8DME
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "H8DME-2"
-	depends on BOARD_SUPERMICRO_H8DME
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_SUPERMICRO_H8DME
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_SUPERMICRO_H8DME
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8DME
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_SUPERMICRO_H8DME
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_SUPERMICRO_H8DME
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8DME
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_SUPERMICRO_H8DME
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x15d9
-	depends on BOARD_SUPERMICRO_H8DME
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x1511
-	depends on BOARD_SUPERMICRO_H8DME
 
+endif # BOARD_SUPERMICRO_H8DME
diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig
index 810d2a602c..da72aff438 100644
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/src/mainboard/supermicro/h8dmr/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_SUPERMICRO_H8DMR
-	bool "H8DMR-i2"
+if BOARD_SUPERMICRO_H8DMR
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
@@ -18,85 +20,69 @@ config BOARD_SUPERMICRO_H8DMR
 config MAINBOARD_DIR
 	string
 	default supermicro/h8dmr
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config MEM_TRAIN_SEQ
 	int
 	default 1
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "H8DMR-i2"
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x15d9
-	depends on BOARD_SUPERMICRO_H8DMR
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x1511
-	depends on BOARD_SUPERMICRO_H8DMR
 
+endif # BOARD_SUPERMICRO_H8DMR
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index b6d6651830..5f3930bac8 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_SUPERMICRO_H8DMR_FAM10
-	bool "H8DMR-i2 (Fam10)"
+if BOARD_SUPERMICRO_H8DMR_FAM10
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F_1207
 	select NORTHBRIDGE_AMD_AMDFAM10
@@ -20,104 +22,85 @@ config BOARD_SUPERMICRO_H8DMR_FAM10
 config MAINBOARD_DIR
 	string
 	default supermicro/h8dmr_fam10
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc4000
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x0c000
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x04000
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config RAMBASE
 	hex
 	default 0x200000
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config RAMTOP
 	hex
 	default 0x1000000
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config HEAP_SIZE
 	hex
 	default 0xc0000
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "H8DMR-i2 (Fam10)"
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config MAX_CPUS
 	int
 	default 8
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_0100009f.h"
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x1511
-	depends on BOARD_SUPERMICRO_H8DMR_FAM10
+
+endif # BOARD_SUPERMICRO_H8DMR_FAM10
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index 4f8499c856..576116ccab 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_SUPERMICRO_H8QME_FAM10
-	bool "H8QME-2+ (Fam10)"
+if BOARD_SUPERMICRO_H8QME_FAM10
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F_1207
 	select NORTHBRIDGE_AMD_AMDFAM10
@@ -21,109 +23,89 @@ config BOARD_SUPERMICRO_H8QME_FAM10
 config MAINBOARD_DIR
 	string
 	default supermicro/h8qme_fam10
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc4000
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x0c000
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x04000
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config RAMBASE
 	hex
 	default 0x200000
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config RAMTOP
 	hex
 	default 0x1000000
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config HEAP_SIZE
 	hex
 	default 0xff000
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "H8QME-2+ (Fam10)"
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config MAX_CPUS
 	int
 	default 16
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 4
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_0100009f.h"
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config SERIAL_CPU_INIT
 	bool
 	default y
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x1511
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
 
 config STACK_SIZE
 	hex
 	default 0x10000
-	depends on BOARD_SUPERMICRO_H8QME_FAM10
+
+endif # BOARD_SUPERMICRO_H8QME_FAM10
diff --git a/src/mainboard/supermicro/x6dai_g/Kconfig b/src/mainboard/supermicro/x6dai_g/Kconfig
index 66cc17df12..8b1cf5a274 100644
--- a/src/mainboard/supermicro/x6dai_g/Kconfig
+++ b/src/mainboard/supermicro/x6dai_g/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_SUPERMICRO_X6DAI_G
-	bool "X6DAi-G"
+if BOARD_SUPERMICRO_X6DAI_G
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7525
@@ -16,29 +18,25 @@ config BOARD_SUPERMICRO_X6DAI_G
 config MAINBOARD_DIR
 	string
 	default supermicro/x6dai_g
-	depends on BOARD_SUPERMICRO_X6DAI_G
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "X6DAi-G"
-	depends on BOARD_SUPERMICRO_X6DAI_G
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x15d9
-	depends on BOARD_SUPERMICRO_X6DAI_G
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x6780
-	depends on BOARD_SUPERMICRO_X6DAI_G
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_SUPERMICRO_X6DAI_G
 
 config IRQ_SLOT_COUNT
 	int
 	default 15
-	depends on BOARD_SUPERMICRO_X6DAI_G
+
+endif # BOARD_SUPERMICRO_X6DAI_G
diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig
index e437283afc..8771d9ec58 100644
--- a/src/mainboard/supermicro/x6dhe_g/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_SUPERMICRO_X6DHE_G
-	bool "X6DHE-G"
+if BOARD_SUPERMICRO_X6DHE_G
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
@@ -18,30 +20,25 @@ config BOARD_SUPERMICRO_X6DHE_G
 config MAINBOARD_DIR
 	string
 	default supermicro/x6dhe_g
-	depends on BOARD_SUPERMICRO_X6DHE_G
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "X6DHE-G"
-	depends on BOARD_SUPERMICRO_X6DHE_G
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x15d9
-	depends on BOARD_SUPERMICRO_X6DHE_G
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x6080
-	depends on BOARD_SUPERMICRO_X6DHE_G
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_SUPERMICRO_X6DHE_G
 
 config IRQ_SLOT_COUNT
 	int
 	default 15
-	depends on BOARD_SUPERMICRO_X6DHE_G
 
+endif # BOARD_SUPERMICRO_X6DHE_G
diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig
index b2ff1d10fc..96549d6154 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_SUPERMICRO_X6DHE_G2
-	bool "X6DHE-G2"
+if BOARD_SUPERMICRO_X6DHE_G2
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
@@ -19,30 +21,25 @@ config BOARD_SUPERMICRO_X6DHE_G2
 config MAINBOARD_DIR
 	string
 	default supermicro/x6dhe_g2
-	depends on BOARD_SUPERMICRO_X6DHE_G2
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "X6DHE-G2"
-	depends on BOARD_SUPERMICRO_X6DHE_G2
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x15d9
-	depends on BOARD_SUPERMICRO_X6DHE_G2
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x6080
-	depends on BOARD_SUPERMICRO_X6DHE_G2
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_SUPERMICRO_X6DHE_G2
 
 config IRQ_SLOT_COUNT
 	int
 	default 15
-	depends on BOARD_SUPERMICRO_X6DHE_G2
 
+endif # BOARD_SUPERMICRO_X6DHE_G2
diff --git a/src/mainboard/supermicro/x6dhr_ig/Kconfig b/src/mainboard/supermicro/x6dhr_ig/Kconfig
index b650a8dede..d1163d74b7 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_SUPERMICRO_X6DHR_IG
-	bool "X6DHR-iG"
+if BOARD_SUPERMICRO_X6DHR_IG
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
@@ -18,29 +20,25 @@ config BOARD_SUPERMICRO_X6DHR_IG
 config MAINBOARD_DIR
 	string
 	default supermicro/x6dhr_ig
-	depends on BOARD_SUPERMICRO_X6DHR_IG
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "X6DHR-iG"
-	depends on BOARD_SUPERMICRO_X6DHR_IG
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x15d9
-	depends on BOARD_SUPERMICRO_X6DHR_IG
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x5580
-	depends on BOARD_SUPERMICRO_X6DHR_IG
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_SUPERMICRO_X6DHR_IG
 
 config IRQ_SLOT_COUNT
 	int
 	default 15
-	depends on BOARD_SUPERMICRO_X6DHR_IG
+
+endif # BOARD_SUPERMICRO_X6DHR_IG
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Kconfig b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
index c1a335b3b4..494b0ed43c 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_SUPERMICRO_X6DHR_IG2
-	bool "X6DHR-iG2"
+if BOARD_SUPERMICRO_X6DHR_IG2
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
@@ -18,29 +20,25 @@ config BOARD_SUPERMICRO_X6DHR_IG2
 config MAINBOARD_DIR
 	string
 	default supermicro/x6dhr_ig2
-	depends on BOARD_SUPERMICRO_X6DHR_IG2
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "X6DHR-iG2"
-	depends on BOARD_SUPERMICRO_X6DHR_IG2
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x15d9
-	depends on BOARD_SUPERMICRO_X6DHR_IG2
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x5580
-	depends on BOARD_SUPERMICRO_X6DHR_IG2
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_SUPERMICRO_X6DHR_IG2
 
 config IRQ_SLOT_COUNT
 	int
 	default 15
-	depends on BOARD_SUPERMICRO_X6DHR_IG2
+
+endif # BOARD_SUPERMICRO_X6DHR_IG2