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

7 files changed, 55 insertions, 100 deletions

diff --git a/src/mainboard/gigabyte/Kconfig b/src/mainboard/gigabyte/Kconfig
index ab23999294..f337044b5f 100644
--- a/src/mainboard/gigabyte/Kconfig
+++ b/src/mainboard/gigabyte/Kconfig
@@ -16,10 +16,25 @@
 ## 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_GIGABYTE
 
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_GIGABYTE
+
+config BOARD_GIGABYTE_GA_2761GXDK
+	bool "GA-2761GXDK"
+config BOARD_GIGABYTE_GA_6BXC
+	bool "GA-6BXC"
+config BOARD_GIGABYTE_GA_6BXE
+	bool "GA-6BXE"
+config BOARD_GIGABYTE_M57SLI
+	bool "GA-M57SLI-S4"
+config BOARD_GIGABYTE_GA785GMT
+	bool "MA785GMT"
+config BOARD_GIGABYTE_MA78GM
+	bool "MA78GM-US2H"
+
+endchoice
 
 source "src/mainboard/gigabyte/ga_2761gxdk/Kconfig"
 source "src/mainboard/gigabyte/ga-6bxc/Kconfig"
@@ -27,5 +42,9 @@ source "src/mainboard/gigabyte/ga-6bxe/Kconfig"
 source "src/mainboard/gigabyte/m57sli/Kconfig"
 source "src/mainboard/gigabyte/ma785gmt/Kconfig"
 source "src/mainboard/gigabyte/ma78gm/Kconfig"
-endchoice
 
+config MAINBOARD_VENDOR
+	string
+	default "GIGABYTE"
+
+endif # VENDOR_GIGABYTE
diff --git a/src/mainboard/gigabyte/ga-6bxc/Kconfig b/src/mainboard/gigabyte/ga-6bxc/Kconfig
index 46c76475cc..f89c44088f 100644
--- a/src/mainboard/gigabyte/ga-6bxc/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxc/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_GIGABYTE_GA_6BXC
 
-config BOARD_GIGABYTE_GA_6BXC
-	bool "GA-6BXC"
+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_GIGABYTE_GA_6BXC
 config MAINBOARD_DIR
 	string
 	default gigabyte/ga-6bxc
-	depends on BOARD_GIGABYTE_GA_6BXC
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "GA-6BXC"
-	depends on BOARD_GIGABYTE_GA_6BXC
 
 config IRQ_SLOT_COUNT
 	int
 	default 6
-	depends on BOARD_GIGABYTE_GA_6BXC
 
+endif # BOARD_GIGABYTE_GA_6BXC
diff --git a/src/mainboard/gigabyte/ga-6bxe/Kconfig b/src/mainboard/gigabyte/ga-6bxe/Kconfig
index dc8e6bece6..34a3281d78 100644
--- a/src/mainboard/gigabyte/ga-6bxe/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxe/Kconfig
@@ -17,9 +17,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_GIGABYTE_GA_6BXE
 
-config BOARD_GIGABYTE_GA_6BXE
-	bool "GA-6BXE"
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
@@ -34,15 +35,13 @@ config BOARD_GIGABYTE_GA_6BXE
 config MAINBOARD_DIR
 	string
 	default gigabyte/ga-6bxe
-	depends on BOARD_GIGABYTE_GA_6BXE
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "GA-6BXE"
-	depends on BOARD_GIGABYTE_GA_6BXE
 
 config IRQ_SLOT_COUNT
 	int
 	default 7
-	depends on BOARD_GIGABYTE_GA_6BXE
 
+endif # BOARD_GIGABYTE_GA_6BXE
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
index 85519085be..bcd92056ff 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_GIGABYTE_GA_2761GXDK
-	bool "GA-2761GXDK"
+if BOARD_GIGABYTE_GA_2761GXDK
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
 	select NORTHBRIDGE_AMD_AMDK8
@@ -18,94 +20,77 @@ config BOARD_GIGABYTE_GA_2761GXDK
 config MAINBOARD_DIR
 	string
 	default gigabyte/ga_2761gxdk
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "GA-2761GXDK"
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config PCI_64BIT_PREF_MEM
 	bool
-        default n
-	depends on BOARD_GIGABYTE_GA_2761GXDK
+	default n
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 1
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1039
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x1234
-	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_GIGABYTE_GA_2761GXDK
+
+endif # BOARD_GIGABYTE_GA_2761GXDK
diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig
index 5e77631cff..55ac320706 100644
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_GIGABYTE_M57SLI
-	bool "GA-M57SLI-S4"
+if BOARD_GIGABYTE_M57SLI
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2
 	select NORTHBRIDGE_AMD_AMDK8
@@ -21,94 +23,77 @@ config BOARD_GIGABYTE_M57SLI
 config MAINBOARD_DIR
 	string
 	default gigabyte/m57sli
-	depends on BOARD_GIGABYTE_M57SLI
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on BOARD_GIGABYTE_M57SLI
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x08000
-	depends on BOARD_GIGABYTE_M57SLI
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
 	default 0x01000
-	depends on BOARD_GIGABYTE_M57SLI
 
 config APIC_ID_OFFSET
 	hex
 	default 0x10
