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

11 files changed, 90 insertions, 164 deletions

diff --git a/src/mainboard/amd/Kconfig b/src/mainboard/amd/Kconfig
index 17b053f57f..5188facf08 100644
--- a/src/mainboard/amd/Kconfig
+++ b/src/mainboard/amd/Kconfig
@@ -1,17 +1,44 @@
+if VENDOR_AMD
+
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_AMD
+
+config BOARD_AMD_DB800
+	bool "DB800 (Salsa)"
+config BOARD_AMD_DBM690T
+	bool "DBM690T (Herring)"
+config BOARD_AMD_MAHOGANY
+	bool "Mahogany"
+config BOARD_AMD_MAHOGANY_FAM10
+	bool "Mahogany (Fam10)"
+config BOARD_AMD_NORWICH
+	bool "Norwich"
+config BOARD_AMD_PISTACHIO
+	bool "Pistachio"
+config BOARD_AMD_RUMBA
+	bool "Rumba"
+config BOARD_AMD_SERENGETI_CHEETAH
+	bool "Serengeti Cheetah"
+config BOARD_AMD_SERENGETI_CHEETAH_FAM10
+	bool "Serengeti Cheetah (Fam10)"
+config BOARD_AMD_TILAPIA_FAM10
+	bool "Tilapia (Fam10)"
+
+endchoice
 
 source "src/mainboard/amd/db800/Kconfig"
 source "src/mainboard/amd/dbm690t/Kconfig"
 source "src/mainboard/amd/mahogany/Kconfig"
 source "src/mainboard/amd/mahogany_fam10/Kconfig"
-source "src/mainboard/amd/tilapia_fam10/Kconfig"
 source "src/mainboard/amd/norwich/Kconfig"
 source "src/mainboard/amd/pistachio/Kconfig"
 source "src/mainboard/amd/rumba/Kconfig"
 source "src/mainboard/amd/serengeti_cheetah/Kconfig"
 source "src/mainboard/amd/serengeti_cheetah_fam10/Kconfig"
+source "src/mainboard/amd/tilapia_fam10/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "AMD"
 
+endif # VENDOR_AMD
diff --git a/src/mainboard/amd/db800/Kconfig b/src/mainboard/amd/db800/Kconfig
index 9b33ed82e3..2755f7c259 100644
--- a/src/mainboard/amd/db800/Kconfig
+++ b/src/mainboard/amd/db800/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_AMD_DB800
-	bool "DB800 (Salsa)"
+if BOARD_AMD_DB800
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
@@ -14,19 +16,17 @@ config BOARD_AMD_DB800
 config MAINBOARD_DIR
 	string
 	default amd/db800
-	depends on BOARD_AMD_DB800
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "DB800"
-	depends on BOARD_AMD_DB800
 
 config IRQ_SLOT_COUNT
 	int
 	default 4
-	depends on BOARD_AMD_DB800
 
 config RAMBASE
 	hex
 	default 0x4000
-	depends on BOARD_AMD_DB800
+
+endif # BOARD_AMD_DB800
diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig
index 86c193e7d4..91a24bd3b7 100644
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/src/mainboard/amd/dbm690t/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_AMD_DBM690T
-	bool "DBM690T (Herring)"
+if BOARD_AMD_DBM690T
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_S1G1
 	select NORTHBRIDGE_AMD_AMDK8
@@ -22,86 +24,71 @@ config BOARD_AMD_DBM690T
 config MAINBOARD_DIR
 	string
 	default amd/dbm690t
-	depends on BOARD_AMD_DBM690T
 
 # This is a temporary fix, and should be removed when the race condition for
 # building option_table.h is fixed.
 config WARNINGS_ARE_ERRORS
 	bool
 	default n
-	depends on BOARD_AMD_DBM690T
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_AMD_DBM690T
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_AMD_DBM690T
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_AMD_DBM690T
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_AMD_DBM690T
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "DBM690T"
-	depends on BOARD_AMD_DBM690T
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_AMD_DBM690T
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_AMD_DBM690T
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 1
-	depends on BOARD_AMD_DBM690T
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_AMD_DBM690T
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_AMD_DBM690T
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_AMD_DBM690T
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_AMD_DBM690T
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_AMD_DBM690T
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_AMD_DBM690T
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x3050
-	depends on BOARD_AMD_DBM690T
+
+endif # BOARD_AMD_DBM690T
diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig
index ce4e88d7cf..d737712b95 100644
--- a/src/mainboard/amd/mahogany/Kconfig
+++ b/src/mainboard/amd/mahogany/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_AMD_MAHOGANY
-	bool "Mahogany"
+if BOARD_AMD_MAHOGANY
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
 	select NORTHBRIDGE_AMD_AMDK8
