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

8 files changed, 64 insertions, 63 deletions

diff --git a/src/mainboard/intel/Kconfig b/src/mainboard/intel/Kconfig
index 18e77d3bb4..612b1c1753 100644
--- a/src/mainboard/intel/Kconfig
+++ b/src/mainboard/intel/Kconfig
@@ -1,6 +1,24 @@
+if VENDOR_INTEL
+
 choice
-        prompt "Mainboard model"
-        depends on VENDOR_INTEL
+	prompt "Mainboard model"
+
+config BOARD_INTEL_D810E2CB
+	bool "D810E2CB"
+config BOARD_INTEL_D945GCLF
+	bool "D945GCLF"
+config BOARD_INTEL_EAGLEHEIGHTS
+	bool "EagleHeights"
+config BOARD_INTEL_JARRELL
+	bool "Jarrell (SE7520JR2)"
+config BOARD_INTEL_MTARVON
+	bool "3100 devkit (Mt. Arvon)"
+config BOARD_INTEL_TRUXTON
+	bool "EP80579 devkit (Truxton)"
+config BOARD_INTEL_XE7501DEVKIT
+	bool "XE7501devkit"
+
+endchoice
 
 source "src/mainboard/intel/d810e2cb/Kconfig"
 source "src/mainboard/intel/d945gclf/Kconfig"
@@ -10,5 +28,12 @@ source "src/mainboard/intel/mtarvon/Kconfig"
 source "src/mainboard/intel/truxton/Kconfig"
 source "src/mainboard/intel/xe7501devkit/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "Intel"
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x8086
 
+endif # VENDOR_INTEL
diff --git a/src/mainboard/intel/d810e2cb/Kconfig b/src/mainboard/intel/d810e2cb/Kconfig
index cb7dd1c8b6..3031a30fd2 100644
--- a/src/mainboard/intel/d810e2cb/Kconfig
+++ b/src/mainboard/intel/d810e2cb/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_INTEL_D810E2CB
 
-config BOARD_INTEL_D810E2CB
-	bool "D810E2CB"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_FC_PGA370
 	select NORTHBRIDGE_INTEL_I82810
@@ -35,15 +36,13 @@ config BOARD_INTEL_D810E2CB
 config MAINBOARD_DIR
 	string
 	default intel/d810e2cb
-	depends on BOARD_INTEL_D810E2CB
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "D810E2CB"
-	depends on BOARD_INTEL_D810E2CB
 
 config IRQ_SLOT_COUNT
 	int
 	default 7
-	depends on BOARD_INTEL_D810E2CB
 
+endif # BOARD_INTEL_D810E2CB
diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index cad2ecf3e0..df9ed1df0c 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/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_INTEL_D945GCLF
 
-config BOARD_INTEL_D945GCLF
-	bool "D945GCLF"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_ATOM_230
 	select CPU_INTEL_SOCKET_441
@@ -47,45 +48,37 @@ config BOARD_INTEL_D945GCLF
 config MAINBOARD_DIR
 	string
 	default intel/d945gclf
-	depends on BOARD_INTEL_D945GCLF
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xffdf8000
-	depends on BOARD_INTEL_D945GCLF
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x8000
-	depends on BOARD_INTEL_D945GCLF
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "D945GCLF"
-	depends on BOARD_INTEL_D945GCLF
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x464C
-	depends on BOARD_INTEL_D945GCLF
 
 config MMCONF_BASE_ADDRESS
 	hex
 	default 0xf0000000
-	depends on BOARD_INTEL_D945GCLF
 
 config IRQ_SLOT_COUNT
 	int
 	default 18
-	depends on BOARD_INTEL_D945GCLF
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_INTEL_D945GCLF
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_INTEL_D945GCLF
 
+endif # BOARD_INTEL_D945GCLF
diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig
index e00c7a5320..246946e465 100644
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/src/mainboard/intel/eagleheights/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_INTEL_EAGLEHEIGHTS
-	bool "EagleHeights"
+if BOARD_INTEL_EAGLEHEIGHTS
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_BGA956
 	select NORTHBRIDGE_INTEL_I3100
@@ -21,44 +23,37 @@ config BOARD_INTEL_EAGLEHEIGHTS
 config MAINBOARD_DIR
 	string
 	default intel/eagleheights
-	depends on BOARD_INTEL_EAGLEHEIGHTS
 
 config MMCONF_BASE_ADDRESS
 	hex
 	default 0xe0000000
-	depends on BOARD_INTEL_EAGLEHEIGHTS
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xffdf8000
-	depends on BOARD_INTEL_EAGLEHEIGHTS
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x8000
-	depends on BOARD_INTEL_EAGLEHEIGHTS
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "EagleHeights"
-	depends on BOARD_INTEL_EAGLEHEIGHTS
 
 config MMCONF_BASE_ADDRESS
 	hex
 	default 0xe0000000
