From: Holger Brunck <holger.brunck@keymile.com>
Date: Tue, 31 May 2011 02:12:49 +0000 (+0000)
Subject: arm/km: add second serial interface for kirkwood
X-Git-Tag: v2011.06-rc2~7^2^2~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3d3c70969762282eaf470e0e6e467dd5c733b075;p=oweals%2Fu-boot.git

arm/km: add second serial interface for kirkwood

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Acked-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Detlev Zundel <dzu@denx.de>
cc: Prafulla Wadaskar <prafulla@marvell.com>
---

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 9c704fc5ed..20ee6eab85 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -91,6 +91,7 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_TCLK
 #define CONFIG_SYS_NS16550_COM1		KW_UART0_BASE
+#define CONFIG_SYS_NS16550_COM2		KW_UART1_BASE
 
 /*
  * Serial Port configuration
@@ -135,7 +136,12 @@
 
 #define BOOTFLASH_START		0x0
 
+/* Kirkwood has two serial IF */
+#if (CONFIG_CONS_INDEX == 2)
+#define CONFIG_KM_CONSOLE_TTY	"ttyS1"
+#else
 #define CONFIG_KM_CONSOLE_TTY	"ttyS0"
+#endif
 
 /*
  * Other required minimal configurations