Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5342
-gerrit
commit 062ead28c3a197afff1944b3686b48181bf1003d Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Tue Feb 25 09:02:17 2014 +0200
uart: Support multiple ports
The port for console remains to be a compile time constant. The Kconfig option is changed to select an UART port with index to avoid putting map of UART base addresses in Kconfigs.
With this change it is possible to have other than debug console on different UART port.
Change-Id: Ie1845a946f8d3b2604ef5404edb31b2e811f3ccd Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/console/Kconfig | 38 +++++------------- src/cpu/allwinner/a10/Kconfig | 49 ++---------------------- src/cpu/allwinner/a10/uart_console.c | 50 ++++++++---------------- src/cpu/samsung/exynos5250/Kconfig | 39 ++----------------- src/cpu/samsung/exynos5250/uart.c | 23 ++++++----- src/cpu/samsung/exynos5420/Kconfig | 39 ++----------------- src/cpu/samsung/exynos5420/uart.c | 21 ++++++---- src/cpu/ti/am335x/uart.c | 24 +++++++----- src/drivers/uart/oxpcie_early.c | 2 +- src/drivers/uart/pl011.c | 15 +++----- src/drivers/uart/uart8250io.c | 18 ++++----- src/drivers/uart/uart8250mem.c | 16 ++++---- src/include/console/uart.h | 14 +++---- src/mainboard/emulation/qemu-armv7/Kconfig | 5 --- src/mainboard/emulation/qemu-armv7/Makefile.inc | 4 ++ src/mainboard/ti/beaglebone/Kconfig | 51 ++----------------------- 16 files changed, 114 insertions(+), 294 deletions(-)
diff --git a/src/console/Kconfig b/src/console/Kconfig index 9377a78..e46714f 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -48,39 +48,21 @@ if CONSOLE_SERIAL comment "device-specific UART" depends on HAVE_UART_SPECIAL
-choice - prompt "Serial port for 8250" - default CONSOLE_SERIAL_COM1 - depends on DRIVERS_UART_8250IO - -config CONSOLE_SERIAL_COM1 - bool "COM1/ttyS0, I/O port 0x3f8" - help - Serial console on COM1/ttyS0 at I/O port 0x3f8. -config CONSOLE_SERIAL_COM2 - bool "COM2/ttyS1, I/O port 0x2f8" - help - Serial console on COM2/ttyS1 at I/O port 0x2f8. -config CONSOLE_SERIAL_COM3 - bool "COM3/ttyS2, I/O port 0x3e8" - help - Serial console on COM3/ttyS2 at I/O port 0x3e8. -config CONSOLE_SERIAL_COM4 - bool "COM4/ttyS3, I/O port 0x2e8" - help - Serial console on COM4/ttyS3 at I/O port 0x2e8. - -endchoice +config CONSOLE_PORT + prompt "Index for UART port to use for console" + default 0
+# FIXME: Early programming in romstage is incorrect as we should +# program different LDN to actually change the physical port. config TTYS0_BASE hex depends on DRIVERS_UART_8250IO - default 0x3f8 if CONSOLE_SERIAL_COM1 - default 0x2f8 if CONSOLE_SERIAL_COM2 - default 0x3e8 if CONSOLE_SERIAL_COM3 - default 0x2e8 if CONSOLE_SERIAL_COM4 + default 0x3f8 if CONSOLE_PORT = 0 + default 0x2f8 if CONSOLE_PORT = 1 + default 0x3e8 if CONSOLE_PORT = 2 + default 0x2e8 if CONSOLE_PORT = 3 help - Map the COM port names to the respective I/O port. + Map the COM port number to the respective I/O port.
choice prompt "Baud rate" diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig index 8512c38..5e3491d 100644 --- a/src/cpu/allwinner/a10/Kconfig +++ b/src/cpu/allwinner/a10/Kconfig @@ -73,51 +73,8 @@ config SYS_SDRAM_BASE hex default 0x40000000
-choice CONSOLE_SERIAL_UART_CHOICES - prompt "Serial Console UART" - default CONSOLE_SERIAL_UART0 - depends on CONSOLE_SERIAL - -config CONSOLE_SERIAL_UART0 - bool "UART0" - help - Serial console on UART0 - -config CONSOLE_SERIAL_UART1 - bool "UART1" - help - Serial console on UART1 - -config CONSOLE_SERIAL_UART2 - bool "UART2" - help - Serial console on UART2 - -config CONSOLE_SERIAL_UART3 - bool "UART3" - help - Serial console on UART3 - -config CONSOLE_SERIAL_UART4 - bool "UART4" - help - Serial console on UART4 - -config CONSOLE_SERIAL_UART5 - bool "UART5" - help - Serial console on UART5 - -config CONSOLE_SERIAL_UART6 - bool "UART6" - help - Serial console on UART6 - -config CONSOLE_SERIAL_UART7 - bool "UART7" - help - Serial console on UART7 - -endchoice +config CONSOLE_PORT + int + default 0
endif # if CPU_ALLWINNER_A10 diff --git a/src/cpu/allwinner/a10/uart_console.c b/src/cpu/allwinner/a10/uart_console.c index 0b80938..cf2ac9e 100644 --- a/src/cpu/allwinner/a10/uart_console.c +++ b/src/cpu/allwinner/a10/uart_console.c @@ -14,28 +14,15 @@
#include <cpu/allwinner/a10/uart.h>
-static void *get_console_uart_base_addr(void) +unsigned int uart_platform_base(int idx) { - /* This big block gets compiled to a constant, not a function call */ - if (CONFIG_CONSOLE_SERIAL_UART0) - return (void *)A1X_UART0_BASE; - else if (CONFIG_CONSOLE_SERIAL_UART1) - return (void *)A1X_UART1_BASE; - else if (CONFIG_CONSOLE_SERIAL_UART2) - return (void *)A1X_UART2_BASE; - else if (CONFIG_CONSOLE_SERIAL_UART3) - return (void *)A1X_UART3_BASE; - else if (CONFIG_CONSOLE_SERIAL_UART4) - return (void *)A1X_UART4_BASE; - else if (CONFIG_CONSOLE_SERIAL_UART5) - return (void *)A1X_UART5_BASE; - else if (CONFIG_CONSOLE_SERIAL_UART6) - return (void *)A1X_UART6_BASE; - else if (CONFIG_CONSOLE_SERIAL_UART7) - return (void *)A1X_UART7_BASE; - - /* If selection is invalid, default to UART0 */ - return (void *)A1X_UART0_BASE; + const unsigned int bases[] = { + A1X_UART0_BASE, A1X_UART1_BASE, A1X_UART2_BASE, A1X_UART3_BASE, + A1X_UART4_BASE, A1X_UART5_BASE, A1X_UART6_BASE, A1X_UART7_BASE, + }; + if (idx < sizeof(bases)/sizeof(bases[0])) + return bases[idx]; + return A1X_UART0_BASE; }
/* FIXME: We assume clock is 24MHz, which may not be the case. */ @@ -44,14 +31,9 @@ unsigned int uart_platform_refclk(void) return 24000000; }
-unsigned int uart_platform_base(int idx) -{ - return (unsigned int)get_console_uart_base_addr(); -} - -void uart_init(void) +void uart_init(int idx) { - void *uart_base = (void *) uart_platform_base(0); + void *uart_base = (void *) uart_platform_base(idx);
/* Use default 8N1 encoding */ a10_uart_configure(uart_base, default_baudrate(), @@ -59,19 +41,19 @@ void uart_init(void) a10_uart_enable_fifos(uart_base); }
-unsigned char uart_rx_byte(void) +unsigned char uart_rx_byte(int idx) { - void *uart_base = (void *) uart_platform_base(0); + void *uart_base = (void *) uart_platform_base(idx); return a10_uart_rx_blocking(uart_base); }
-void uart_tx_byte(unsigned char data) +void uart_tx_byte(int idx, unsigned char data) { - void *uart_base = (void *) uart_platform_base(0); + void *uart_base = (void *) uart_platform_base(idx); a10_uart_tx_blocking(uart_base, data); }
-void uart_tx_flush(void) +void uart_tx_flush(int idx) { }
@@ -80,7 +62,7 @@ void uart_fill_lb(void *data) { struct lb_serial serial; serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED; - serial.baseaddr = uart_platform_base(0); + serial.baseaddr = uart_platform_base(CONFIG_CONSOLE_PORT); serial.baud = default_baudrate(); lb_add_serial(&serial, data);
diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/cpu/samsung/exynos5250/Kconfig index 9320184..5775f59 100644 --- a/src/cpu/samsung/exynos5250/Kconfig +++ b/src/cpu/samsung/exynos5250/Kconfig @@ -88,41 +88,8 @@ config SYS_SDRAM_BASE hex default 0x40000000
-choice CONSOLE_SERIAL_UART_CHOICES - prompt "Serial Console UART" - default CONSOLE_SERIAL_UART3 - depends on CONSOLE_SERIAL - -config CONSOLE_SERIAL_UART0 - bool "UART0" - help - Serial console on UART0 - -config CONSOLE_SERIAL_UART1 - bool "UART1" - help - Serial console on UART1 - -config CONSOLE_SERIAL_UART2 - bool "UART2" - help - Serial console on UART2 - -config CONSOLE_SERIAL_UART3 - bool "UART3" - help - Serial console on UART3 - -endchoice - -config CONSOLE_SERIAL_UART_ADDRESS - hex - depends on CONSOLE_SERIAL - default 0x12c00000 if CONSOLE_SERIAL_UART0 - default 0x12c10000 if CONSOLE_SERIAL_UART1 - default 0x12c20000 if CONSOLE_SERIAL_UART2 - default 0x12c30000 if CONSOLE_SERIAL_UART3 - help - Map the UART names to the respective MMIO address. +config CONSOLE_PORT + int + default 3
endif diff --git a/src/cpu/samsung/exynos5250/uart.c b/src/cpu/samsung/exynos5250/uart.c index 5458e7b..07302e3 100644 --- a/src/cpu/samsung/exynos5250/uart.c +++ b/src/cpu/samsung/exynos5250/uart.c @@ -157,30 +157,35 @@ static void exynos5_uart_tx_flush(struct s5p_uart *uart)
unsigned int uart_platform_base(int idx) { - return CONFIG_CONSOLE_SERIAL_UART_ADDRESS; + const unsigned int bases[] = { + 0x12c00000, 0x12c10000, 0x12c20000, 0x12c30000 + }; + if (idx < sizeof(bases)/sizeof(bases[0])) + return bases[idx]; + return 0; }
-void uart_init(void) +void uart_init(int idx) { - struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(0); + struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(idx); exynos5_init_dev(uart); }
-unsigned char uart_rx_byte(void) +unsigned char uart_rx_byte(int idx) { - struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(0); + struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(idx); return exynos5_uart_rx_byte(uart); }
-void uart_tx_byte(unsigned char data) +void uart_tx_byte(int idx, unsigned char data) { - struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(0); + struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(idx); exynos5_uart_tx_byte(uart, data); }
-void uart_tx_flush(void) +void uart_tx_flush(int idx) { - struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(0); + struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(idx); exynos5_uart_tx_flush(uart); }
diff --git a/src/cpu/samsung/exynos5420/Kconfig b/src/cpu/samsung/exynos5420/Kconfig index 5f78cc5..6fa0efb 100644 --- a/src/cpu/samsung/exynos5420/Kconfig +++ b/src/cpu/samsung/exynos5420/Kconfig @@ -90,41 +90,8 @@ config SYS_SDRAM_BASE hex default 0x20000000
-choice CONSOLE_SERIAL_UART_CHOICES - prompt "Serial Console UART" - default CONSOLE_SERIAL_UART3 - depends on CONSOLE_SERIAL - -config CONSOLE_SERIAL_UART0 - bool "UART0" - help - Serial console on UART0 - -config CONSOLE_SERIAL_UART1 - bool "UART1" - help - Serial console on UART1 - -config CONSOLE_SERIAL_UART2 - bool "UART2" - help - Serial console on UART2 - -config CONSOLE_SERIAL_UART3 - bool "UART3" - help - Serial console on UART3 - -endchoice - -config CONSOLE_SERIAL_UART_ADDRESS - hex - depends on CONSOLE_SERIAL - default 0x12c00000 if CONSOLE_SERIAL_UART0 - default 0x12c10000 if CONSOLE_SERIAL_UART1 - default 0x12c20000 if CONSOLE_SERIAL_UART2 - default 0x12c30000 if CONSOLE_SERIAL_UART3 - help - Map the UART names to the respective MMIO address. +config CONSOLE_PORT + int + default 3
endif diff --git a/src/cpu/samsung/exynos5420/uart.c b/src/cpu/samsung/exynos5420/uart.c index 0928111..c4e1443 100644 --- a/src/cpu/samsung/exynos5420/uart.c +++ b/src/cpu/samsung/exynos5420/uart.c @@ -149,28 +149,33 @@ static void exynos5_uart_tx_byte(struct s5p_uart *uart, unsigned char data)
unsigned int uart_platform_base(int idx) { - return CONFIG_CONSOLE_SERIAL_UART_ADDRESS; + const unsigned int bases[] = { + 0x12c00000, 0x12c10000, 0x12c20000, 0x12c30000 + }; + if (idx < sizeof(bases)/sizeof(bases[0])) + return bases[idx]; + return 0; }
-void uart_init(void) +void uart_init(int idx) { - struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(0); + struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(idx); exynos5_init_dev(uart); }
-unsigned char uart_rx_byte(void) +unsigned char uart_rx_byte(int idx) { - struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(0); + struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(idx); return exynos5_uart_rx_byte(uart); }
-void uart_tx_byte(unsigned char data) +void uart_tx_byte(int idx, unsigned char data) { - struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(0); + struct s5p_uart *uart = (struct s5p_uart *) uart_platform_base(idx); exynos5_uart_tx_byte(uart, data); }
-void uart_tx_flush(void) +void uart_tx_flush(int idx) { /* Exynos5250 implements this too. */ } diff --git a/src/cpu/ti/am335x/uart.c b/src/cpu/ti/am335x/uart.c index be41653..bfc733b 100644 --- a/src/cpu/ti/am335x/uart.c +++ b/src/cpu/ti/am335x/uart.c @@ -154,30 +154,36 @@ unsigned int uart_platform_refclk(void)
unsigned int uart_platform_base(int idx) { - return CONFIG_CONSOLE_SERIAL_UART_ADDRESS; + const unsigned int bases[] = { + 0x44e09000, 0x48022000, 0x48024000, + 0x481a6000, 0x481a8000, 0x481aa000 + }; + if (idx < sizeof(bases)/sizeof(bases[0])) + return bases[idx]; + return 0; }
-void uart_init(void) +void uart_init(int idx) { - struct am335x_uart *uart = (struct am335x_uart *) uart_platform_base(0); + struct am335x_uart *uart = (struct am335x_uart *) uart_platform_base(idx); uint16_t div = (uint16_t) uart_baudrate_divisor( default_baudrate(), uart_platform_refclk(), 16); am335x_uart_init(uart, div); }
-unsigned char uart_rx_byte(void) +unsigned char uart_rx_byte(int idx) { - struct am335x_uart *uart = (struct am335x_uart *) uart_platform_base(0); + struct am335x_uart *uart = (struct am335x_uart *) uart_platform_base(idx); return am335x_uart_rx_byte(uart); }
-void uart_tx_byte(unsigned char data) +void uart_tx_byte(int idx, unsigned char data) { - struct am335x_uart *uart = (struct am335x_uart *) uart_platform_base(0); + struct am335x_uart *uart = (struct am335x_uart *) uart_platform_base(idx); am335x_uart_tx_byte(uart, data); }
-void uart_tx_flush(void) +void uart_tx_flush(int idx) { }
@@ -186,7 +192,7 @@ void uart_fill_lb(void *data) { struct lb_serial serial; serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED; - serial.baseaddr = uart_platform_base(0); + serial.baseaddr = uart_platform_base(CONFIG_CONSOLE_PORT); serial.baud = default_baudrate(); lb_add_serial(&serial, data);
diff --git a/src/drivers/uart/oxpcie_early.c b/src/drivers/uart/oxpcie_early.c index b81fa89..d5370ba 100644 --- a/src/drivers/uart/oxpcie_early.c +++ b/src/drivers/uart/oxpcie_early.c @@ -97,7 +97,7 @@ void uart_fill_lb(void *data) { struct lb_serial serial; serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED; - serial.baseaddr = uart_platform_base(0); + serial.baseaddr = uart_platform_base(CONFIG_CONSOLE_PORT); serial.baud = default_baudrate(); lb_add_serial(&serial, data);
diff --git a/src/drivers/uart/pl011.c b/src/drivers/uart/pl011.c index b652f36..99b14f1 100644 --- a/src/drivers/uart/pl011.c +++ b/src/drivers/uart/pl011.c @@ -21,22 +21,17 @@ static void pl011_uart_tx_byte(unsigned int *uart_base, unsigned char data) *uart_base = (unsigned int)data; }
-unsigned int uart_platform_base(int idx) +void uart_init(int idx) { - return CONFIG_CONSOLE_SERIAL_UART_ADDRESS; }
-void uart_init(void) +void uart_tx_byte(int idx, unsigned char data) { -} - -void uart_tx_byte(unsigned char data) -{ - unsigned int *uart_base = (unsigned int *) uart_platform_base(0); + unsigned int *uart_base = (unsigned int *) uart_platform_base(idx); pl011_uart_tx_byte(uart_base, data); }
-void uart_tx_flush(void) +void uart_tx_flush(int idx) { }
@@ -50,7 +45,7 @@ void uart_fill_lb(void *data) { struct lb_serial serial; serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED; - serial.baseaddr = uart_platform_base(0); + serial.baseaddr = uart_platform_base(CONFIG_CONSOLE_PORT); serial.baud = default_baudrate(); lb_add_serial(&serial, data);
diff --git a/src/drivers/uart/uart8250io.c b/src/drivers/uart/uart8250io.c index e1fb39b..8e96a9b 100644 --- a/src/drivers/uart/uart8250io.c +++ b/src/drivers/uart/uart8250io.c @@ -111,27 +111,27 @@ unsigned int uart_platform_base(int idx) return bases[idx]; }
-void uart_init(void) +void uart_init(int idx) { unsigned int div; div = uart_baudrate_divisor(default_baudrate(), BAUDRATE_REFCLK, BAUDRATE_OVERSAMPLE); - uart8250_init(bases[0], div); + uart8250_init(uart_platform_base(idx), div); }
-void uart_tx_byte(unsigned char data) +void uart_tx_byte(int idx, unsigned char data) { - uart8250_tx_byte(bases[0], data); + uart8250_tx_byte(uart_platform_base(idx), data); }
-unsigned char uart_rx_byte(void) +unsigned char uart_rx_byte(int idx) { - return uart8250_rx_byte(bases[0]); + return uart8250_rx_byte(uart_platform_base(idx)); }
-void uart_tx_flush(void) +void uart_tx_flush(int idx) { - uart8250_tx_flush(bases[0]); + uart8250_tx_flush(uart_platform_base(idx)); }
#ifndef __PRE_RAM__ @@ -139,7 +139,7 @@ void uart_fill_lb(void *data) { struct lb_serial serial; serial.type = LB_SERIAL_TYPE_IO_MAPPED; - serial.baseaddr = uart_platform_base(0); + serial.baseaddr = uart_platform_base(CONFIG_CONSOLE_PORT); serial.baud = default_baudrate(); lb_add_serial(&serial, data);
diff --git a/src/drivers/uart/uart8250mem.c b/src/drivers/uart/uart8250mem.c index 5a186f0..976bcb6 100644 --- a/src/drivers/uart/uart8250mem.c +++ b/src/drivers/uart/uart8250mem.c @@ -89,9 +89,9 @@ static void uart8250_mem_init(unsigned base_port, unsigned divisor) write8(base_port + UART_LCR, CONFIG_TTYS0_LCS); }
-void uart_init(void) +void uart_init(int idx) { - u32 base = uart_platform_base(0); + u32 base = uart_platform_base(idx); if (!base) return;
@@ -100,25 +100,25 @@ void uart_init(void) uart8250_mem_init(base, div); }
-void 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); }
-unsigned char 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); }
-void 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); diff --git a/src/include/console/uart.h b/src/include/console/uart.h index 566791a..d51bf2a 100644 --- a/src/include/console/uart.h +++ b/src/include/console/uart.h @@ -39,10 +39,10 @@ unsigned int uart_baudrate_divisor(unsigned int baudrate, unsigned int refclk, unsigned int oversample);
-void uart_init(void); -void uart_tx_byte(unsigned char data); -void uart_tx_flush(void); -unsigned char uart_rx_byte(void); +void uart_init(int idx); +void uart_tx_byte(int idx, unsigned char data); +void uart_tx_flush(int idx); +unsigned char uart_rx_byte(int idx);
unsigned int uart_platform_base(int idx);
@@ -52,9 +52,9 @@ void oxford_remap(unsigned int new_base); (ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_SMM && CONFIG_DEBUG_SMI)
#if __CONSOLE_SERIAL_ENABLE__ -#define __uart_init() uart_init() -#define __uart_tx_byte(x) uart_tx_byte(x); -#define __uart_tx_flush() uart_tx_flush() +#define __uart_init() uart_init(CONFIG_CONSOLE_PORT) +#define __uart_tx_byte(x) uart_tx_byte(CONFIG_CONSOLE_PORT, x); +#define __uart_tx_flush() uart_tx_flush(CONFIG_CONSOLE_PORT) #else #define __uart_init() #define __uart_tx_byte(x) diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig index 040ed9c..6d04216 100644 --- a/src/mainboard/emulation/qemu-armv7/Kconfig +++ b/src/mainboard/emulation/qemu-armv7/Kconfig @@ -48,11 +48,6 @@ config DRAM_SIZE_MB int default 1024
-config CONSOLE_SERIAL_UART_ADDRESS - hex - depends on CONSOLE_SERIAL - 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 d15495f..27461bb 100644 --- a/src/mainboard/emulation/qemu-armv7/Makefile.inc +++ b/src/mainboard/emulation/qemu-armv7/Makefile.inc @@ -21,3 +21,7 @@ ramstage-y += media.c bootblock-y += timer.c romstage-y += timer.c ramstage-y += timer.c + +bootblock-y += iomap.c +romstage-y += iomap.c +ramstage-y += iomap.c diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig index c842a5d..41c4c35 100644 --- a/src/mainboard/ti/beaglebone/Kconfig +++ b/src/mainboard/ti/beaglebone/Kconfig @@ -61,54 +61,9 @@ config CBFS_HEADER_ROM_OFFSET hex default 0x10
-choice CONSOLE_SERIAL_UART_CHOICES - prompt "Serial Console UART" - default CONSOLE_SERIAL_UART0 - depends on CONSOLE_SERIAL - -config CONSOLE_SERIAL_UART0 - bool "UART0" - help - Serial console on UART0 - -config CONSOLE_SERIAL_UART1 - bool "UART1" - help - Serial console on UART1 - -config CONSOLE_SERIAL_UART2 - bool "UART2" - help - Serial console on UART2 - -config CONSOLE_SERIAL_UART3 - bool "UART3" - help - Serial console on UART3 - -config CONSOLE_SERIAL_UART4 - bool "UART4" - help - Serial console on UART4 - -config CONSOLE_SERIAL_UART5 - bool "UART5" - help - Serial console on UART5 - -endchoice - -config CONSOLE_SERIAL_UART_ADDRESS - hex - depends on CONSOLE_SERIAL - default 0x44e09000 if CONSOLE_SERIAL_UART0 - default 0x48022000 if CONSOLE_SERIAL_UART1 - default 0x48024000 if CONSOLE_SERIAL_UART2 - default 0x481a6000 if CONSOLE_SERIAL_UART3 - default 0x481a8000 if CONSOLE_SERIAL_UART4 - default 0x481aa000 if CONSOLE_SERIAL_UART5 - help - Map the UART names to the respective MMIO address. +config CONSOLE_PORT + int + default 0
################################################################# # stuff from smdk5250.h #