projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPI: mxc_spi: fix swapping bug and add missing swapping in unaligned rx case
[oweals/u-boot.git]
/
drivers
/
serial
/
serial.c
diff --git
a/drivers/serial/serial.c
b/drivers/serial/serial.c
index bce75489d2ecdf55442af084c1a7174ebee38104..cd3439ee6a23d9b54089396d244e070dbf795ee6 100644
(file)
--- a/
drivers/serial/serial.c
+++ b/
drivers/serial/serial.c
@@
-23,12
+23,17
@@
#include <common.h>
#include <common.h>
-#ifdef CONFIG_SYS_NS16550_SERIAL
-
#include <ns16550.h>
#ifdef CONFIG_NS87308
#include <ns87308.h>
#endif
#include <ns16550.h>
#ifdef CONFIG_NS87308
#include <ns87308.h>
#endif
+#ifdef CONFIG_KIRKWOOD
+#include <asm/arch/kirkwood.h>
+#elif defined(CONFIG_ORION5X)
+#include <asm/arch/orion5x.h>
+#elif defined(CONFIG_ARMADA100)
+#include <asm/arch/armada100.h>
+#endif
#if defined (CONFIG_SERIAL_MULTI)
#include <serial.h>
#if defined (CONFIG_SERIAL_MULTI)
#include <serial.h>
@@
-114,6
+119,7
@@
static NS16550_t serial_ports[4] = {
name,\
bus,\
eserial##port##_init,\
name,\
bus,\
eserial##port##_init,\
+ NULL,\
eserial##port##_setbrg,\
eserial##port##_getc,\
eserial##port##_tstc,\
eserial##port##_setbrg,\
eserial##port##_getc,\
eserial##port##_tstc,\
@@
-328,5
+334,3
@@
DECLARE_ESERIAL_FUNCTIONS(4);
struct serial_device eserial4_device =
INIT_ESERIAL_STRUCTURE(4,"eserial3","EUART4");
#endif /* CONFIG_SERIAL_MULTI */
struct serial_device eserial4_device =
INIT_ESERIAL_STRUCTURE(4,"eserial3","EUART4");
#endif /* CONFIG_SERIAL_MULTI */
-
-#endif