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/pcengines/Kconfig | 15 +++++++++++++-- src/mainboard/pcengines/alix1c/Kconfig | 12 ++++++------ src/mainboard/pcengines/alix2d3/Kconfig | 12 ++++++------ 3 files changed, 25 insertions(+), 14 deletions(-) (limited to 'src/mainboard/pcengines') diff --git a/src/mainboard/pcengines/Kconfig b/src/mainboard/pcengines/Kconfig index db6426d099..bdcd869905 100644 --- a/src/mainboard/pcengines/Kconfig +++ b/src/mainboard/pcengines/Kconfig @@ -1,9 +1,20 @@ +if VENDOR_PC_ENGINES + choice prompt "Mainboard model" - depends on VENDOR_PC_ENGINES + +config BOARD_PCENGINES_ALIX1C + bool "ALIX.1C" +config BOARD_PCENGINES_ALIX2D3 + bool "ALIX.2D3" + +endchoice source "src/mainboard/pcengines/alix1c/Kconfig" source "src/mainboard/pcengines/alix2d3/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "PC Engines" +endif # VENDOR_PC_ENGINES diff --git a/src/mainboard/pcengines/alix1c/Kconfig b/src/mainboard/pcengines/alix1c/Kconfig index 0b815d807b..ef1f074625 100644 --- a/src/mainboard/pcengines/alix1c/Kconfig +++ b/src/mainboard/pcengines/alix1c/Kconfig @@ -1,5 +1,7 @@ -config BOARD_PCENGINES_ALIX1C - bool "ALIX.1C" +if BOARD_PCENGINES_ALIX1C + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -14,19 +16,17 @@ config BOARD_PCENGINES_ALIX1C config MAINBOARD_DIR string default pcengines/alix1c - depends on BOARD_PCENGINES_ALIX1C config MAINBOARD_PART_NUMBER string default "ALIX.1C" - depends on BOARD_PCENGINES_ALIX1C config IRQ_SLOT_COUNT int default 5 - depends on BOARD_PCENGINES_ALIX1C config RAMBASE hex default 0x4000 - depends on BOARD_PCENGINES_ALIX1C + +endif # BOARD_PCENGINES_ALIX1C diff --git a/src/mainboard/pcengines/alix2d3/Kconfig b/src/mainboard/pcengines/alix2d3/Kconfig index ab6bcdad68..53afe996c4 100644 --- a/src/mainboard/pcengines/alix2d3/Kconfig +++ b/src/mainboard/pcengines/alix2d3/Kconfig @@ -1,5 +1,7 @@ -config BOARD_PCENGINES_ALIX2D3 - bool "ALIX.2D3" +if BOARD_PCENGINES_ALIX2D3 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -13,19 +15,17 @@ config BOARD_PCENGINES_ALIX2D3 config MAINBOARD_DIR string default pcengines/alix2d3 - depends on BOARD_PCENGINES_ALIX2D3 config MAINBOARD_PART_NUMBER string default "ALIX.2D3" - depends on BOARD_PCENGINES_ALIX2D3 config IRQ_SLOT_COUNT int default 6 - depends on BOARD_PCENGINES_ALIX2D3 config RAMBASE hex default 0x4000 - depends on BOARD_PCENGINES_ALIX2D3 + +endif # BOARD_PCENGINES_ALIX2D3 -- cgit v1.2.3