leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial: zoom2: Remove zoom2 serial prototypes from serial.h

Browse Source 
Remove the prototypes for zoom2_serial_deviceN from serial.h . This
can't be done right away, as they are referenced from the zoom2
config file. Therefore, adjust the code so the config file only
specifies number of the port. Then, replace the simple return in
default_serial_console() with a switch across possible values, which
returns the zoom2_serial_deviceN . With such adjustment in place,
the exported prototypes in serial.h can be safely removed.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
This commit is contained in:
Marek Vasut 2012-09-12 20:15:06 +02:00 committed by Tom Rini
parent 5ae1de0d49
commit 425101e115
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
board/logicpd/zoom2/zoom2_serial.c
View File

@ -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;
}
}

2
include/configs/omap3_zoom2.h
View File

@ -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 */

7
include/serial.h
View File

@ -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);