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

12 files changed, 81 insertions, 97 deletions

diff --git a/src/mainboard/asus/Kconfig b/src/mainboard/asus/Kconfig
index 7db0740462..9cde166a5e 100644
--- a/src/mainboard/asus/Kconfig
+++ b/src/mainboard/asus/Kconfig
@@ -16,22 +16,50 @@
 ## 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_ASUS
 
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_ASUS
+
+config BOARD_ASUS_A8N_E
+	bool "A8N-E"
+config BOARD_ASUS_A8V_E_SE
+	bool "A8V-E SE"
+config BOARD_ASUS_M2V_MX_SE
+	bool "M2V-MX SE"
+config BOARD_ASUS_MEW_AM
+	bool "MEW-AM"
+config BOARD_ASUS_MEW_VM
+	bool "MEW-VM"
+config BOARD_ASUS_P2B
+	bool "P2B"
+config BOARD_ASUS_P2B_D
+	bool "P2B-D"
+config BOARD_ASUS_P2B_DS
+	bool "P2B-DS"
+config BOARD_ASUS_P2B_F
+	bool "P2B-F"
+config BOARD_ASUS_P2B_LS
+	bool "P2B-LS"
+config BOARD_ASUS_P3B_F
+	bool "P3B-F"
+
+endchoice
 
 source "src/mainboard/asus/a8n_e/Kconfig"
 source "src/mainboard/asus/a8v-e_se/Kconfig"
+source "src/mainboard/asus/m2v-mx_se/Kconfig"
+source "src/mainboard/asus/mew-am/Kconfig"
+source "src/mainboard/asus/mew-vm/Kconfig"
 source "src/mainboard/asus/p2b/Kconfig"
 source "src/mainboard/asus/p2b-d/Kconfig"
 source "src/mainboard/asus/p2b-ds/Kconfig"
-source "src/mainboard/asus/p2b-ls/Kconfig"
 source "src/mainboard/asus/p2b-f/Kconfig"
+source "src/mainboard/asus/p2b-ls/Kconfig"
 source "src/mainboard/asus/p3b-f/Kconfig"
-source "src/mainboard/asus/m2v-mx_se/Kconfig"
-source "src/mainboard/asus/mew-am/Kconfig"
-source "src/mainboard/asus/mew-vm/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "ASUS"
 
+endif # VENDOR_ASUS
diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig
index 73ec106d02..9b4cdc85d3 100644
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/src/mainboard/asus/a8n_e/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_ASUS_A8N_E
-	bool "A8N-E"
+if BOARD_ASUS_A8N_E
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_939
 	select NORTHBRIDGE_AMD_AMDK8
@@ -17,80 +19,65 @@ config BOARD_ASUS_A8N_E
 config MAINBOARD_DIR
 	string
 	default asus/a8n_e
-	depends on BOARD_ASUS_A8N_E
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcf000
-	depends on BOARD_ASUS_A8N_E
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_ASUS_A8N_E
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_ASUS_A8N_E
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_ASUS_A8N_E
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_ASUS_A8N_E
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "A8N-E"
-	depends on BOARD_ASUS_A8N_E
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_ASUS_A8N_E
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_ASUS_A8N_E
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 1
-	depends on BOARD_ASUS_A8N_E
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_ASUS_A8N_E
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_ASUS_A8N_E
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_ASUS_A8N_E
 
 config IRQ_SLOT_COUNT
 	int
 	default 13
-	depends on BOARD_ASUS_A8N_E
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1043
-	depends on BOARD_ASUS_A8N_E
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x815a
-	depends on BOARD_ASUS_A8N_E
 
+endif # BOARD_ASUS_A8N_E
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index 11f36ab3a4..7bf7d0ff01 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_ASUS_A8V_E_SE
-	bool "A8V-E SE"
+if BOARD_ASUS_A8V_E_SE
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_939
 	select K8_HT_FREQ_1G_SUPPORT
