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
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index ac45c8c..59b5028 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_KONTRON_986LCD_M
- bool "986LCD-M/mITX"
+if BOARD_KONTRON_986LCD_M
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+ def_bool y
select ARCH_X86
select CPU_INTEL_CORE
select CPU_INTEL_SOCKET_MFCPGA478
@@ -24,45 +26,37 @@
config MAINBOARD_DIR
string
default kontron/986lcd-m
- depends on BOARD_KONTRON_986LCD_M
config DCACHE_RAM_BASE
hex
default 0xffdf8000
- depends on BOARD_KONTRON_986LCD_M
config DCACHE_RAM_SIZE
hex
default 0x8000
- depends on BOARD_KONTRON_986LCD_M
config MAINBOARD_PART_NUMBER
string
default "986LCD-M"
- depends on BOARD_KONTRON_986LCD_M
config MMCONF_BASE_ADDRESS
hex
default 0xf0000000
- depends on BOARD_KONTRON_986LCD_M
config IRQ_SLOT_COUNT
int
default 18
- depends on BOARD_KONTRON_986LCD_M
config MAX_CPUS
int
default 4
- depends on BOARD_KONTRON_986LCD_M
config MAX_PHYSICAL_CPUS
int
default 2
- depends on BOARD_KONTRON_986LCD_M
config FALLBACK_VGA_BIOS_FILE
string
default "amipci_01.20"
- depends on BOARD_KONTRON_986LCD_M
+endif # BOARD_KONTRON_986LCD_M
diff --git a/src/mainboard/kontron/Kconfig b/src/mainboard/kontron/Kconfig
index 81e4b9e..5d64476 100644
--- a/src/mainboard/kontron/Kconfig
+++ b/src/mainboard/kontron/Kconfig
@@ -1,8 +1,20 @@
+if VENDOR_KONTRON
+
choice
prompt "Mainboard model"
- depends on VENDOR_KONTRON
+
+config BOARD_KONTRON_986LCD_M
+ bool "986LCD-M/mITX"
+config BOARD_KONTRON_KT690
+ bool "KT690/mITX"
+
+endchoice
source "src/mainboard/kontron/986lcd-m/Kconfig"
source "src/mainboard/kontron/kt690/Kconfig"
-endchoice
+config MAINBOARD_VENDOR
+ string
+ default "Kontron"
+
+endif # VENDOR_KONTRON
diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig
index a8acc3a..f87cffa 100644
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_KONTRON_KT690
- bool "KT690/mITX"
+if BOARD_KONTRON_KT690
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+ def_bool y
select ARCH_X86
select CPU_AMD_SOCKET_S1G1
select NORTHBRIDGE_AMD_AMDK8
@@ -23,69 +25,57 @@
config MAINBOARD_DIR
string
default kontron/kt690
- depends on BOARD_KONTRON_KT690
config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
hex
default 0x1488
- depends on BOARD_KONTRON_KT690
config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
hex
default 0x6900
- depends on BOARD_KONTRON_KT690
config APIC_ID_OFFSET
hex
default 0x0
- depends on BOARD_KONTRON_KT690
config MAINBOARD_PART_NUMBER
string
default "KT690/mITX"
- depends on BOARD_KONTRON_KT690
config HEAP_SIZE
hex
default 0x8000
- depends on BOARD_KONTRON_KT690
config HW_MEM_HOLE_SIZEK
hex
default 0x100000
- depends on BOARD_KONTRON_KT690
config MAX_CPUS
int
default 2
- depends on BOARD_KONTRON_KT690
config MAX_PHYSICAL_CPUS
int
default 1
- depends on BOARD_KONTRON_KT690
config HW_MEM_HOLE_SIZE_AUTO_INC
bool
default n
- depends on BOARD_KONTRON_KT690
config SB_HT_CHAIN_ON_BUS0
int
default 1
- depends on BOARD_KONTRON_KT690
config HT_CHAIN_END_UNITID_BASE
hex
default 0x1
- depends on BOARD_KONTRON_KT690
config HT_CHAIN_UNITID_BASE
hex
default 0x0
- depends on BOARD_KONTRON_KT690
config IRQ_SLOT_COUNT
int
default 11
- depends on BOARD_KONTRON_KT690
+
+endif # BOARD_KONTRON_KT690