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/asrock/939a785gmh/Kconfig | 24 ++++++------------------ src/mainboard/asrock/Kconfig | 12 ++++++++++-- 2 files changed, 16 insertions(+), 20 deletions(-) (limited to 'src/mainboard/asrock') diff --git a/src/mainboard/asrock/939a785gmh/Kconfig b/src/mainboard/asrock/939a785gmh/Kconfig index 1d99e064d9..176c5d6288 100644 --- a/src/mainboard/asrock/939a785gmh/Kconfig +++ b/src/mainboard/asrock/939a785gmh/Kconfig @@ -1,5 +1,7 @@ -config BOARD_ASROCK_939A785GMH - bool "939A785GMH/128M" +if BOARD_ASROCK_939A785GMH + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_939 select K8_HT_FREQ_1G_SUPPORT @@ -25,79 +27,65 @@ config BOARD_ASROCK_939A785GMH config MAINBOARD_DIR string default asrock/939a785gmh - depends on BOARD_ASROCK_939A785GMH config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_ASROCK_939A785GMH config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_ASROCK_939A785GMH config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_ASROCK_939A785GMH config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_ASROCK_939A785GMH config MAINBOARD_PART_NUMBER string default "939A785GMH" - depends on BOARD_ASROCK_939A785GMH config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_ASROCK_939A785GMH config MAX_CPUS int default 8 - depends on BOARD_ASROCK_939A785GMH config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_ASROCK_939A785GMH config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_ASROCK_939A785GMH config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_ASROCK_939A785GMH config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_ASROCK_939A785GMH config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_ASROCK_939A785GMH config IRQ_SLOT_COUNT int default 11 - depends on BOARD_ASROCK_939A785GMH config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_ASROCK_939A785GMH config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3060 - depends on BOARD_ASROCK_939A785GMH + +endif # BOARD_ASROCK_939A785GMH diff --git a/src/mainboard/asrock/Kconfig b/src/mainboard/asrock/Kconfig index cfe6e9dfbb..7bedaaa571 100644 --- a/src/mainboard/asrock/Kconfig +++ b/src/mainboard/asrock/Kconfig @@ -16,12 +16,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_ASROCK choice prompt "Mainboard model" - depends on VENDOR_ASROCK -source "src/mainboard/asrock/939a785gmh/Kconfig" +config BOARD_ASROCK_939A785GMH + bool "939A785GMH/128M" endchoice +source "src/mainboard/asrock/939a785gmh/Kconfig" + +config MAINBOARD_VENDOR + string + default "ASROCK" + +endif # VENDOR_ASROCK -- cgit v1.2.3