@@ -17,69 +19,57 @@ config BOARD_ASUS_A8V_E_SE
 config MAINBOARD_DIR
 	string
 	default asus/a8v-e_se
-	depends on BOARD_ASUS_A8V_E_SE
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcc000
-	depends on BOARD_ASUS_A8V_E_SE
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x4000
-	depends on BOARD_ASUS_A8V_E_SE
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x1000
-	depends on BOARD_ASUS_A8V_E_SE
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_ASUS_A8V_E_SE
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_ASUS_A8V_E_SE
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "A8V-E SE"
-	depends on BOARD_ASUS_A8V_E_SE
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0
-	depends on BOARD_ASUS_A8V_E_SE
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_ASUS_A8V_E_SE
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 1
-	depends on BOARD_ASUS_A8V_E_SE
 
 config HEAP_SIZE
 	hex
 	default 0x40000
-	depends on BOARD_ASUS_A8V_E_SE
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_ASUS_A8V_E_SE
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_ASUS_A8V_E_SE
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1043
-	depends on BOARD_ASUS_A8V_E_SE
+
+endif # BOARD_ASUS_A8V_E_SE
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index 822790054f..cf26512f94 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/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_ASUS_M2V_MX_SE
 
-config BOARD_ASUS_M2V_MX_SE
-	bool "M2V-MX SE"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
 	select NORTHBRIDGE_AMD_AMDK8
@@ -37,65 +38,53 @@ config BOARD_ASUS_M2V_MX_SE
 config MAINBOARD_DIR
 	string
 	default asus/m2v-mx_se
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcc000
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x4000
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "M2V-MX SE"
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 1
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config HEAP_SIZE
 	hex
 	default 0x40000
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_ASUS_M2V_MX_SE
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1043
-	depends on BOARD_ASUS_M2V_MX_SE
 
+endif # BOARD_ASUS_M2V_MX_SE
diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig
index fc0691cb07..afe6a0dee3 100644
--- a/src/mainboard/asus/mew-am/Kconfig
+++ b/src/mainboard/asus/mew-am/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_ASUS_MEW_AM
 
-config BOARD_ASUS_MEW_AM
-	bool "MEW-AM"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
@@ -34,15 +35,13 @@ config BOARD_ASUS_MEW_AM
 config MAINBOARD_DIR
 	string
 	default asus/mew-am
-	depends on BOARD_ASUS_MEW_AM
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MEW-AM"
-	depends on BOARD_ASUS_MEW_AM
 
 config IRQ_SLOT_COUNT
 	int
 	default 8
-	depends on BOARD_ASUS_MEW_AM
 
+endif # BOARD_ASUS_MEW_AM
diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig
index 886bb5b2ab..bc952dccbd 100644
--- a/src/mainboard/asus/mew-vm/Kconfig
+++ b/src/mainboard/asus/mew-vm/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_ASUS_MEW_VM
 
-config BOARD_ASUS_MEW_VM
-	bool "MEW-VM"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
@@ -35,15 +36,13 @@ config BOARD_ASUS_MEW_VM
 config MAINBOARD_DIR
 	string
 	default asus/mew-vm
-	depends on BOARD_ASUS_MEW_VM
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MEW-VM"
-	depends on BOARD_ASUS_MEW_VM
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_ASUS_MEW_VM
 
+endif # BOARD_ASUS_MEW_VM
diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig
index db9b3e895f..a16debb29c 100644
--- a/src/mainboard/asus/p2b-d/Kconfig
+++ b/src/mainboard/asus/p2b-d/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_ASUS_P2B_D
 
-config BOARD_ASUS_P2B_D
-	bool "P2B-D"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
@@ -35,20 +36,17 @@ config BOARD_ASUS_P2B_D
 config MAINBOARD_DIR
 	string
 	default asus/p2b-d
-	depends on BOARD_ASUS_P2B_D
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "P2B-D"
-	depends on BOARD_ASUS_P2B_D
 
 config IRQ_SLOT_COUNT
 	int
 	default 6
