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, 38 deletions

diff --git a/src/mainboard/hp/Kconfig b/src/mainboard/hp/Kconfig
index 751cdc0473..19de4243c1 100644
--- a/src/mainboard/hp/Kconfig
+++ b/src/mainboard/hp/Kconfig
@@ -1,10 +1,23 @@
+if VENDOR_HP
+
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_HP
+
+config BOARD_HP_DL145_G1
+	bool "ProLiant DL145 G1"
+config BOARD_HP_DL145_G3
+	bool "ProLiant DL145 G3"
+config BOARD_HP_E_VECTRA_P2706T
+	bool "e-Vectra P2706T"
+
+endchoice
 
 source "src/mainboard/hp/dl145_g1/Kconfig"
 source "src/mainboard/hp/dl145_g3/Kconfig"
 source "src/mainboard/hp/e_vectra_p2706t/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "HP"
 
+endif # VENDOR_HP
diff --git a/src/mainboard/hp/dl145_g1/Kconfig b/src/mainboard/hp/dl145_g1/Kconfig
index a6e8de9b84..351eeb8bc5 100644
--- a/src/mainboard/hp/dl145_g1/Kconfig
+++ b/src/mainboard/hp/dl145_g1/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_HP_DL145_G1
-	bool "ProLiant DL145 G1"
+if BOARD_HP_DL145_G1
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
@@ -18,64 +20,53 @@ config BOARD_HP_DL145_G1
 config MAINBOARD_DIR
 	string
 	default hp/dl145_g1
-	depends on BOARD_HP_DL145_G1
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_HP_DL145_G1
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_HP_DL145_G1
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "ProLiant DL145 G1"
-	depends on BOARD_HP_DL145_G1
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_HP_DL145_G1
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x7460
-	depends on BOARD_HP_DL145_G1
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_HP_DL145_G1
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_HP_DL145_G1
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_HP_DL145_G1
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_HP_DL145_G1
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_HP_DL145_G1
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x6
-	depends on BOARD_HP_DL145_G1
 
 config IRQ_SLOT_COUNT
 	int
 	default 9
-	depends on BOARD_HP_DL145_G1
+
+endif # BOARD_HP_DL145_G1
diff --git a/src/mainboard/hp/dl145_g3/Kconfig b/src/mainboard/hp/dl145_g3/Kconfig
index 956aaffde5..e2dc909e1e 100644
--- a/src/mainboard/hp/dl145_g3/Kconfig
+++ b/src/mainboard/hp/dl145_g3/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_HP_DL145_G3
-	bool "ProLiant DL145 G3"
+if BOARD_HP_DL145_G3
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
@@ -20,69 +22,57 @@ config BOARD_HP_DL145_G3
 config MAINBOARD_DIR
 	string
 	default hp/dl145_g3
-	depends on BOARD_HP_DL145_G3
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xcc000
-	depends on BOARD_HP_DL145_G3
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x04000
-	depends on BOARD_HP_DL145_G3
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_HP_DL145_G3
 
 config APIC_ID_OFFSET
 	hex
 	default 0x8
-	depends on BOARD_HP_DL145_G3
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_HP_DL145_G3
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "ProLiant DL145 G3"
-	depends on BOARD_HP_DL145_G3
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_HP_DL145_G3
 
 config MAX_CPUS
 	int
 	default 4
-	depends on BOARD_HP_DL145_G3
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_HP_DL145_G3
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_HP_DL145_G3
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x6
-	depends on BOARD_HP_DL145_G3
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_HP_DL145_G3
 
 config IRQ_SLOT_COUNT
 	int
 	default 15
-	depends on BOARD_HP_DL145_G3
+
+endif # BOARD_HP_DL145_G3
diff --git a/src/mainboard/hp/e_vectra_p2706t/Kconfig b/src/mainboard/hp/e_vectra_p2706t/Kconfig
index 57131e94b0..7186dae605 100644
--- a/src/mainboard/hp/e_vectra_p2706t/Kconfig
+++ b/src/mainboard/hp/e_vectra_p2706t/Kconfig
@@ -20,8 +20,10 @@
 # FIXME: It's a PC87360 actually.
 # FIXME: It's an i810E actually!
 # FIXME: ROM chip size really 512KB?
-config BOARD_HP_E_VECTRA_P2706T
-	bool "e-Vectra P2706T"
+if BOARD_HP_E_VECTRA_P2706T
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
@@ -37,15 +39,13 @@ config BOARD_HP_E_VECTRA_P2706T
 config MAINBOARD_DIR
 	string
 	default hp/e_vectra_p2706t
-	depends on BOARD_HP_E_VECTRA_P2706T
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "e-Vectra P2706T"
-	depends on BOARD_HP_E_VECTRA_P2706T
 
 config IRQ_SLOT_COUNT
 	int
 	default 3
-	depends on BOARD_HP_E_VECTRA_P2706T
 
+endif # BOARD_HP_E_VECTRA_P2706T