From f89783c5e439a7cbb06ae93b0bd5561728eb94d0 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Tue, 13 Jan 2009 20:24:52 +0000 Subject: [PATCH] CONFIG_SERIAL_PORT to 0 select ch-a (0x20 offset), other value select ch-b (0x00 offset). Idea from Blue Swirl git-svn-id: svn://coreboot.org/openbios/openbios-devel@406 f158a5a8-5612-0410-a976-696ce0be7e32 --- arch/ppc/qemu/init.c | 2 +- drivers/escc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index dd026db..6ea0d19 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -148,7 +148,7 @@ entry( void ) isa_io_base = arch->io_base; - uart_init(0x80013000ULL + CONFIG_SERIAL_PORT * 0x20, + uart_init(0x80013000ULL + (CONFIG_SERIAL_PORT ? 0 : 0x20), CONFIG_SERIAL_SPEED); printk("\n"); diff --git a/drivers/escc.c b/drivers/escc.c index a426bcc..6da9a8f 100644 --- a/drivers/escc.c +++ b/drivers/escc.c @@ -443,6 +443,6 @@ escc_init(const char *path, unsigned long addr) escc_add_channel(buf, "b", addr, 0); serial_dev = (unsigned char *)addr + IO_ESCC_OFFSET + - 0x20 * CONFIG_SERIAL_PORT; + (CONFIG_SERIAL_PORT ? 0 : 0x20); } #endif