summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/logicpd/zoom2/zoom2_serial.c7
-rw-r--r--include/configs/omap3_zoom2.h2
-rw-r--r--include/serial.h7
3 files changed, 7 insertions, 9 deletions
diff --git a/board/logicpd/zoom2/zoom2_serial.c b/board/logicpd/zoom2/zoom2_serial.c
index 74f165f..9b7aea8 100644
--- a/board/logicpd/zoom2/zoom2_serial.c
+++ b/board/logicpd/zoom2/zoom2_serial.c
@@ -135,5 +135,10 @@ QUAD_INIT (3)
struct serial_device *default_serial_console(void)
{
- return ZOOM2_DEFAULT_SERIAL_DEVICE;
+ switch (ZOOM2_DEFAULT_SERIAL_DEVICE) {
+ case 0: return &zoom2_serial_device0;
+ case 1: return &zoom2_serial_device1;
+ case 2: return &zoom2_serial_device2;
+ case 3: return &zoom2_serial_device3;
+ }
}
diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index 4447dff..a7cc5fc 100644
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -81,7 +81,7 @@
* 0 - 1 : first USB with respect to the left edge of the debug board
* 2 - 3 : second USB with respect to the left edge of the debug board
*/
-#define ZOOM2_DEFAULT_SERIAL_DEVICE (&zoom2_serial_device0)
+#define ZOOM2_DEFAULT_SERIAL_DEVICE 0
#define V_NS16550_CLK (1843200) /* 1.8432 Mhz */
diff --git a/include/serial.h b/include/serial.h
index 5f9899e..01a86b4 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -39,13 +39,6 @@ extern struct serial_device serial1_device;
extern struct serial_device eserial1_device;
extern struct serial_device eserial2_device;
-#if defined(CONFIG_OMAP3_ZOOM2)
-extern struct serial_device zoom2_serial_device0;
-extern struct serial_device zoom2_serial_device1;
-extern struct serial_device zoom2_serial_device2;
-extern struct serial_device zoom2_serial_device3;
-#endif
-
extern void serial_register(struct serial_device *);
extern void serial_initialize(void);
extern void serial_stdio_init(void);