Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5231
-gerrit
commit 4c2eaf6c44e2f1beaeda19bed5c6209a0221bcb4
Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Date: Sat Feb 15 09:20:19 2014 +0200
console: Move generic UART header
Change-Id: I3ae773a32e65e4645919998bc08a3a0d0f686121
Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
---
src/console/util.c | 2 +-
src/cpu/allwinner/a10/uart_console.c | 2 +-
src/cpu/samsung/exynos5250/uart.c | 2 +-
src/cpu/samsung/exynos5420/uart.c | 2 +-
src/cpu/ti/am335x/uart.c | 2 +-
src/include/console/console.h | 2 +-
src/include/console/uart.h | 35 ++++++++++++++++++++
src/include/uart.h | 44 --------------------------
src/mainboard/cubietech/cubieboard/bootblock.c | 2 +-
src/mainboard/emulation/qemu-armv7/uart.c | 2 +-
src/mainboard/ti/beaglebone/bootblock.c | 2 +-
11 files changed, 44 insertions(+), 53 deletions(-)
diff --git a/src/console/util.c b/src/console/util.c
index 405657d..741a0d4 100644
--- a/src/console/util.c
+++ b/src/console/util.c
@@ -16,7 +16,7 @@
*/
#include <console/console.h>
-#include <uart8250.h>
+#include <console/uart.h>
#if CONFIG_USE_OPTION_TABLE
#include <option.h>
#include "option_table.h"
diff --git a/src/cpu/allwinner/a10/uart_console.c b/src/cpu/allwinner/a10/uart_console.c
index 58930dd..94ab7f7 100644
--- a/src/cpu/allwinner/a10/uart_console.c
+++ b/src/cpu/allwinner/a10/uart_console.c
@@ -8,7 +8,7 @@
#include <config.h>
#include <types.h>
-#include <uart.h>
+#include <console/uart.h>
#include <arch/io.h>
#include <console/console.h>
diff --git a/src/cpu/samsung/exynos5250/uart.c b/src/cpu/samsung/exynos5250/uart.c
index dbf7202..80e9f4e 100644
--- a/src/cpu/samsung/exynos5250/uart.c
+++ b/src/cpu/samsung/exynos5250/uart.c
@@ -18,7 +18,7 @@
*/
#include <console/console.h> /* for __console definition */
-#include <uart.h>
+#include <console/uart.h>
#include <arch/io.h>
#include "uart.h"
#include "clk.h"
diff --git a/src/cpu/samsung/exynos5420/uart.c b/src/cpu/samsung/exynos5420/uart.c
index c5c8a8c..ac01488 100644
--- a/src/cpu/samsung/exynos5420/uart.c
+++ b/src/cpu/samsung/exynos5420/uart.c
@@ -18,7 +18,7 @@
*/
#include <console/console.h> /* for __console definition */
-#include <uart.h>
+#include <console/uart.h>
#include <arch/io.h>
#include "uart.h"
#include "clk.h"
diff --git a/src/cpu/ti/am335x/uart.c b/src/cpu/ti/am335x/uart.c
index bd2ff44..448b1c2 100644
--- a/src/cpu/ti/am335x/uart.c
+++ b/src/cpu/ti/am335x/uart.c
@@ -18,7 +18,7 @@
#include <config.h>
#include <types.h>
-#include <uart.h>
+#include <console/uart.h>
#include <arch/io.h>
#include <console/console.h> /* for __console definition */
diff --git a/src/include/console/console.h b/src/include/console/console.h
index 451a46a..4df8cb6 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -25,7 +25,7 @@
#include <console/post_codes.h>
#if CONFIG_CONSOLE_SERIAL
-#include <uart.h>
+#include <console/uart.h>
#endif
#if CONFIG_USBDEBUG && !defined(__ROMCC__)
#include <console/usb.h>
diff --git a/src/include/console/uart.h b/src/include/console/uart.h
new file mode 100644
index 0000000..6cd3beb
--- /dev/null
+++ b/src/include/console/uart.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2012 The ChromiumOS Authors. All rights reserved.
+ *
+ * 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
+ */
+
+#ifndef CONSOLE_UART_H
+#define CONSOLE_UART_H
+
+void uart_init(void);
+void uart_tx_byte(unsigned char data);
+void uart_tx_flush(void);
+unsigned char uart_rx_byte(void);
+
+
+unsigned uart_divisor(unsigned basefreq);
+unsigned uart_platform_divisor(void);
+
+
+uint32_t uartmem_getbaseaddr(void);
+
+#endif /* CONSOLE_UART_H */
diff --git a/src/include/uart.h b/src/include/uart.h
deleted file mode 100644
index 9601bfa..0000000
--- a/src/include/uart.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 The ChromiumOS Authors. All rights reserved.
- *
- * 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
- */
-
-/* madness. Uarts are a mess. If you include this file, it
- * includes ALL uart implementations which may be needed.
- * No need to include them separately, and include this file FIRST.
- * At least one (but at most one) of the files needs to define
- * uart_init().
- */
-#ifndef UART_H
-#define UART_H
-
-#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
-#include <uart8250.h>
-#endif
-
-#if CONFIG_CONSOLE_SERIAL_UART
-unsigned char uart_rx_byte(void);
-void uart_tx_byte(unsigned char data);
-void uart_tx_flush(void);
-void uart_init(void);
-#endif
-
-#if CONFIG_HAVE_UART_MEMORY_MAPPED
-uint32_t uartmem_getbaseaddr(void);
-#endif
-
-#endif /* UART_H */
diff --git a/src/mainboard/cubietech/cubieboard/bootblock.c b/src/mainboard/cubietech/cubieboard/bootblock.c
index 2e5929c..e22c1d8 100644
--- a/src/mainboard/cubietech/cubieboard/bootblock.c
+++ b/src/mainboard/cubietech/cubieboard/bootblock.c
@@ -7,7 +7,7 @@
*/
#include <arch/io.h>
-#include <uart.h>
+#include <console/uart.h>
#include <console/console.h>
#include <delay.h>
#include <cpu/allwinner/a10/gpio.h>
diff --git a/src/mainboard/emulation/qemu-armv7/uart.c b/src/mainboard/emulation/qemu-armv7/uart.c
index dfe5d0a..0be1cf9 100644
--- a/src/mainboard/emulation/qemu-armv7/uart.c
+++ b/src/mainboard/emulation/qemu-armv7/uart.c
@@ -14,7 +14,7 @@
*/
#include <console/console.h>
-#include <uart.h>
+#include <console/uart.h>
#define VEXPRESS_UART0_IO_ADDRESS (0x10009000)
diff --git a/src/mainboard/ti/beaglebone/bootblock.c b/src/mainboard/ti/beaglebone/bootblock.c
index dd46040..9e0a62e 100644
--- a/src/mainboard/ti/beaglebone/bootblock.c
+++ b/src/mainboard/ti/beaglebone/bootblock.c
@@ -19,7 +19,7 @@
#include <arch/io.h>
#include <types.h>
-#include <uart.h>
+#include <console/uart.h>
#include <console/console.h>
#include <cpu/ti/am335x/pinmux.h>
Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5162
-gerrit
commit 5d984c4f7e34733b1b8d1a1b2490ac415e6e4ec7
Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Date: Mon Feb 10 23:21:14 2014 +0200
pl011 UART: Move under drivers/uart
Currently this is only a minimal stub to get console on qemu-armv7.
Change-Id: I3f20b7f944bc7d0e5ace9d22198d4c16a3839d2c
Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
---
src/drivers/uart/Kconfig | 4 ++
src/drivers/uart/Makefile.inc | 9 ++++
src/drivers/uart/pl011.c | 51 +++++++++++++++++++++
src/mainboard/emulation/qemu-armv7/Kconfig | 8 +++-
src/mainboard/emulation/qemu-armv7/Makefile.inc | 4 --
src/mainboard/emulation/qemu-armv7/uart.c | 60 -------------------------
6 files changed, 70 insertions(+), 66 deletions(-)
diff --git a/src/drivers/uart/Kconfig b/src/drivers/uart/Kconfig
index c1c3090..5c9a9d1 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
new file mode 100644
index 0000000..9a8121e
--- /dev/null
+++ b/src/drivers/uart/Makefile.inc
@@ -0,0 +1,9 @@
+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 0000000..a880c77
--- /dev/null
+++ b/src/drivers/uart/pl011.c
@@ -0,0 +1,51 @@
+/*
+ * 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 <console/uart.h>
+
+static const uint32_t uart_base = CONFIG_CONSOLE_SERIAL_UART_ADDRESS;
+
+static void pl011_uart_tx_byte(unsigned int *tx_fifo, unsigned char data)
+{
+ *tx_fifo = (unsigned int)data;
+}
+
+#if !defined(__PRE_RAM__)
+
+static const struct console_driver pl011_uart_console __console = {
+ .init = pl011_init_dev,
+ .tx_byte = pl011_uart_tx_byte,
+ .tx_flush = pl011_uart_tx_flush,
+};
+
+uint32_t uartmem_getbaseaddr(void)
+{
+ return VEXPRESS_UART0_IO_ADDRESS;
+}
+#else
+void uart_init(void)
+{
+}
+
+void uart_tx_byte(unsigned char data)
+{
+ pl011_uart_tx_byte((unsigned int *)uart_base, data);
+}
+
+void uart_tx_flush(void)
+{
+}
+#endif
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index 9ab9767..edba627 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -25,8 +25,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select ARCH_ARMV7
select CPU_ARMLTD_CORTEX_A9
- select HAVE_UART_MEMORY_MAPPED
- select HAVE_UART_SPECIAL
+ select DRIVERS_UART_PL011
select BOARD_ROMSIZE_KB_4096
config MAINBOARD_DIR
@@ -49,6 +48,11 @@ config DRAM_SIZE_MB
int
default 1024
+config CONSOLE_SERIAL_UART_ADDRESS
+ hex
+ depends on CONSOLE_SERIAL_UART
+ default 0x10009000
+
# Memory map for qemu vexpress-a9:
#
# 0x0000_0000: jump instruction (by qemu)
diff --git a/src/mainboard/emulation/qemu-armv7/Makefile.inc b/src/mainboard/emulation/qemu-armv7/Makefile.inc
index 431d9ab..d15495f 100644
--- a/src/mainboard/emulation/qemu-armv7/Makefile.inc
+++ b/src/mainboard/emulation/qemu-armv7/Makefile.inc
@@ -21,7 +21,3 @@ ramstage-y += media.c
bootblock-y += timer.c
romstage-y += timer.c
ramstage-y += timer.c
-
-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c
-romstage-$(CONFIG_EARLY_CONSOLE) += uart.c
-ramstage-y += uart.c
diff --git a/src/mainboard/emulation/qemu-armv7/uart.c b/src/mainboard/emulation/qemu-armv7/uart.c
deleted file mode 100644
index 0be1cf9..0000000
--- a/src/mainboard/emulation/qemu-armv7/uart.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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 <console/uart.h>
-
-#define VEXPRESS_UART0_IO_ADDRESS (0x10009000)
-
-static void pl011_init_dev(void) {
-}
-
-static void pl011_uart_tx_byte(unsigned char data) {
- static volatile unsigned int *uart0_address =
- (unsigned int *)VEXPRESS_UART0_IO_ADDRESS;
-
- *uart0_address = (unsigned int)data;
-}
-
-static void pl011_uart_tx_flush(void) {
-}
-
-#if !defined(__PRE_RAM__)
-
-static const struct console_driver pl011_uart_console __console = {
- .init = pl011_init_dev,
- .tx_byte = pl011_uart_tx_byte,
- .tx_flush = pl011_uart_tx_flush,
-};
-
-uint32_t uartmem_getbaseaddr(void)
-{
- return VEXPRESS_UART0_IO_ADDRESS;
-}
-#else
-void uart_init(void)
-{
- pl011_init_dev();
-}
-
-void uart_tx_byte(unsigned char data)
-{
- pl011_uart_tx_byte(data);
-}
-
-void uart_tx_flush(void) {
- pl011_uart_tx_flush();
-}
-#endif