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/olpc/Kconfig | 17 ++++++++++++++--- src/mainboard/olpc/btest/Kconfig | 11 ++++++----- src/mainboard/olpc/rev_a/Kconfig | 11 ++++++----- 3 files changed, 26 insertions(+), 13 deletions(-) (limited to 'src/mainboard/olpc') diff --git a/src/mainboard/olpc/Kconfig b/src/mainboard/olpc/Kconfig index a74f393774..c297f3295a 100644 --- a/src/mainboard/olpc/Kconfig +++ b/src/mainboard/olpc/Kconfig @@ -1,9 +1,20 @@ +if VENDOR_OLPC + choice prompt "Mainboard model" - depends on VENDOR_OLPC -source "src/mainboard/olpc/rev_a/Kconfig" -source "src/mainboard/olpc/btest/Kconfig" +config BOARD_OLPC_BTEST + bool "btest" +config BOARD_OLPC_REV_A + bool "rev_a" endchoice +source "src/mainboard/olpc/btest/Kconfig" +source "src/mainboard/olpc/rev_a/Kconfig" + +config MAINBOARD_VENDOR + string + default "OLPC" + +endif # VENDOR_OLPC diff --git a/src/mainboard/olpc/btest/Kconfig b/src/mainboard/olpc/btest/Kconfig index 520d6097fb..009b9bebf2 100644 --- a/src/mainboard/olpc/btest/Kconfig +++ b/src/mainboard/olpc/btest/Kconfig @@ -1,5 +1,7 @@ -config BOARD_OLPC_BTEST - bool "btest" +if BOARD_OLPC_BTEST + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX2 select NORTHBRIDGE_AMD_GX2 @@ -12,14 +14,13 @@ config BOARD_OLPC_BTEST config MAINBOARD_DIR string default olpc/btest - depends on BOARD_OLPC_BTEST config MAINBOARD_PART_NUMBER string default "btest" - depends on BOARD_OLPC_BTEST config IRQ_SLOT_COUNT int default 2 - depends on BOARD_OLPC_BTEST + +endif # BOARD_OLPC_BTEST diff --git a/src/mainboard/olpc/rev_a/Kconfig b/src/mainboard/olpc/rev_a/Kconfig index c2b3911523..bae2692a6e 100644 --- a/src/mainboard/olpc/rev_a/Kconfig +++ b/src/mainboard/olpc/rev_a/Kconfig @@ -1,5 +1,7 @@ -config BOARD_OLPC_REV_A - bool "rev_a" +if BOARD_OLPC_REV_A + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX2 select NORTHBRIDGE_AMD_GX2 @@ -12,14 +14,13 @@ config BOARD_OLPC_REV_A config MAINBOARD_DIR string default olpc/rev_a - depends on BOARD_OLPC_REV_A config MAINBOARD_PART_NUMBER string default "rev_a" - depends on BOARD_OLPC_REV_A config IRQ_SLOT_COUNT int default 2 - depends on BOARD_OLPC_REV_A + +endif # BOARD_OLPC_REV_A -- cgit v1.2.3