-	depends on BOARD_ASUS_P2B_D
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_ASUS_P2B_D
 
+endif # BOARD_ASUS_P2B_D
diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig
index 23a96facab..ff495d88b2 100644
--- a/src/mainboard/asus/p2b-ds/Kconfig
+++ b/src/mainboard/asus/p2b-ds/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_ASUS_P2B_DS
 
-config BOARD_ASUS_P2B_DS
-	bool "P2B-DS"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
@@ -35,20 +36,17 @@ config BOARD_ASUS_P2B_DS
 config MAINBOARD_DIR
 	string
 	default asus/p2b-ds
-	depends on BOARD_ASUS_P2B_DS
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "P2B-DS"
-	depends on BOARD_ASUS_P2B_DS
 
 config IRQ_SLOT_COUNT
 	int
 	default 7
-	depends on BOARD_ASUS_P2B_DS
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_ASUS_P2B_DS
 
+endif # BOARD_ASUS_P2B_DS
diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
index bddc276179..8041031c41 100644
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ b/src/mainboard/asus/p2b-f/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_ASUS_P2B_F
 
-config BOARD_ASUS_P2B_F
-	bool "P2B-F"
+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_ASUS_P2B_F
 config MAINBOARD_DIR
 	string
 	default asus/p2b-f
-	depends on BOARD_ASUS_P2B_F
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "P2B-F"
-	depends on BOARD_ASUS_P2B_F
 
 config IRQ_SLOT_COUNT
 	int
 	default 7
-	depends on BOARD_ASUS_P2B_F
 
+endif # BOARD_ASUS_P2B_F
diff --git a/src/mainboard/asus/p2b-ls/Kconfig b/src/mainboard/asus/p2b-ls/Kconfig
index 181d1b4cec..8afa739b2b 100644
--- a/src/mainboard/asus/p2b-ls/Kconfig
+++ b/src/mainboard/asus/p2b-ls/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_ASUS_P2B_LS
 
-config BOARD_ASUS_P2B_LS
-	bool "P2B-LS"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
@@ -33,15 +34,13 @@ config BOARD_ASUS_P2B_LS
 config MAINBOARD_DIR
 	string
 	default asus/p2b-ls
-	depends on BOARD_ASUS_P2B_LS
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "P2B-LS"
-	depends on BOARD_ASUS_P2B_LS
 
 config IRQ_SLOT_COUNT
 	int
 	default 8
-	depends on BOARD_ASUS_P2B_LS
 
+endif # BOARD_ASUS_P2B_LS
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index b5ae83e475..240820691c 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/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_ASUS_P2B
 
-config BOARD_ASUS_P2B
-	bool "P2B"
+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_ASUS_P2B
 config MAINBOARD_DIR
 	string
 	default asus/p2b
-	depends on BOARD_ASUS_P2B
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "P2B"
-	depends on BOARD_ASUS_P2B
 
 config IRQ_SLOT_COUNT
 	int
 	default 6
-	depends on BOARD_ASUS_P2B
 
+endif # BOARD_ASUS_P2B
diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig
index 5815f6b087..6581a94fb1 100644
--- a/src/mainboard/asus/p3b-f/Kconfig
+++ b/src/mainboard/asus/p3b-f/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_ASUS_P3B_F
 
-config BOARD_ASUS_P3B_F
-	bool "P3B-F"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
@@ -33,15 +34,13 @@ config BOARD_ASUS_P3B_F
 config MAINBOARD_DIR
 	string
 	default asus/p3b-f
-	depends on BOARD_ASUS_P3B_F
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "P3B-F"
-	depends on BOARD_ASUS_P3B_F
 
 config IRQ_SLOT_COUNT
 	int
 	default 8
-	depends on BOARD_ASUS_P3B_F
 
+endif # BOARD_ASUS_P3B_F