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/console/Kconfig | 11 ++++++----- src/console/Makefile.inc | 26 ++++++++++++++------------ 2 files changed, 20 insertions(+), 17 deletions(-) (limited to 'src/console') diff --git a/src/console/Kconfig b/src/console/Kconfig index 386f8391fe..2d047e763b 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -1,27 +1,28 @@ -menu "Console Options" +menu "Console options" config SERIAL_CONSOLE bool "See output on the serial port console" default y config TTYS0_BASE - hex "I/O base for the serial port (default 0x3f8)" + hex "I/O base for the serial port" depends on SERIAL_CONSOLE default 0x3f8 config SERIAL_SET_SPEED - bool "Override the serial console baud rate" + bool "Override the serial console BAUD rate" default y depends on SERIAL_CONSOLE config TTYS0_BAUD - int "Serial console baud rate (default 115200)" + int "Serial console BAUD rate" depends on SERIAL_SET_SPEED default 115200 config USBDEBUG_DIRECT - bool "Support a USB debug dongle. Not supported on all chipsets. FIX DEPENDENCY HERE" + bool "USB debug dongle support. Not supported on all chipsets." default n + # TODO: FIX DEPENDENCY HERE config CONSOLE_VGA bool diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index 242c93e0d4..233f44508a 100644 --- a/src/console/Makefile.inc +++ b/src/console/Makefile.inc @@ -1,12 +1,14 @@ -obj-y += printk.o -obj-y += console.o -obj-y += vtxprintf.o -obj-y += vsprintf.o -initobj-y += vtxprintf.o -initobj-y += vsprintf.o -driver-$(CONFIG_SERIAL_CONSOLE) += uart8250_console.o -driver-$(CONFIG_USBDEBUG_DIRECT) += usbdebug_direct_console.o -driver-$(CONFIG_CONSOLE_VGA) += vga_console.o -driver-$(CONFIG_CONSOLE_BTEXT) += btext_console.o -driver-$(CONFIG_CONSOLE_BTEXT) += font-8x16.o -driver-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.o +obj-y += printk.o +obj-y += console.o +obj-y += vtxprintf.o +obj-y += vsprintf.o + +initobj-y += vtxprintf.o +initobj-y += vsprintf.o + +driver-$(CONFIG_SERIAL_CONSOLE) += uart8250_console.o +driver-$(CONFIG_USBDEBUG_DIRECT) += usbdebug_direct_console.o +driver-$(CONFIG_CONSOLE_VGA) += vga_console.o +driver-$(CONFIG_CONSOLE_BTEXT) += btext_console.o +driver-$(CONFIG_CONSOLE_BTEXT) += font-8x16.o +driver-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.o -- cgit v1.2.3