Patchwork [U-Boot,v3,rebase,5/8] arm/km: add second serial interface for kirkwood

login
register
mail settings
Submitter Valentin Longchamp
Date May 31, 2011, 12:12 p.m.
Message ID <bc5920cdbb48a34cd1c851f89ff2e62904979487.1306843521.git.valentin.longchamp@keymile.com>
Download mbox | patch
Permalink /patch/98023/
State Accepted
Commit 3d3c70969762282eaf470e0e6e467dd5c733b075
Delegated to: Albert ARIBAUD
Headers show

Comments

Valentin Longchamp - May 31, 2011, 12:12 p.m.
From: Holger Brunck <holger.brunck@keymile.com>

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>
---
 include/configs/km/km_arm.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

Patch

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 9c704fc..20ee6ea 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