From 5ec2c2b998086415047c05aca4ca7082de329e5a Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 25 Aug 2009 00:53:22 +0000 Subject: Various Kconfig and Makefile.inc fixes and cosmetics. - Whitespace fixes, remove trailing whitespace, use TABs for identation (except in Kconfig "help" lines, which start with one TAB and two spaces as per Linux kernel style) - Kconfig: Standardize on 'bool' (not 'boolean'). - s/lar/cbfs/ in one Kconfig help string. - Reword various Kconfig menu entries for a more usable and consistent menu. - Fix incorrect comment of NO_RUN in devices/Kconfig. - superio/serverengines/Kconfig: Incorrect config name. - superio/Makefile.inc: s/serverengine/serverengines/. - superio/intel/Kconfig: s/SUPERIO_FINTEK_I3100/SUPERIO_INTEL_I3100/. - mainboard/via/vt8454c/Kconfig: Fix copy-paste error in help string. - mainboard/via/epia-n/Kconfig: Fix "bool" menu text. - console/Kconfig: Don't mention defaults in the menu string, kconfig already displays them anyway. - Kill "Drivers" menu for now, it only confuses users as long as it's emtpy. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4567 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/via/Kconfig | 9 ++++----- src/mainboard/via/epia-n/Kconfig | 16 ++++++++-------- src/mainboard/via/epia-n/Makefile.inc | 4 ++-- src/mainboard/via/vt8454c/Kconfig | 18 +++++++++--------- src/mainboard/via/vt8454c/Makefile.inc | 20 +++++++------------- 5 files changed, 30 insertions(+), 37 deletions(-) (limited to 'src/mainboard/via') diff --git a/src/mainboard/via/Kconfig b/src/mainboard/via/Kconfig index 4d0a55b6bf..787b32bc56 100644 --- a/src/mainboard/via/Kconfig +++ b/src/mainboard/via/Kconfig @@ -1,10 +1,9 @@ choice - prompt "Mainboard model" - depends on VENDOR_VIA + prompt "Mainboard model" + depends on VENDOR_VIA - source "src/mainboard/via/vt8454c/Kconfig" - source "src/mainboard/via/epia-n/Kconfig" +source "src/mainboard/via/vt8454c/Kconfig" +source "src/mainboard/via/epia-n/Kconfig" endchoice - diff --git a/src/mainboard/via/epia-n/Kconfig b/src/mainboard/via/epia-n/Kconfig index 93f9e236ce..e7818a9b51 100644 --- a/src/mainboard/via/epia-n/Kconfig +++ b/src/mainboard/via/epia-n/Kconfig @@ -1,14 +1,14 @@ config BOARD_VIA_EPIA_N - bool "via epia-n" - select ARCH_X86 - select CPU_VIA_C3 - select NORTHBRIDGE_VIA_CN400 + bool "EPIA-N" + select ARCH_X86 + select CPU_VIA_C3 + select NORTHBRIDGE_VIA_CN400 select SOUTHBRIDGE_VIA_VT8237R - select SUPERIO_WINBOND_W83697HF - select PIRQ_TABLE + select SUPERIO_WINBOND_W83697HF + select PIRQ_TABLE select USE_PRINTK_IN_CAR - help - VIA Epia-n mainboards + help + VIA EPIA-N mainboard. config MAINBOARD_DIR string diff --git a/src/mainboard/via/epia-n/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc index 9cc015ff97..a100d9ac31 100644 --- a/src/mainboard/via/epia-n/Makefile.inc +++ b/src/mainboard/via/epia-n/Makefile.inc @@ -21,8 +21,8 @@ initobj-y += crt0.o obj-y += mainboard.o -obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o -obj-$(CONFIG_HAVE_MP_TABLE) += object mptable.o +obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o +obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig index bdd582759c..7433e0f934 100644 --- a/src/mainboard/via/vt8454c/Kconfig +++ b/src/mainboard/via/vt8454c/Kconfig @@ -1,15 +1,15 @@ config BOARD_VIA_VT8454C - bool "vt8454c" - select ARCH_X86 - select CPU_VIA_C7 - select NORTHBRIDGE_VIA_CX700 -# select SOUTHBRIDGE_INTEL_I82801GX - select SUPERIO_VIA_VT1211 - select PIRQ_TABLE + bool "VT8454c" + select ARCH_X86 + select CPU_VIA_C7 + select NORTHBRIDGE_VIA_CX700 +# select SOUTHBRIDGE_INTEL_I82801GX + select SUPERIO_VIA_VT1211 + select PIRQ_TABLE # select MMCONF_SUPPORT select USE_PRINTK_IN_CAR - help - Kontron 986LCD-M Series mainboards + help + VIA VT8454C mainboard. config MAINBOARD_DIR string diff --git a/src/mainboard/via/vt8454c/Makefile.inc b/src/mainboard/via/vt8454c/Makefile.inc index d74c632497..f33336bd6c 100644 --- a/src/mainboard/via/vt8454c/Makefile.inc +++ b/src/mainboard/via/vt8454c/Makefile.inc @@ -1,12 +1,11 @@ ## ## This file is part of the coreboot project. -## +## ## Copyright (C) 2007-2009 coresystems GmbH ## ## This program is free software; you can redistribute it and/or ## modify it under the terms of the GNU General Public License as -## published by the Free Software Foundation; version 2 of -## the License. +## published by the Free Software Foundation; version 2 of the License. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,21 +14,16 @@ ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -## MA 02110-1301 USA -## - +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. -## -driver-y += mainboard.o +driver-y += mainboard.o obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o +obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o initobj-y += crt0.o # FIXME in $(top)/Makefile -- cgit v1.2.3