From 9a684fcb0fe28a47d23b7cb3acbd2add47c6ac50 Mon Sep 17 00:00:00 2001 From: Jens Rottmann Date: Mon, 30 Aug 2010 16:36:51 +0000 Subject: 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 Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5754 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/biostar/Kconfig | 12 ++++++++++-- src/mainboard/biostar/m6tba/Kconfig | 9 ++++----- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'src/mainboard/biostar') diff --git a/src/mainboard/biostar/Kconfig b/src/mainboard/biostar/Kconfig index 90d8cf1774..f2d36ef6cb 100644 --- a/src/mainboard/biostar/Kconfig +++ b/src/mainboard/biostar/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_BIOSTAR choice prompt "Mainboard model" - depends on VENDOR_BIOSTAR -source "src/mainboard/biostar/m6tba/Kconfig" +config BOARD_BIOSTAR_M6TBA + bool "M6TBA" endchoice +source "src/mainboard/biostar/m6tba/Kconfig" + +config MAINBOARD_VENDOR + string + default "Biostar" + +endif # VENDOR_BIOSTAR diff --git a/src/mainboard/biostar/m6tba/Kconfig b/src/mainboard/biostar/m6tba/Kconfig index f96333206c..f9129f4b54 100644 --- a/src/mainboard/biostar/m6tba/Kconfig +++ b/src/mainboard/biostar/m6tba/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_BIOSTAR_M6TBA -config BOARD_BIOSTAR_M6TBA - bool "M6TBA" +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_BIOSTAR_M6TBA config MAINBOARD_DIR string default biostar/m6tba - depends on BOARD_BIOSTAR_M6TBA config MAINBOARD_PART_NUMBER string default "M6TBA" - depends on BOARD_BIOSTAR_M6TBA config IRQ_SLOT_COUNT int default 7 - depends on BOARD_BIOSTAR_M6TBA +endif # BOARD_BIOSTAR_M6TBA -- cgit v1.2.3