summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrafulla Wadaskar <prafulla@marvell.com>2010-10-28 02:07:45 +0530
committerWolfgang Denk <wd@denx.de>2010-12-16 23:02:57 +0100
commita042ec33b7747b576d2a5247cba5ae7885b3db4e (patch)
tree28974957b81a9ef4fa7289a9e59d2cf35c7f3134
parenta160ea0b5ed6c7cfcdd61bc82313c1371888eeec (diff)
downloadu-boot-imx-a042ec33b7747b576d2a5247cba5ae7885b3db4e.zip
u-boot-imx-a042ec33b7747b576d2a5247cba5ae7885b3db4e.tar.gz
u-boot-imx-a042ec33b7747b576d2a5247cba5ae7885b3db4e.tar.bz2
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>
-rw-r--r--drivers/serial/serial.c5
1 files changed, 3 insertions, 2 deletions
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)