summaryrefslogtreecommitdiff
path: root/src/mainboard/dell
diff options
context:
space:
mode:
authorJens Rottmann <JRottmann@LiPPERTEmbedded.de>2010-08-30 16:36:51 +0000
committerStefan Reinauer <stepan@openbios.org>2010-08-30 16:36:51 +0000
commit9a684fcb0fe28a47d23b7cb3acbd2add47c6ac50 (patch)
tree751018fc6b4498559503eba4e6bb9bf50ac51a88 /src/mainboard/dell
parent459b0d2ddd966823a40da06d6cc3c30d8cb8bdd2 (diff)
downloadcoreboot-9a684fcb0fe28a47d23b7cb3acbd2add47c6ac50.tar.xz
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
Diffstat (limited to 'src/mainboard/dell')
-rw-r--r--src/mainboard/dell/Kconfig13
-rw-r--r--src/mainboard/dell/s1850/Kconfig16
2 files changed, 17 insertions, 12 deletions
diff --git a/src/mainboard/dell/Kconfig b/src/mainboard/dell/Kconfig
index 92fe3de9a5..fb665c45cf 100644
--- a/src/mainboard/dell/Kconfig
+++ b/src/mainboard/dell/Kconfig
@@ -1,8 +1,17 @@
+if VENDOR_DELL
+
choice
prompt "Mainboard model"
- depends on VENDOR_DELL
-source "src/mainboard/dell/s1850/Kconfig"
+config BOARD_DELL_S1850
+ bool "PowerEdge 1850"
endchoice
+source "src/mainboard/dell/s1850/Kconfig"
+
+config MAINBOARD_VENDOR
+ string
+ default "Dell"
+
+endif # VENDOR_DELL
diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig
index 1b0b27bdec..22cdf7ed5b 100644
--- a/src/mainboard/dell/s1850/Kconfig
+++ b/src/mainboard/dell/s1850/Kconfig
@@ -1,5 +1,7 @@
-config BOARD_DELL_S1850
- bool "PowerEdge 1850"
+if BOARD_DELL_S1850
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+ def_bool y
select ARCH_X86
select CPU_INTEL_SOCKET_MPGA604
select NORTHBRIDGE_INTEL_E7520
@@ -19,35 +21,29 @@ config BOARD_DELL_S1850
config MAINBOARD_DIR
string
default dell/s1850
- depends on BOARD_DELL_S1850
config MAINBOARD_PART_NUMBER
string
default "PowerEdge 1850"
- depends on BOARD_DELL_S1850
config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
hex
default 0x5580
- depends on BOARD_DELL_S1850
config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
hex
default 0x15d9
- depends on BOARD_DELL_S1850
-
config MAX_CPUS
int
default 4
- depends on BOARD_DELL_S1850
config MAX_PHYSICAL_CPUS
int
default 1
- depends on BOARD_DELL_S1850
config IRQ_SLOT_COUNT
int
default 9
- depends on BOARD_DELL_S1850
+
+endif # BOARD_DELL_S1850