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/bcom/Kconfig | 14 ++++++++++++-- src/mainboard/bcom/winnet100/Kconfig | 9 ++++----- src/mainboard/bcom/winnetp680/Kconfig | 11 +++++------ 3 files changed, 21 insertions(+), 13 deletions(-) (limited to 'src/mainboard/bcom') diff --git a/src/mainboard/bcom/Kconfig b/src/mainboard/bcom/Kconfig index fe132d329f..d09a9e73cb 100644 --- a/src/mainboard/bcom/Kconfig +++ b/src/mainboard/bcom/Kconfig @@ -16,13 +16,23 @@ ## 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_BCOM choice prompt "Mainboard model" - depends on VENDOR_BCOM + +config BOARD_BCOM_WINNET100 + bool "WinNET100" +config BOARD_BCOM_WINNETP680 + bool "WinNET P680" + +endchoice source "src/mainboard/bcom/winnet100/Kconfig" source "src/mainboard/bcom/winnetp680/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "BCOM" +endif # VENDOR_BCOM diff --git a/src/mainboard/bcom/winnet100/Kconfig b/src/mainboard/bcom/winnet100/Kconfig index 14979e8fc5..dbb2cb804c 100644 --- a/src/mainboard/bcom/winnet100/Kconfig +++ b/src/mainboard/bcom/winnet100/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_BCOM_WINNET100 -config BOARD_BCOM_WINNET100 - bool "WinNET100" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -33,16 +34,14 @@ config BOARD_BCOM_WINNET100 config MAINBOARD_DIR string default bcom/winnet100 - depends on BOARD_BCOM_WINNET100 config MAINBOARD_PART_NUMBER string default "WinNET100" - depends on BOARD_BCOM_WINNET100 # Soldered NIC, internal USB, no real PCI slots. config IRQ_SLOT_COUNT int default 2 - depends on BOARD_BCOM_WINNET100 +endif # BOARD_BCOM_WINNET100 diff --git a/src/mainboard/bcom/winnetp680/Kconfig b/src/mainboard/bcom/winnetp680/Kconfig index d02bcfbcf1..983cd514fd 100644 --- a/src/mainboard/bcom/winnetp680/Kconfig +++ b/src/mainboard/bcom/winnetp680/Kconfig @@ -1,5 +1,7 @@ -config BOARD_BCOM_WINNETP680 - bool "WinNET P680" +if BOARD_BCOM_WINNETP680 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_VIA_C7 select NORTHBRIDGE_VIA_CN700 @@ -13,20 +15,17 @@ config BOARD_BCOM_WINNETP680 config MAINBOARD_DIR string default bcom/winnetp680 - depends on BOARD_BCOM_WINNETP680 config MAINBOARD_PART_NUMBER string default "WinNET P680" - depends on BOARD_BCOM_WINNETP680 config IRQ_SLOT_COUNT int default 10 - depends on BOARD_BCOM_WINNETP680 config RAMBASE hex default 0x4000 - depends on BOARD_BCOM_WINNETP680 +endif # BOARD_BCOM_WINNETP680 -- cgit v1.2.3