diff options
| author | Jens Rottmann <JRottmann@LiPPERTEmbedded.de> | 2010-08-30 16:36:51 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-08-30 16:36:51 +0000 |
| commit | 9a684fcb0fe28a47d23b7cb3acbd2add47c6ac50 (patch) | |
| tree | 751018fc6b4498559503eba4e6bb9bf50ac51a88 /src/mainboard/compaq | |
| parent | 459b0d2ddd966823a40da06d6cc3c30d8cb8bdd2 (diff) | |
| download | coreboot-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/compaq')
| -rw-r--r-- | src/mainboard/compaq/Kconfig | 12 | ||||
| -rw-r--r-- | src/mainboard/compaq/deskpro_en_sff_p600/Kconfig | 9 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/mainboard/compaq/Kconfig b/src/mainboard/compaq/Kconfig index 489fa88200..6faff52db1 100644 --- a/src/mainboard/compaq/Kconfig +++ b/src/mainboard/compaq/Kconfig @@ -16,12 +16,20 @@ ## 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_COMPAQ choice prompt "Mainboard model" - depends on VENDOR_COMPAQ -source "src/mainboard/compaq/deskpro_en_sff_p600/Kconfig" +config BOARD_COMPAQ_DESKPRO_EN_SFF_P600 + bool "Deskpro EN SFF P600" endchoice +source "src/mainboard/compaq/deskpro_en_sff_p600/Kconfig" + +config MAINBOARD_VENDOR + string + default "Compaq" + +endif # VENDOR_COMPAQ diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig index f4701baa19..c59577e25d 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig +++ b/src/mainboard/compaq/deskpro_en_sff_p600/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_COMPAQ_DESKPRO_EN_SFF_P600 -config BOARD_COMPAQ_DESKPRO_EN_SFF_P600 - bool "Deskpro EN SFF P600" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -33,15 +34,13 @@ config BOARD_COMPAQ_DESKPRO_EN_SFF_P600 config MAINBOARD_DIR string default compaq/deskpro_en_sff_p600 - depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600 config MAINBOARD_PART_NUMBER string default "Deskpro EN SFF P600" - depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600 config IRQ_SLOT_COUNT int default 5 - depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600 +endif # BOARD_COMPAQ_DESKPRO_EN_SFF_P600 |