[coreboot-gerrit] New patch to review for coreboot: 87de647 imgtec/pistachio: Bring uart driver to modern standards
Patrick Georgi (pgeorgi@google.com)
gerrit at coreboot.org
Mon Mar 30 14:41:56 CEST 2015
Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9165
-gerrit
commit 87de647cfea532627f91bb2d695bf5ac2b924a81
Author: Patrick Georgi <pgeorgi at google.com>
Date: Mon Mar 30 13:08:18 2015 +0200
imgtec/pistachio: Bring uart driver to modern standards
The console interface changed in upstream, and the
driver didn't reflect that yet.
This wasn't obvious because the driver wasn't compiled
at all.
Change-Id: Id18391e62e7ebd8f5fc929838ce27bf414e364f9
Signed-off-by: Patrick Georgi <pgeorgi at google.com>
---
src/arch/mips/Makefile.inc | 1 -
src/arch/mips/early_console.c | 38 ------------------
src/soc/imgtec/pistachio/Makefile.inc | 2 +-
src/soc/imgtec/pistachio/uart.c | 75 ++++++++++-------------------------
4 files changed, 23 insertions(+), 93 deletions(-)
diff --git a/src/arch/mips/Makefile.inc b/src/arch/mips/Makefile.inc
index 9636333..18f98ab 100644
--- a/src/arch/mips/Makefile.inc
+++ b/src/arch/mips/Makefile.inc
@@ -37,7 +37,6 @@ ifeq ($(CONFIG_ARCH_BOOTBLOCK_MIPS),y)
bootblock-y += boot.c
bootblock-y += bootblock.S
bootblock-y += bootblock_simple.c
-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += early_console.c
bootblock-y += stages.c
bootblock-y += timer.c
bootblock-y += ../../lib/memcpy.c
diff --git a/src/arch/mips/early_console.c b/src/arch/mips/early_console.c
deleted file mode 100644
index c699abc..0000000
--- a/src/arch/mips/early_console.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * 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 <console/vtxprintf.h>
-
-void console_tx_byte(unsigned char byte)
-{
- if (byte == '\n')
- console_tx_byte('\r');
-
-#if CONFIG_CONSOLE_SERIAL_UART
- uart_tx_byte(byte);
-#endif
-}
-
-void console_tx_flush(void)
-{
-#if CONFIG_CONSOLE_SERIAL_UART
- uart_tx_flush();
-#endif
-}
diff --git a/src/soc/imgtec/pistachio/Makefile.inc b/src/soc/imgtec/pistachio/Makefile.inc
index e695abd..b91bb1b5 100644
--- a/src/soc/imgtec/pistachio/Makefile.inc
+++ b/src/soc/imgtec/pistachio/Makefile.inc
@@ -24,7 +24,7 @@ bootblock-y += spi.c
romstage-y += spi.c
ramstage-y += spi.c
-ifeq ($(CONFIG_CONSOLE_SERIAL_UART),y)
+ifeq ($(CONFIG_DRIVERS_UART),y)
bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c
romstage-y += uart.c
ramstage-y += uart.c
diff --git a/src/soc/imgtec/pistachio/uart.c b/src/soc/imgtec/pistachio/uart.c
index 53bf21d..9c96b89 100644
--- a/src/soc/imgtec/pistachio/uart.c
+++ b/src/soc/imgtec/pistachio/uart.c
@@ -22,11 +22,12 @@
*/
#include <arch/io.h>
+#include <boot/coreboot_tables.h>
#include <console/console.h>
+#include <console/uart.h>
#include <device/device.h>
#include <delay.h>
-#include <uart.h>
-#include <uart8250.h>
+#include <drivers/uart/uart8250reg.h>
/* Should support 8250, 16450, 16550, 16550A type UARTs */
@@ -115,13 +116,13 @@ static void uart8250_mem_init(unsigned base_port, unsigned divisor)
write_lcr(base_port, CONFIG_TTYS0_LCS);
}
-static unsigned int uart_platform_refclk(void)
+unsigned int uart_platform_refclk(void)
{
/* TODO: this is entirely arbitrary */
return 1000000;
}
-static unsigned int uart_platform_base(int idx)
+uintptr_t uart_platform_base(int idx)
{
switch (idx) {
case 0:
@@ -135,16 +136,9 @@ static unsigned int uart_platform_base(int idx)
}
}
-/* Calculate divisor. Do not floor but round to nearest integer. */
-static unsigned int uart_baudrate_divisor(unsigned int baudrate,
- unsigned int refclk, unsigned int oversample)
+void uart_init(int idx)
{
- return (1 + (2 * refclk) / (baudrate * oversample)) / 2;
-}
-
-static void pistachio_uart_init(void)
-{
- u32 base = uart_platform_base(0);
+ u32 base = uart_platform_base(idx);
if (!base)
return;
@@ -154,64 +148,39 @@ static void pistachio_uart_init(void)
uart8250_mem_init(base, div);
}
-static void pistachio_uart_tx_byte(unsigned char data)
+void uart_tx_byte(int idx, unsigned char data)
{
- u32 base = uart_platform_base(0);
+ u32 base = uart_platform_base(idx);
if (!base)
return;
uart8250_mem_tx_byte(base, data);
}
-static unsigned char pistachio_uart_rx_byte(void)
+unsigned char uart_rx_byte(int idx)
{
- u32 base = uart_platform_base(0);
+ u32 base = uart_platform_base(idx);
if (!base)
return 0xff;
return uart8250_mem_rx_byte(base);
}
-static void pistachio_uart_tx_flush(void)
+void uart_tx_flush(int idx)
{
- u32 base = uart_platform_base(0);
+ u32 base = uart_platform_base(idx);
if (!base)
return;
uart8250_mem_tx_flush(base);
}
-#if !defined(__PRE_RAM__)
-
-static const struct console_driver pistachio_uart_console __console = {
- .init = pistachio_uart_init,
- .tx_byte = pistachio_uart_tx_byte,
- .tx_flush = pistachio_uart_tx_flush,
- .rx_byte = pistachio_uart_rx_byte,
-};
-
-uint32_t uartmem_getbaseaddr(void)
-{
- return uart_platform_base(0);
-}
-
-#else /* __PRE_RAM__ */
-
-void uart_init(void)
-{
- pistachio_uart_init();
-}
-
-void uart_tx_byte(unsigned char data)
+#ifndef __PRE_RAM__
+void uart_fill_lb(void *data)
{
- pistachio_uart_tx_byte(data);
-}
+ struct lb_serial serial;
+ serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED;
+ serial.baseaddr = uart_platform_base(CONFIG_UART_FOR_CONSOLE);
+ serial.baud = default_baudrate();
+ lb_add_serial(&serial, data);
-unsigned char uart_rx_byte(void)
-{
- return pistachio_uart_rx_byte();
+ lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
}
-
-void uart_tx_flush(void)
-{
- pistachio_uart_tx_flush();
-}
-
-#endif /* __PRE_RAM__ */
+#endif
More information about the coreboot-gerrit
mailing list