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/iei/Kconfig | 16 ++++++++++++++-- src/mainboard/iei/juki-511p/Kconfig | 9 ++++----- src/mainboard/iei/nova4899r/Kconfig | 9 ++++----- src/mainboard/iei/pcisa-lx-800-r10/Kconfig | 11 +++++------ 4 files changed, 27 insertions(+), 18 deletions(-) (limited to 'src/mainboard/iei') diff --git a/src/mainboard/iei/Kconfig b/src/mainboard/iei/Kconfig index f436e007b2..c64cdbe194 100644 --- a/src/mainboard/iei/Kconfig +++ b/src/mainboard/iei/Kconfig @@ -16,14 +16,26 @@ ## 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_IEI choice prompt "Mainboard model" - depends on VENDOR_IEI + +config BOARD_IEI_JUKI_511P + bool "JUKI-511P" +config BOARD_IEI_NOVA_4899R + bool "NOVA-4899R" +config BOARD_IEI_PCISA_LX_800_R10 + bool "PCISA LX-800-R10" + +endchoice source "src/mainboard/iei/juki-511p/Kconfig" source "src/mainboard/iei/nova4899r/Kconfig" source "src/mainboard/iei/pcisa-lx-800-r10/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "IEI" +endif # VENDOR_IEI diff --git a/src/mainboard/iei/juki-511p/Kconfig b/src/mainboard/iei/juki-511p/Kconfig index bd24dd1700..7f114c4564 100644 --- a/src/mainboard/iei/juki-511p/Kconfig +++ b/src/mainboard/iei/juki-511p/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_IEI_JUKI_511P -config BOARD_IEI_JUKI_511P - bool "JUKI-511P" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -32,15 +33,13 @@ config BOARD_IEI_JUKI_511P config MAINBOARD_DIR string default iei/juki-511p - depends on BOARD_IEI_JUKI_511P config MAINBOARD_PART_NUMBER string default "JUKI-511P" - depends on BOARD_IEI_JUKI_511P config IRQ_SLOT_COUNT int default 2 - depends on BOARD_IEI_JUKI_511P +endif # BOARD_IEI_JUKI_511P diff --git a/src/mainboard/iei/nova4899r/Kconfig b/src/mainboard/iei/nova4899r/Kconfig index 45603f6e80..3cc5ddb04b 100644 --- a/src/mainboard/iei/nova4899r/Kconfig +++ b/src/mainboard/iei/nova4899r/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_IEI_NOVA_4899R -config BOARD_IEI_NOVA_4899R - bool "NOVA-4899R" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -34,15 +35,13 @@ config BOARD_IEI_NOVA_4899R config MAINBOARD_DIR string default iei/nova4899r - depends on BOARD_IEI_NOVA_4899R config MAINBOARD_PART_NUMBER string default "NOVA-4899R" - depends on BOARD_IEI_NOVA_4899R config IRQ_SLOT_COUNT int default 5 - depends on BOARD_IEI_NOVA_4899R +endif # BOARD_IEI_NOVA_4899R diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig index db05e0434f..ecd6d89ec9 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig +++ b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig @@ -1,5 +1,7 @@ -config BOARD_IEI_PCISA_LX_800_R10 - bool "PCISA LX-800-R10" +if BOARD_IEI_PCISA_LX_800_R10 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -13,20 +15,17 @@ config BOARD_IEI_PCISA_LX_800_R10 config MAINBOARD_DIR string default iei/pcisa-lx-800-r10 - depends on BOARD_IEI_PCISA_LX_800_R10 config MAINBOARD_PART_NUMBER string default "PCISA-LX-800-R10" - depends on BOARD_IEI_PCISA_LX_800_R10 config IRQ_SLOT_COUNT int default 9 - depends on BOARD_IEI_PCISA_LX_800_R10 config RAMBASE hex default 0x4000 - depends on BOARD_IEI_PCISA_LX_800_R10 +endif # BOARD_IEI_PCISA_LX_800_R10 -- cgit v1.2.3