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, 33 insertions, 20 deletions

diff --git a/src/mainboard/digitallogic/Kconfig b/src/mainboard/digitallogic/Kconfig
index 7e115fc402..a98aa1d0e9 100644
--- a/src/mainboard/digitallogic/Kconfig
+++ b/src/mainboard/digitallogic/Kconfig
@@ -1,10 +1,23 @@
+if VENDOR_DIGITAL_LOGIC
+
 choice
 	prompt "Mainboard model"
-	depends on VENDOR_DIGITAL_LOGIC
+
+config BOARD_DIGITALLOGIC_ADL855PC
+	bool "smartModule855"
+config BOARD_DIGITALLOGIC_MSM586SEG
+	bool "MSM586SEG"
+config BOARD_DIGITALLOGIC_MSM800SEV
+	bool "MSM800SEV"
+
+endchoice
 
 source "src/mainboard/digitallogic/adl855pc/Kconfig"
 source "src/mainboard/digitallogic/msm586seg/Kconfig"
 source "src/mainboard/digitallogic/msm800sev/Kconfig"
 
-endchoice
+config MAINBOARD_VENDOR
+	string
+	default "DIGITAL-LOGIC"
 
+endif # VENDOR_DIGITAL_LOGIC
diff --git a/src/mainboard/digitallogic/adl855pc/Kconfig b/src/mainboard/digitallogic/adl855pc/Kconfig
index dd17ca00a6..75e119f54c 100644
--- a/src/mainboard/digitallogic/adl855pc/Kconfig
+++ b/src/mainboard/digitallogic/adl855pc/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_DIGITALLOGIC_ADL855PC
-	bool "smartModule855"
+if BOARD_DIGITALLOGIC_ADL855PC
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA479M
 	select NORTHBRIDGE_INTEL_I855
@@ -15,24 +17,21 @@ config BOARD_DIGITALLOGIC_ADL855PC
 config MAINBOARD_DIR
 	string
 	default digitallogic/adl855pc
-	depends on BOARD_DIGITALLOGIC_ADL855PC
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "smartModule855"
-	depends on BOARD_DIGITALLOGIC_ADL855PC
 
 config DCACHE_RAM_BASE
 	hex
 	default 0xffdf8000
-	depends on BOARD_DIGITALLOGIC_ADL855PC
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x8000
-	depends on BOARD_DIGITALLOGIC_ADL855PC
 
 config IRQ_SLOT_COUNT
 	int
 	default 5
-	depends on BOARD_DIGITALLOGIC_ADL855PC
+
+endif # BOARD_DIGITALLOGIC_ADL855PC
diff --git a/src/mainboard/digitallogic/msm586seg/Kconfig b/src/mainboard/digitallogic/msm586seg/Kconfig
index 5f1abe3e52..d54037a058 100644
--- a/src/mainboard/digitallogic/msm586seg/Kconfig
+++ b/src/mainboard/digitallogic/msm586seg/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_DIGITALLOGIC_MSM586SEG
-	bool "MSM586SEG"
+if BOARD_DIGITALLOGIC_MSM586SEG
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_SC520
 	select HAVE_PIRQ_TABLE
@@ -10,14 +12,13 @@ config BOARD_DIGITALLOGIC_MSM586SEG
 config MAINBOARD_DIR
 	string
 	default digitallogic/msm586seg
-	depends on BOARD_DIGITALLOGIC_MSM586SEG
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MSM586SEG"
-	depends on BOARD_DIGITALLOGIC_MSM586SEG
 
 config IRQ_SLOT_COUNT
 	int
 	default 2
-	depends on BOARD_DIGITALLOGIC_MSM586SEG
+
+endif # BOARD_DIGITALLOGIC_MSM586SEG
diff --git a/src/mainboard/digitallogic/msm800sev/Kconfig b/src/mainboard/digitallogic/msm800sev/Kconfig
index e3248df767..7ac7138de7 100644
--- a/src/mainboard/digitallogic/msm800sev/Kconfig
+++ b/src/mainboard/digitallogic/msm800sev/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_DIGITALLOGIC_MSM800SEV
-	bool "MSM800SEV"
+if BOARD_DIGITALLOGIC_MSM800SEV
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
 	select ARCH_X86
 	select CPU_AMD_LX
 	select NORTHBRIDGE_AMD_LX
@@ -14,19 +16,17 @@ config BOARD_DIGITALLOGIC_MSM800SEV
 config MAINBOARD_DIR
 	string
 	default digitallogic/msm800sev
-	depends on BOARD_DIGITALLOGIC_MSM800SEV
 
 config MAINBOARD_PART_NUMBER
 	string
 	default "MSM800SEV"
-	depends on BOARD_DIGITALLOGIC_MSM800SEV
 
 config IRQ_SLOT_COUNT
 	int
 	default 9
-	depends on BOARD_DIGITALLOGIC_MSM800SEV
 
 config RAMBASE
 	hex
 	default 0x4000
-	depends on BOARD_DIGITALLOGIC_MSM800SEV
+
+endif # BOARD_DIGITALLOGIC_MSM800SEV