2 files changed, 15 insertions, 45 deletions

diff --git a/src/cpu/samsung/exynos5420/Kconfig b/src/cpu/samsung/exynos5420/Kconfig
index 5f78cc5d92..e46d8893e8 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 UART_FOR_CONSOLE
+	int
+	default 3
 
 endif
diff --git a/src/cpu/samsung/exynos5420/uart.c b/src/cpu/samsung/exynos5420/uart.c
index 290eb35a8d..8fd4dea61f 100644
--- a/src/cpu/samsung/exynos5420/uart.c
+++ b/src/cpu/samsung/exynos5420/uart.c
@@ -149,28 +149,31 @@ 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;
+	if (idx < 4)
+		return 0x12c00000 + idx * 0x10000;
+	else
+		return 0;
 }
 
-void uart_init(void)
+void uart_init(int idx)
 {
-	struct s5p_uart *uart = uart_platform_baseptr(0);
+	struct s5p_uart *uart = uart_platform_baseptr(idx);
 	exynos5_init_dev(uart);
 }
 
-unsigned char uart_rx_byte(void)
+unsigned char uart_rx_byte(int idx)
 {
-	struct s5p_uart *uart = uart_platform_baseptr(0);
+	struct s5p_uart *uart = uart_platform_baseptr(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 = uart_platform_baseptr(0);
+	struct s5p_uart *uart = uart_platform_baseptr(idx);
 	exynos5_uart_tx_byte(uart, data);
 }
 
-void uart_tx_flush(void)
+void uart_tx_flush(int idx)
 {
 	/* Exynos5250 implements this too. */
 }
@@ -180,7 +183,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_UART_FOR_CONSOLE);
 	serial.baud = default_baudrate();
 	lb_add_serial(&serial, data);