-	depends on BOARD_INTEL_EAGLEHEIGHTS
 
 config IRQ_SLOT_COUNT
 	int
 	default 9
-	depends on BOARD_INTEL_EAGLEHEIGHTS
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_INTEL_EAGLEHEIGHTS
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_INTEL_EAGLEHEIGHTS
+
+endif # BOARD_INTEL_EAGLEHEIGHTS
diff --git a/src/mainboard/intel/jarrell/Kconfig b/src/mainboard/intel/jarrell/Kconfig
index aef112c9ba..f6c701d485 100644
--- a/src/mainboard/intel/jarrell/Kconfig
+++ b/src/mainboard/intel/jarrell/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_INTEL_JARRELL
-	bool "Jarrell (SE7520JR2)"
+if BOARD_INTEL_JARRELL
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
@@ -20,30 +22,25 @@ config BOARD_INTEL_JARRELL
 config MAINBOARD_DIR
 	string
 	default intel/jarrell
-	depends on BOARD_INTEL_JARRELL
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Jarrell"
-	depends on BOARD_INTEL_JARRELL
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_INTEL_JARRELL
 
 config IRQ_SLOT_COUNT
 	int
 	default 18
-	depends on BOARD_INTEL_JARRELL
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x8086
-	depends on BOARD_INTEL_JARRELL
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x1079
-	depends on BOARD_INTEL_JARRELL
 
+endif # BOARD_INTEL_JARRELL
diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig
index ce9d9a4f0c..75cab8f23b 100644
--- a/src/mainboard/intel/mtarvon/Kconfig
+++ b/src/mainboard/intel/mtarvon/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_INTEL_MTARVON
-	bool "3100 devkit (Mt. Arvon)"
+if BOARD_INTEL_MTARVON
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA479M
 	select NORTHBRIDGE_INTEL_I3100
@@ -15,29 +17,25 @@ config BOARD_INTEL_MTARVON
 config MAINBOARD_DIR
 	string
 	default intel/mtarvon
-	depends on BOARD_INTEL_MTARVON
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "3100 devkit (Mt. Arvon)"
-	depends on BOARD_INTEL_MTARVON
 
 config IRQ_SLOT_COUNT
 	int
 	default 1
-	depends on BOARD_INTEL_MTARVON
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x8086
-	depends on BOARD_INTEL_MTARVON
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2680
-	depends on BOARD_INTEL_MTARVON
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_INTEL_MTARVON
+
+endif # BOARD_INTEL_MTARVON
diff --git a/src/mainboard/intel/truxton/Kconfig b/src/mainboard/intel/truxton/Kconfig
index 6b7a220614..1ba71372db 100644
--- a/src/mainboard/intel/truxton/Kconfig
+++ b/src/mainboard/intel/truxton/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_INTEL_TRUXTON
-	bool "EP80579 devkit (Truxton)"
+if BOARD_INTEL_TRUXTON
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_EP80579
 	select NORTHBRIDGE_INTEL_I3100
@@ -16,29 +18,25 @@ config BOARD_INTEL_TRUXTON
 config MAINBOARD_DIR
 	string
 	default intel/truxton
-	depends on BOARD_INTEL_TRUXTON
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Truxton"
-	depends on BOARD_INTEL_TRUXTON
 
 config IRQ_SLOT_COUNT
 	int
 	default 1
-	depends on BOARD_INTEL_TRUXTON
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x8086
-	depends on BOARD_INTEL_TRUXTON
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2680
-	depends on BOARD_INTEL_TRUXTON
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_INTEL_TRUXTON
+
+endif # BOARD_INTEL_TRUXTON
diff --git a/src/mainboard/intel/xe7501devkit/Kconfig b/src/mainboard/intel/xe7501devkit/Kconfig
index 5ce7021cf8..35a1cd1f69 100644
--- a/src/mainboard/intel/xe7501devkit/Kconfig
+++ b/src/mainboard/intel/xe7501devkit/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_INTEL_XE7501DEVKIT
-	bool "XE7501devkit"
+if BOARD_INTEL_XE7501DEVKIT
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7501
@@ -18,35 +20,29 @@ config BOARD_INTEL_XE7501DEVKIT
 config MAINBOARD_DIR
 	string
 	default intel/xe7501devkit
-	depends on BOARD_INTEL_XE7501DEVKIT
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "XE7501devkit"
-	depends on BOARD_INTEL_XE7501DEVKIT
 
 config IRQ_SLOT_COUNT
 	int
 	default 12
-	depends on BOARD_INTEL_XE7501DEVKIT
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_INTEL_XE7501DEVKIT
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_INTEL_XE7501DEVKIT
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x8086
-	depends on BOARD_INTEL_XE7501DEVKIT
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2480
-	depends on BOARD_INTEL_XE7501DEVKIT
 
+endif # BOARD_INTEL_XE7501DEVKIT