@@ -24,79 +26,65 @@ config BOARD_AMD_MAHOGANY
 config MAINBOARD_DIR
 	string
 	default amd/mahogany
-	depends on BOARD_AMD_MAHOGANY
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_AMD_MAHOGANY
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_AMD_MAHOGANY
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_AMD_MAHOGANY
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_AMD_MAHOGANY
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MAHOGANY"
-	depends on BOARD_AMD_MAHOGANY
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_AMD_MAHOGANY
 
 config MAX_CPUS
 	int
 	default 8
-	depends on BOARD_AMD_MAHOGANY
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_AMD_MAHOGANY
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_AMD_MAHOGANY
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_AMD_MAHOGANY
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_AMD_MAHOGANY
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_AMD_MAHOGANY
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_AMD_MAHOGANY
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_AMD_MAHOGANY
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x3060
-	depends on BOARD_AMD_MAHOGANY
+
+endif # BOARD_AMD_MAHOGANY
diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig
index 10a308fb7f..c12812f81f 100644
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_AMD_MAHOGANY_FAM10
-	bool "Mahogany (Fam10)"
+if BOARD_AMD_MAHOGANY_FAM10
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2R2
 	select NORTHBRIDGE_AMD_AMDFAM10
@@ -27,99 +29,81 @@ config BOARD_AMD_MAHOGANY_FAM10
 config MAINBOARD_DIR
 	string
 	default amd/mahogany_fam10
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Mahogany (Fam10)"
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config MAX_CPUS
 	int
 	default 8
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000095.h"
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config RAMTOP
 	hex
 	default 0x2000000
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config HEAP_SIZE
 	hex
 	default 0xc0000
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config ACPI_SSDTX_NUM
 	int
 	default 0
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x3060
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config RAMBASE
 	hex
 	default 0x200000
-	depends on BOARD_AMD_MAHOGANY_FAM10
 
 config COMPRESS
 	hex
 	default 0
-	depends on BOARD_AMD_MAHOGANY_FAM10
+
+endif # BOARD_AMD_MAHOGANY_FAM10
diff --git a/src/mainboard/amd/norwich/Kconfig b/src/mainboard/amd/norwich/Kconfig
index 3d70ad18f4..1b6aa56682 100644
--- a/src/mainboard/amd/norwich/Kconfig
+++ b/src/mainboard/amd/norwich/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_AMD_NORWICH
-	bool "Norwich"
+if BOARD_AMD_NORWICH
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
@@ -13,19 +15,17 @@ config BOARD_AMD_NORWICH
 config MAINBOARD_DIR
 	string
 	default amd/norwich
-	depends on BOARD_AMD_NORWICH
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Norwich"
-	depends on BOARD_AMD_NORWICH
 
 config IRQ_SLOT_COUNT
 	int
 	default 6
-	depends on BOARD_AMD_NORWICH
 
 config RAMBASE
 	hex
 	default 0x4000
-	depends on BOARD_AMD_NORWICH
+
+endif # BOARD_AMD_NORWICH
diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig
index 932f22381b..1ce9fd1a14 100644
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_AMD_PISTACHIO
-	bool "Pistachio"
+if BOARD_AMD_PISTACHIO
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
 	select NORTHBRIDGE_AMD_AMDK8
@@ -21,79 +23,65 @@ config BOARD_AMD_PISTACHIO
 config MAINBOARD_DIR
 	string
 	default amd/pistachio
-	depends on BOARD_AMD_PISTACHIO
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_AMD_PISTACHIO
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_AMD_PISTACHIO
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_AMD_PISTACHIO
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_AMD_PISTACHIO
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Pistachio"
-	depends on BOARD_AMD_PISTACHIO
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_AMD_PISTACHIO
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_AMD_PISTACHIO
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 1
-	depends on BOARD_AMD_PISTACHIO
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_AMD_PISTACHIO
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_AMD_PISTACHIO
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_AMD_PISTACHIO
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_AMD_PISTACHIO
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_AMD_PISTACHIO
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_AMD_PISTACHIO
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x3050
-	depends on BOARD_AMD_PISTACHIO
+
+endif # BOARD_AMD_PISTACHIO
diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig
index d02fe3900e..4df3b8100f 100644
--- a/src/mainboard/amd/rumba/Kconfig
+++ b/src/mainboard/amd/rumba/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_AMD_RUMBA
 
