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/ibase/Kconfig | 15 ++++++++++++--- src/mainboard/ibase/mb899/Kconfig | 16 +++++----------- 2 files changed, 17 insertions(+), 14 deletions(-) (limited to 'src/mainboard/ibase') diff --git a/src/mainboard/ibase/Kconfig b/src/mainboard/ibase/Kconfig index 49aba5287c..7eac9ae279 100644 --- a/src/mainboard/ibase/Kconfig +++ b/src/mainboard/ibase/Kconfig @@ -1,8 +1,17 @@ +if VENDOR_IBASE + choice - prompt "Mainboard model" - depends on VENDOR_IBASE + prompt "Mainboard model" -source "src/mainboard/ibase/mb899/Kconfig" +config BOARD_IBASE_MB899 + bool "MB899" endchoice +source "src/mainboard/ibase/mb899/Kconfig" + +config MAINBOARD_VENDOR + string + default "iBase" + +endif # VENDOR_IBASE diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig index 0795db6011..848e1a082d 100644 --- a/src/mainboard/ibase/mb899/Kconfig +++ b/src/mainboard/ibase/mb899/Kconfig @@ -1,5 +1,7 @@ -config BOARD_IBASE_MB899 - bool "MB899" +if BOARD_IBASE_MB899 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_CORE select CPU_INTEL_SOCKET_MFCPGA478 @@ -24,45 +26,37 @@ config BOARD_IBASE_MB899 config MAINBOARD_DIR string default ibase/mb899 - depends on BOARD_IBASE_MB899 config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_IBASE_MB899 config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_IBASE_MB899 config MAINBOARD_PART_NUMBER string default "MB899" - depends on BOARD_IBASE_MB899 config MMCONF_BASE_ADDRESS hex default 0xf0000000 - depends on BOARD_IBASE_MB899 config IRQ_SLOT_COUNT int default 18 - depends on BOARD_IBASE_MB899 config MAX_CPUS int default 4 - depends on BOARD_IBASE_MB899 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_IBASE_MB899 config FALLBACK_VGA_BIOS_FILE string default "amipci_01.20" - depends on BOARD_IBASE_MB899 +endif # BOARD_IBASE_MB899 -- cgit v1.2.3