diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-08-12 15:00:51 +0000 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2009-08-12 15:00:51 +0000 |
| commit | 0588d19abef62dad63a7794a37bdd6a71c526d9e (patch) | |
| tree | 1c507caa1ffed6ceb73d3e13fc9b766a713d16e2 /src/console | |
| parent | 38cd29ebd7282333650cf11ed50c7f2fd4031e80 (diff) | |
Kconfig!
Works on Kontron, qemu, and serengeti.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
tested on abuild only.
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4534 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/console')
| -rw-r--r-- | src/console/Kconfig | 40 | ||||
| -rw-r--r-- | src/console/Makefile.inc | 12 | ||||
| -rw-r--r-- | src/console/console.c | 9 |
3 files changed, 52 insertions, 9 deletions
diff --git a/src/console/Kconfig b/src/console/Kconfig new file mode 100644 index 0000000000..386f8391fe --- /dev/null +++ b/src/console/Kconfig @@ -0,0 +1,40 @@ +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)" + depends on SERIAL_CONSOLE + default 0x3f8 + +config SERIAL_SET_SPEED + bool "Override the serial console baud rate" + default y + depends on SERIAL_CONSOLE + +config TTYS0_BAUD + int "Serial console baud rate (default 115200)" + depends on SERIAL_SET_SPEED + default 115200 + +config USBDEBUG_DIRECT + bool "Support a USB debug dongle. Not supported on all chipsets. FIX DEPENDENCY HERE" + default n + +config CONSOLE_VGA + bool + default n + +config MAXIMUM_CONSOLE_LOGLEVEL + int + default 9 + +config DEFAULT_CONSOLE_LOGLEVEL + int + default 9 + +endmenu + + diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc new file mode 100644 index 0000000000..242c93e0d4 --- /dev/null +++ b/src/console/Makefile.inc @@ -0,0 +1,12 @@ +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 diff --git a/src/console/console.c b/src/console/console.c index 78823afdb5..008130fb63 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -8,8 +8,6 @@ #include <pc80/mc146818rtc.h> -static int initialized; - /* initialize the console */ void console_init(void) { @@ -22,7 +20,6 @@ void console_init(void) continue; driver->init(); } - initialized = 1; } static void __console_tx_byte(unsigned char byte) @@ -45,8 +42,6 @@ void console_tx_flush(void) void console_tx_byte(unsigned char byte) { - if (!initialized) - return; if (byte == '\n') __console_tx_byte('\r'); __console_tx_byte(byte); @@ -55,8 +50,6 @@ void console_tx_byte(unsigned char byte) unsigned char console_rx_byte(void) { struct console_driver *driver; - if (!initialized) - return 0; for(driver = console_drivers; driver < econsole_drivers; driver++) { if (driver->tst_byte) break; @@ -70,8 +63,6 @@ unsigned char console_rx_byte(void) int console_tst_byte(void) { struct console_driver *driver; - if (!initialized) - return 0; for(driver = console_drivers; driver < econsole_drivers; driver++) if (driver->tst_byte) return driver->tst_byte(); |