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/wyse/Kconfig | 16 ++++++++++++++-- src/mainboard/wyse/s50/Kconfig | 11 +++++------ 2 files changed, 19 insertions(+), 8 deletions(-) (limited to 'src/mainboard/wyse') diff --git a/src/mainboard/wyse/Kconfig b/src/mainboard/wyse/Kconfig index c99132f02c..2607d6cb4e 100644 --- a/src/mainboard/wyse/Kconfig +++ b/src/mainboard/wyse/Kconfig @@ -16,12 +16,24 @@ ## 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_WYSE choice prompt "Mainboard model" - depends on VENDOR_WYSE -source "src/mainboard/wyse/s50/Kconfig" +config BOARD_WYSE_S50 + bool "S50" endchoice +source "src/mainboard/wyse/s50/Kconfig" + +config MAINBOARD_VENDOR + string + default "Wyse" + +config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID + hex + default 0x102d + +endif # VENDOR_WYSE diff --git a/src/mainboard/wyse/s50/Kconfig b/src/mainboard/wyse/s50/Kconfig index 0204655191..22514c36a2 100644 --- a/src/mainboard/wyse/s50/Kconfig +++ b/src/mainboard/wyse/s50/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_WYSE_S50 -config BOARD_WYSE_S50 - bool "S50" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX2 select NORTHBRIDGE_AMD_GX2 @@ -32,19 +33,17 @@ config BOARD_WYSE_S50 config MAINBOARD_DIR string default wyse/s50 - depends on BOARD_WYSE_S50 config MAINBOARD_PART_NUMBER string default "s50" - depends on BOARD_WYSE_S50 config IRQ_SLOT_COUNT int default 3 - depends on BOARD_WYSE_S50 config RAMBASE hex default 0x4000 - depends on BOARD_WYSE_S50 + +endif # BOARD_WYSE_S50 -- cgit v1.2.3