Gerd Hoffmann (kraxel@redhat.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3337
-gerrit
commit 652038b2a30a7517f7d06af9281a7a71b2dfa608 Author: Gerd Hoffmann kraxel@redhat.com Date: Thu May 30 10:32:31 2013 +0200
console: add qemu prefix to debugcon
Change-Id: Ibcc0a94638c022a76cd3c2e3387af6e1ab757ccb Signed-off-by: Gerd Hoffmann kraxel@redhat.com --- src/console/Kconfig | 6 ++--- src/console/Makefile.inc | 2 +- src/console/debugcon_console.c | 53 ------------------------------------- src/console/qemu_debugcon_console.c | 53 +++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/src/console/Kconfig b/src/console/Kconfig index 46fe2e7..dc41fd3 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -251,7 +251,7 @@ config CONSOLE_CAR_BUFFER_SIZE saved in a CBMEM buffer. 3K bytes should be enough even for the BIOS_SPEW level.
-config CONSOLE_DEBUGCON +config CONSOLE_QEMU_DEBUGCON bool "QEMU debug console output" depends on BOARD_EMULATION_QEMU_X86 default y @@ -262,9 +262,9 @@ config CONSOLE_DEBUGCON -chardev file,id=debugcon,path=/dir/file.log \ -device isa-debugcon,iobase=0x402,chardev=debugcon
-config CONSOLE_DEBUGCON_PORT +config CONSOLE_QEMU_DEBUGCON_PORT hex "QEMU debug console port" - depends on CONSOLE_DEBUGCON + depends on CONSOLE_QEMU_DEBUGCON default 0x402
choice diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index a08c8a4..ed2287e 100644 --- a/src/console/Makefile.inc +++ b/src/console/Makefile.inc @@ -25,7 +25,7 @@ ramstage-$(CONFIG_USBDEBUG) += usbdebug_console.c ramstage-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.c ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c ramstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c -ramstage-$(CONFIG_CONSOLE_DEBUGCON) += debugcon_console.c +ramstage-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon_console.c
$(obj)/console/console.ramstage.o : $(obj)/build.h diff --git a/src/console/debugcon_console.c b/src/console/debugcon_console.c deleted file mode 100644 index a9bc7d3..0000000 --- a/src/console/debugcon_console.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2013 Red Hat Inc. - * Written by Gerd Hoffmann kraxel@redhat.com - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - */ - -#include <console/console.h> -#include <arch/io.h> - -static void debugcon_init(void) -{ -} - -static void debugcon_tx_byte(unsigned char data) -{ - outb(data, CONFIG_CONSOLE_DEBUGCON_PORT); -} - -static void debugcon_tx_flush(void) -{ -} - -static unsigned char debugcon_rx_byte(void) -{ - return 0; -} - -static int debugcon_tst_byte(void) -{ - return 0; -} - -static const struct console_driver debugcon_console __console = { - .init = debugcon_init, - .tx_byte = debugcon_tx_byte, - .tx_flush = debugcon_tx_flush, - .rx_byte = debugcon_rx_byte, - .tst_byte = debugcon_tst_byte, -}; diff --git a/src/console/qemu_debugcon_console.c b/src/console/qemu_debugcon_console.c new file mode 100644 index 0000000..3037e36 --- /dev/null +++ b/src/console/qemu_debugcon_console.c @@ -0,0 +1,53 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2013 Red Hat Inc. + * Written by Gerd Hoffmann kraxel@redhat.com + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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 + */ + +#include <console/console.h> +#include <arch/io.h> + +static void debugcon_init(void) +{ +} + +static void debugcon_tx_byte(unsigned char data) +{ + outb(data, CONFIG_CONSOLE_QEMU_DEBUGCON_PORT); +} + +static void debugcon_tx_flush(void) +{ +} + +static unsigned char debugcon_rx_byte(void) +{ + return 0; +} + +static int debugcon_tst_byte(void) +{ + return 0; +} + +static const struct console_driver debugcon_console __console = { + .init = debugcon_init, + .tx_byte = debugcon_tx_byte, + .tx_flush = debugcon_tx_flush, + .rx_byte = debugcon_rx_byte, + .tst_byte = debugcon_tst_byte, +};