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/ecs/Kconfig | 12 ++++++++++-- src/mainboard/ecs/p6iwp-fe/Kconfig | 9 ++++----- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'src/mainboard/ecs') diff --git a/src/mainboard/ecs/Kconfig b/src/mainboard/ecs/Kconfig index 27042738a3..48501f6e6b 100644 --- a/src/mainboard/ecs/Kconfig +++ b/src/mainboard/ecs/Kconfig @@ -17,12 +17,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_ECS choice prompt "Mainboard model" - depends on VENDOR_ECS -source "src/mainboard/ecs/p6iwp-fe/Kconfig" +config BOARD_ECS_P6IWP_FE + bool "P6IWP-FE" endchoice +source "src/mainboard/ecs/p6iwp-fe/Kconfig" + +config MAINBOARD_VENDOR + string + default "ECS" + +endif # VENDOR_ECS diff --git a/src/mainboard/ecs/p6iwp-fe/Kconfig b/src/mainboard/ecs/p6iwp-fe/Kconfig index 5748a5712a..eecae4d4bd 100644 --- a/src/mainboard/ecs/p6iwp-fe/Kconfig +++ b/src/mainboard/ecs/p6iwp-fe/Kconfig @@ -17,9 +17,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_ECS_P6IWP_FE -config BOARD_ECS_P6IWP_FE - bool "P6IWP-FE" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_PGA370 select NORTHBRIDGE_INTEL_I82810 @@ -35,15 +36,13 @@ config BOARD_ECS_P6IWP_FE config MAINBOARD_DIR string default ecs/p6iwp-fe - depends on BOARD_ECS_P6IWP_FE config MAINBOARD_PART_NUMBER string default "P6IWP-FE" - depends on BOARD_ECS_P6IWP_FE config IRQ_SLOT_COUNT int default 10 - depends on BOARD_ECS_P6IWP_FE +endif # BOARD_ECS_P6IWP_FE -- cgit v1.2.3