| Message ID | 1291741587-12484-5-git-send-email-prafulla@marvell.com |
|---|---|
| State | Accepted |
| Delegated to: | Prafulla Wadaskar |
| Headers | show |
> -----Original Message----- > From: Prafulla Wadaskar [mailto:prafulla@marvell.com] > Sent: Tuesday, December 07, 2010 10:36 PM > To: u-boot@lists.denx.de > Cc: Lei Wen; Eric Miao; Yu Tang; Kiran Vedere; Manas Saksena; Prabhanjan > Sarnaik; Ashish Karkare; Prafulla Wadaskar; Mahavir Jain > Subject: [PATCH v4 5/7] Serial: Add UART support for Marvell ARMADA 100 > SoCs. > > ARMADA 100 SoCs has NS16550 compatible UART peripheral > This patch enables the same for ARMADA100 platforms > > Signed-off-by: Mahavir Jain <mjain@marvell.com> > Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> > --- > Change log for v2: > defined CONFIG_SYS_NS16550_IER macro in Soc heder file > Change log for v3: > Removed reordiring of header files, the diff is only > limited to include armada100.h > > drivers/serial/serial.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > Applied to u-boot-marvell.git master branch Regards.. Prafulla ..
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 1073ac0..cd3439e 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -29,9 +29,10 @@ #endif #ifdef CONFIG_KIRKWOOD #include <asm/arch/kirkwood.h> -#endif -#ifdef CONFIG_ORION5X +#elif defined(CONFIG_ORION5X) #include <asm/arch/orion5x.h> +#elif defined(CONFIG_ARMADA100) +#include <asm/arch/armada100.h> #endif #if defined (CONFIG_SERIAL_MULTI)