| Message ID | 100c280fa8f152a5ff9406413f1d20feca70bdcb.1304523385.git.valentin.longchamp@keymile.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
> -----Original Message----- > From: Valentin Longchamp [mailto:valentin.longchamp@keymile.com] > Sent: Wednesday, May 04, 2011 9:24 PM > To: u-boot@lists.denx.de > Cc: holger.brunck@keymile.com; Prafulla Wadaskar; Valentin Longchamp; > Wolfgang Denk; Detlev Zundel > Subject: [PATCH v3 5/8] arm/km: add second serial interface for kirkwood > > 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> > --- > Changes for v2: > - split up first large patch series to three independent smaller > patch series > > include/configs/km_arm.h | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h > index d27a630..d2669d3 100644 > --- a/include/configs/km_arm.h > +++ b/include/configs/km_arm.h > @@ -92,6 +92,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 > @@ -136,7 +137,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 > > /* size in bytes reserved for initial data */ > Acked-By: Prafulla Wadaskar <Prafulla@marvell.com> Regards.. Prafulla . . .
diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h index d27a630..d2669d3 100644 --- a/include/configs/km_arm.h +++ b/include/configs/km_arm.h @@ -92,6 +92,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 @@ -136,7 +137,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 /* size in bytes reserved for initial data */