3 files changed, 64 insertions, 0 deletions
diff --git a/src/drivers/uart/Kconfig b/src/drivers/uart/Kconfig
index c1c30907c3..5c9a9d129c 100644
--- a/src/drivers/uart/Kconfig
+++ b/src/drivers/uart/Kconfig
@@ -12,3 +12,7 @@ config HAVE_UART_SPECIAL
 	bool
 	default n
 
+config DRIVERS_UART_PL011
+	bool
+	default n
+	select HAVE_UART_SPECIAL
diff --git a/src/drivers/uart/Makefile.inc b/src/drivers/uart/Makefile.inc
index c797d4b44d..52a7024318 100644
--- a/src/drivers/uart/Makefile.inc
+++ b/src/drivers/uart/Makefile.inc
@@ -4,3 +4,13 @@ ramstage-y += util.c
 bootblock-y += util.c
 smm-y += util.c
 endif
+
+ifeq ($(CONFIG_CONSOLE_SERIAL_UART),y)
+
+ifeq ($(CONFIG_DRIVERS_UART_PL011),y)
+bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += pl011.c
+romstage-$(CONFIG_EARLY_CONSOLE) += pl011.c
+ramstage-y += pl011.c
+endif
+
+endif
diff --git a/src/drivers/uart/pl011.c b/src/drivers/uart/pl011.c
new file mode 100644
index 0000000000..af085acbea
--- /dev/null
+++ b/src/drivers/uart/pl011.c
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2013 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ */
+
+#include <console/console.h>
+#include <uart.h>
+
+static void pl011_uart_tx_byte(unsigned char data)
+{
+	static volatile unsigned int *uart0_address =
+		(unsigned int *) CONFIG_CONSOLE_SERIAL_UART_ADDRESS;
+
+	*uart0_address = (unsigned int)data;
+}
+
+#if !defined(__PRE_RAM__)
+
+static const struct console_driver pl011_uart_console __console = {
+	.tx_byte  = pl011_uart_tx_byte,
+};
+
+uint32_t uartmem_getbaseaddr(void)
+{
+	return CONFIG_CONSOLE_SERIAL_UART_ADDRESS;
+}
+#else
+void uart_init(void)
+{
+}
+
+void uart_tx_byte(unsigned char data)
+{
+	pl011_uart_tx_byte(data);
+}
+
+void uart_tx_flush(void)
+{
+}
+#endif