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

4 files changed, 32 insertions, 58 deletions

diff --git a/src/mainboard/iwill/Kconfig b/src/mainboard/iwill/Kconfig
index 4a157954ab..c520138818 100644
--- a/src/mainboard/iwill/Kconfig
+++ b/src/mainboard/iwill/Kconfig
@@ -1,10 +1,23 @@
+if VENDOR_IWILL
+
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_IWILL
+
+config BOARD_IWILL_DK8_HTX
+	bool "DK8-HTX"
+config BOARD_IWILL_DK8S2
+	bool "DK8S2"
+config BOARD_IWILL_DK8X
+	bool "DK8X"
+
+endchoice
 
 source "src/mainboard/iwill/dk8_htx/Kconfig"
 source "src/mainboard/iwill/dk8s2/Kconfig"
 source "src/mainboard/iwill/dk8x/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "IWILL"
 
+endif # VENDOR_IWILL
diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig
index 1b425f6b6b..eebfef5544 100644
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/src/mainboard/iwill/dk8_htx/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_IWILL_DK8_HTX
-	bool "DK8-HTX"
+if BOARD_IWILL_DK8_HTX
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -23,89 +25,73 @@ config BOARD_IWILL_DK8_HTX
 config MAINBOARD_DIR
 	string
 	default iwill/dk8_htx
-	depends on BOARD_IWILL_DK8_HTX
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_IWILL_DK8_HTX
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_IWILL_DK8_HTX
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_IWILL_DK8_HTX
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_IWILL_DK8_HTX
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "DK8-HTX"
-	depends on BOARD_IWILL_DK8_HTX
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_IWILL_DK8_HTX
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_IWILL_DK8_HTX
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_IWILL_DK8_HTX
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_IWILL_DK8_HTX
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_IWILL_DK8_HTX
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x6
-	depends on BOARD_IWILL_DK8_HTX
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0xa
-	depends on BOARD_IWILL_DK8_HTX
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_IWILL_DK8_HTX
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_IWILL_DK8_HTX
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_IWILL_DK8_HTX
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2b80
-	depends on BOARD_IWILL_DK8_HTX
 
 config ACPI_SSDTX_NUM
 	int
 	default 5
-	depends on BOARD_IWILL_DK8_HTX
+
+endif # BOARD_IWILL_DK8_HTX
diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig
index 10d525acfa..ee88bd375f 100644
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/src/mainboard/iwill/dk8s2/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_IWILL_DK8S2
-	bool "DK8S2"
+if BOARD_IWILL_DK8S2
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -20,85 +22,69 @@ config BOARD_IWILL_DK8S2
 config MAINBOARD_DIR
 	string
 	default iwill/dk8s2
-	depends on BOARD_IWILL_DK8S2
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_IWILL_DK8S2
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_IWILL_DK8S2
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_IWILL_DK8S2
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_IWILL_DK8S2
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "DK8S2"
-	depends on BOARD_IWILL_DK8S2
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_IWILL_DK8S2
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_IWILL_DK8S2
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_IWILL_DK8S2
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_IWILL_DK8S2
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 0
-	depends on BOARD_IWILL_DK8S2
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_IWILL_DK8S2
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_IWILL_DK8S2
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_IWILL_DK8S2
 
 config IRQ_SLOT_COUNT
 	int
 	default 12
-	depends on BOARD_IWILL_DK8S2
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x161f
-	depends on BOARD_IWILL_DK8S2
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x3016
-	depends on BOARD_IWILL_DK8S2
 
+endif # BOARD_IWILL_DK8S2
diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig
index 184edc062d..652ff1beb6 100644
--- a/src/mainboard/iwill/dk8x/Kconfig
+++ b/src/mainboard/iwill/dk8x/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_IWILL_DK8X
-	bool "DK8X"
+if BOARD_IWILL_DK8X
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -19,74 +21,61 @@ config BOARD_IWILL_DK8X
 config MAINBOARD_DIR
 	string
 	default iwill/dk8x
-	depends on BOARD_IWILL_DK8X
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_IWILL_DK8X
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_IWILL_DK8X
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_IWILL_DK8X
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_IWILL_DK8X
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "DK8X"
-	depends on BOARD_IWILL_DK8X
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_IWILL_DK8X
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_IWILL_DK8X
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_IWILL_DK8X
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_IWILL_DK8X
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 0
-	depends on BOARD_IWILL_DK8X
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_IWILL_DK8X
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_IWILL_DK8X
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_IWILL_DK8X
 
 config IRQ_SLOT_COUNT
 	int
 	default 9
-	depends on BOARD_IWILL_DK8X
+
+endif # BOARD_IWILL_DK8X