-	depends on BOARD_GIGABYTE_M57SLI
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_GIGABYTE_M57SLI
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 2
-	depends on BOARD_GIGABYTE_M57SLI
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "GA-M57SLI-S4"
-	depends on BOARD_GIGABYTE_M57SLI
 
 config PCI_64BIT_PREF_MEM
 	bool
-        default n
-	depends on BOARD_GIGABYTE_M57SLI
+	default n
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_GIGABYTE_M57SLI
 
 config MAX_CPUS
 	int
 	default 2
-	depends on BOARD_GIGABYTE_M57SLI
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 1
-	depends on BOARD_GIGABYTE_M57SLI
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_GIGABYTE_M57SLI
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_GIGABYTE_M57SLI
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
-	depends on BOARD_GIGABYTE_M57SLI
 
 config SERIAL_CPU_INIT
 	bool
 	default n
-	depends on BOARD_GIGABYTE_M57SLI
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_GIGABYTE_M57SLI
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x2b80
-	depends on BOARD_GIGABYTE_M57SLI
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_GIGABYTE_M57SLI
+
+endif # BOARD_GIGABYTE_M57SLI
diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig
index 3f736da86b..767f681862 100644
--- a/src/mainboard/gigabyte/ma785gmt/Kconfig
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_GIGABYTE_GA785GMT
-	bool "MA785GMT"
+if BOARD_GIGABYTE_GA785GMT
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM3
 	select NORTHBRIDGE_AMD_AMDFAM10
@@ -27,99 +29,81 @@ config BOARD_GIGABYTE_GA785GMT
 config MAINBOARD_DIR
 	string
 	default gigabyte/ma785gmt
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "Gigabyte GA785GMT"
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config MAX_CPUS
 	int
 	default 8
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_010000b6.h"
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config RAMTOP
 	hex
 	default 0x2000000
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config HEAP_SIZE
 	hex
 	default 0xc0000
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config ACPI_SSDTX_NUM
 	int
 	default 0
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x3060
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config RAMBASE
 	hex
 	default 0x200000
-	depends on BOARD_GIGABYTE_GA785GMT
 
 config COMPRESS
 	hex
 	default 0
-	depends on BOARD_GIGABYTE_GA785GMT
+
+endif # BOARD_GIGABYTE_GA785GMT
diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig
index 255af8de30..f8d7a3e785 100644
--- a/src/mainboard/gigabyte/ma78gm/Kconfig
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_GIGABYTE_MA78GM
-	bool "MA78GM-US2H"
+if BOARD_GIGABYTE_MA78GM
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SOCKET_AM2R2
 	select NORTHBRIDGE_AMD_AMDFAM10
@@ -27,99 +29,81 @@ config BOARD_GIGABYTE_MA78GM
 config MAINBOARD_DIR
 	string
 	default gigabyte/ma78gm
-	depends on BOARD_GIGABYTE_MA78GM
 
 config APIC_ID_OFFSET
 	hex
 	default 0x0
-	depends on BOARD_GIGABYTE_MA78GM
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "GIGABYTE MA78GM"
-	depends on BOARD_GIGABYTE_MA78GM
 
 config HW_MEM_HOLE_SIZEK
 	hex
 	default 0x100000
-	depends on BOARD_GIGABYTE_MA78GM
 
 config MAX_CPUS
 	int
 	default 8
-	depends on BOARD_GIGABYTE_MA78GM
 
 config MAX_PHYSICAL_CPUS
 	int
 	default 2
-	depends on BOARD_GIGABYTE_MA78GM
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
-	depends on BOARD_GIGABYTE_MA78GM
 
 config MEM_TRAIN_SEQ
 	int
 	default 2
-	depends on BOARD_GIGABYTE_MA78GM
 
 config SB_HT_CHAIN_ON_BUS0
 	int
 	default 1
-	depends on BOARD_GIGABYTE_MA78GM
 
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
-	depends on BOARD_GIGABYTE_MA78GM
 
 config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
-	depends on BOARD_GIGABYTE_MA78GM
 
 config IRQ_SLOT_COUNT
 	int
 	default 11
-	depends on BOARD_GIGABYTE_MA78GM
 
 config AMD_UCODE_PATCH_FILE
 	string
 	default "mc_patch_01000095.h"
-	depends on BOARD_GIGABYTE_MA78GM
 
 config RAMTOP
 	hex
 	default 0x2000000
-	depends on BOARD_GIGABYTE_MA78GM
 
 config HEAP_SIZE
 	hex
 	default 0xc0000
-	depends on BOARD_GIGABYTE_MA78GM
 
 config ACPI_SSDTX_NUM
 	int
 	default 0
-	depends on BOARD_GIGABYTE_MA78GM
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x3060
-	depends on BOARD_GIGABYTE_MA78GM
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1022
-	depends on BOARD_GIGABYTE_MA78GM
 
 config RAMBASE
 	hex
 	default 0x200000
-	depends on BOARD_GIGABYTE_MA78GM
 
 config COMPRESS
 	hex
 	default 0
-	depends on BOARD_GIGABYTE_MA78GM
+
+endif # BOARD_GIGABYTE_MA78GM