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

3 files changed, 25 insertions, 36 deletions

diff --git a/src/mainboard/ibm/Kconfig b/src/mainboard/ibm/Kconfig
index d9d1774532..642bb86714 100644
--- a/src/mainboard/ibm/Kconfig
+++ b/src/mainboard/ibm/Kconfig
@@ -1,9 +1,20 @@
+if VENDOR_IBM
+
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_IBM
+
+config BOARD_IBM_E325
+	bool "eServer 325"
+config BOARD_IBM_E326
+	bool "eServer 326"
+
+endchoice
 
 source "src/mainboard/ibm/e325/Kconfig"
 source "src/mainboard/ibm/e326/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "IBM"
 
+endif # VENDOR_IBM
diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig
index b23d601424..83f0b1f57b 100644
--- a/src/mainboard/ibm/e325/Kconfig
+++ b/src/mainboard/ibm/e325/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_IBM_E325
-	bool "eServer 325"
+if BOARD_IBM_E325
+
+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_IBM_E325
 config MAINBOARD_DIR
 	string
 	default ibm/e325
-	depends on BOARD_IBM_E325
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcf000
-	depends on BOARD_IBM_E325
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x1000
-	depends on BOARD_IBM_E325
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x0
-	depends on BOARD_IBM_E325
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_IBM_E325
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "eServer 325"
-	depends on BOARD_IBM_E325
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_IBM_E325
 
 config MAX_CPUS
 	int
 	default 1
-	depends on BOARD_IBM_E325
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 1
-	depends on BOARD_IBM_E325
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_IBM_E325
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 0
-	depends on BOARD_IBM_E325
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_IBM_E325
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_IBM_E325
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_IBM_E325
 
 config IRQ_SLOT_COUNT
 	int
 	default 12
-	depends on BOARD_IBM_E325
+
+endif # BOARD_IBM_E325
diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig
index 7f6c9a2e72..4d345088ac 100644
--- a/src/mainboard/ibm/e326/Kconfig
+++ b/src/mainboard/ibm/e326/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_IBM_E326
-	bool "eServer 326"
+if BOARD_IBM_E326
+
+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_IBM_E326
 config MAINBOARD_DIR
 	string
 	default ibm/e326
-	depends on BOARD_IBM_E326
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcf000
-	depends on BOARD_IBM_E326
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x1000
-	depends on BOARD_IBM_E326
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x0
-	depends on BOARD_IBM_E326
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_IBM_E326
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "eServer 326"
-	depends on BOARD_IBM_E326
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_IBM_E326
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_IBM_E326
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_IBM_E326
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_IBM_E326
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 0
-	depends on BOARD_IBM_E326
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_IBM_E326
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_IBM_E326
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_IBM_E326
 
 config IRQ_SLOT_COUNT
 	int
 	default 12
-	depends on BOARD_IBM_E326
+
+endif # BOARD_IBM_E326