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/lanner/Kconfig | 13 +++++++++++-- src/mainboard/lanner/em8510/Kconfig | 13 ++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) (limited to 'src/mainboard/lanner') diff --git a/src/mainboard/lanner/Kconfig b/src/mainboard/lanner/Kconfig index f499efa6d7..842c4f0271 100644 --- a/src/mainboard/lanner/Kconfig +++ b/src/mainboard/lanner/Kconfig @@ -1,8 +1,17 @@ +if VENDOR_LANNER + choice prompt "Mainboard model" - depends on VENDOR_LANNER -source "src/mainboard/lanner/em8510/Kconfig" +config BOARD_LANNER_EM8510 + bool "EM-8510" endchoice +source "src/mainboard/lanner/em8510/Kconfig" + +config MAINBOARD_VENDOR + string + default "Lanner" + +endif # VENDOR_LANNER diff --git a/src/mainboard/lanner/em8510/Kconfig b/src/mainboard/lanner/em8510/Kconfig index 97d294922d..fb19ddcc28 100644 --- a/src/mainboard/lanner/em8510/Kconfig +++ b/src/mainboard/lanner/em8510/Kconfig @@ -1,5 +1,7 @@ -config BOARD_LANNER_EM8510 - bool "EM-8510" +if BOARD_LANNER_EM8510 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA479M select NORTHBRIDGE_INTEL_I855 @@ -15,24 +17,21 @@ config BOARD_LANNER_EM8510 config MAINBOARD_DIR string default lanner/em8510 - depends on BOARD_LANNER_EM8510 config MAINBOARD_PART_NUMBER string default "EM-8510" - depends on BOARD_LANNER_EM8510 config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_LANNER_EM8510 config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_LANNER_EM8510 config IRQ_SLOT_COUNT int default 10 - depends on BOARD_LANNER_EM8510 + +endif # BOARD_LANNER_EM8510 -- cgit v1.2.3