From d7c6e444acfc3284c4a9ff49dd138cd0c37545e2 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 30 May 2013 10:32:31 +0200 Subject: [PATCH] console: add qemu prefix to debugcon Change-Id: Ibcc0a94638c022a76cd3c2e3387af6e1ab757ccb Signed-off-by: Gerd Hoffmann Reviewed-on: http://review.coreboot.org/3337 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Ronald G. Minnich --- src/console/Kconfig | 6 +++--- src/console/Makefile.inc | 2 +- src/console/{debugcon_console.c => qemu_debugcon_console.c} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/console/{debugcon_console.c => qemu_debugcon_console.c} (96%) diff --git a/src/console/Kconfig b/src/console/Kconfig index 46fe2e70a9..dc41fd36b2 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 a08c8a4414..ed2287e85f 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/qemu_debugcon_console.c similarity index 96% rename from src/console/debugcon_console.c rename to src/console/qemu_debugcon_console.c index a9bc7d3cc6..3037e3651c 100644 --- a/src/console/debugcon_console.c +++ b/src/console/qemu_debugcon_console.c @@ -27,7 +27,7 @@ static void debugcon_init(void) static void debugcon_tx_byte(unsigned char data) { - outb(data, CONFIG_CONSOLE_DEBUGCON_PORT); + outb(data, CONFIG_CONSOLE_QEMU_DEBUGCON_PORT); } static void debugcon_tx_flush(void)