-config BOARD_AMD_RUMBA
-	bool "Rumba"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_GX2
 	select NORTHBRIDGE_AMD_GX2
@@ -31,15 +32,13 @@ config BOARD_AMD_RUMBA
 config MAINBOARD_DIR
 	string
 	default amd/rumba
-	depends on BOARD_AMD_RUMBA
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Rumba"
-	depends on BOARD_AMD_RUMBA
 
 config IRQ_SLOT_COUNT
 	int
 	default 2
-	depends on BOARD_AMD_RUMBA
 
+endif # BOARD_AMD_RUMBA
diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index da15172ee4..ed5339dfb7 100644
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_AMD_SERENGETI_CHEETAH
-	bool "Serengeti Cheetah"
+if BOARD_AMD_SERENGETI_CHEETAH
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
@@ -24,94 +26,77 @@ config BOARD_AMD_SERENGETI_CHEETAH
 config MAINBOARD_DIR
 	string
 	default amd/serengeti_cheetah
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config APIC_ID_OFFSET
 	hex
 	default 0x8
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Serengeti Cheetah"
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config MAX_CPUS
 	int
 	default 8
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 4
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config MEM_TRAIN_SEQ
 	int
 	default 1
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x6
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0xa
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_AMD_SERENGETI_CHEETAH
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
-        default 0x1022
-	depends on BOARD_AMD_SERENGETI_CHEETAH
+	default 0x1022
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
-        default 0x2b80
-	depends on BOARD_AMD_SERENGETI_CHEETAH
+	default 0x2b80
 
 config ACPI_SSDTX_NUM
 	int
 	default 4
-	depends on BOARD_AMD_SERENGETI_CHEETAH
+
+endif # BOARD_AMD_SERENGETI_CHEETAH
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index 6b222677da..d2960e2411 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_AMD_SERENGETI_CHEETAH_FAM10
-	bool "Serengeti Cheetah (Fam10)"
+if BOARD_AMD_SERENGETI_CHEETAH_FAM10
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F_1207
 	select NORTHBRIDGE_AMD_AMDFAM10
@@ -25,100 +27,82 @@ config BOARD_AMD_SERENGETI_CHEETAH_FAM10
 config MAINBOARD_DIR
 	string
 	default amd/serengeti_cheetah_fam10
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Serengeti Cheetah (Fam10)"
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 # 6 * MAX_PHYSICAL_CPUS
 config MAX_CPUS
 	int
 	default 48
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 8
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x6
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0xa
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000095.h"
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config RAMTOP
 	hex
 	default 0x1000000
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config HEAP_SIZE
 	hex
 	default 0xc0000
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config ACPI_SSDTX_NUM
 	int
 	default 5
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2b80
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config RAMBASE
 	hex
 	default 0x200000
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
 
 config ID_SECTION_OFFSET
 	hex
 	default 0x80
-	depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
+
+endif # BOARD_AMD_SERENGETI_CHEETAH_FAM10
diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig
index 22813c133a..a0d58fa9a0 100644
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_AMD_TILAPIA_FAM10
-	bool "Tilapia (Fam10)"
+if BOARD_AMD_TILAPIA_FAM10
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM3
 	select NORTHBRIDGE_AMD_AMDFAM10
@@ -27,99 +29,81 @@ config BOARD_AMD_TILAPIA_FAM10
 config MAINBOARD_DIR
 	string
 	default amd/tilapia_fam10
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Tilapia (Fam10)"
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config MAX_CPUS
 	int
 	default 8
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config RAMTOP
 	hex
 	default 0x2000000
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config HEAP_SIZE
 	hex
 	default 0xc0000
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config ACPI_SSDTX_NUM
 	int
 	default 0
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x3060
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config RAMBASE
 	hex
 	default 0x200000
-	depends on BOARD_AMD_TILAPIA_FAM10
 
 config COMPRESS
 	hex
 	default 0
-	depends on BOARD_AMD_TILAPIA_FAM10
+
+endif # BOARD_AMD_TILAPIA_FAM10