summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-12 13:57:58 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:49 -0700
commit1fe5c11045c128d36cdc9b68b7d1199aacc7b383 (patch)
tree4bbfed76ebefd0f4c4300c695ad88279139d0d3d
parent28af6385c7a9c5114b34094631944d09369c5e15 (diff)
downloadu-boot-imx-1fe5c11045c128d36cdc9b68b7d1199aacc7b383.zip
u-boot-imx-1fe5c11045c128d36cdc9b68b7d1199aacc7b383.tar.gz
u-boot-imx-1fe5c11045c128d36cdc9b68b7d1199aacc7b383.tar.bz2
serial: pxa: Move serial registration from serial_initialize()
Move the registration of serial_XXuart ports from default serial_initialize() into driver specific function called from serial_initialize(). This slims down the serial_initialize() call to a bare tracker of all possible serial port registration routines in U-Boot. The newly implemented pxa_serial_initialize() function, which is implemented inside of the serial_pxa driver allows encapsulation of serial_XXuart within the serial_pxa driver itself. Also, remove the exports of serial_XXuart from include/serial.h as they are no longer needed. This is simply because the implementation of default_serial_console() is wrapped into the serial_pxa driver and the default console is picked by CONFIG_CONS_IDX macro in config file. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com>
-rw-r--r--common/serial.c11
-rw-r--r--drivers/serial/serial_pxa.c13
-rw-r--r--include/serial.h4
3 files changed, 15 insertions, 13 deletions
diff --git a/common/serial.c b/common/serial.c
index 9e88f97..70f6261 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -41,6 +41,7 @@ static void serial_null(void)
__attribute__((weak, alias("serial_null")));
serial_initfunc(mpc8xx_serial_initialize);
+serial_initfunc(pxa_serial_initialize);
serial_initfunc(s3c24xx_serial_initialize);
void serial_register(struct serial_device *dev)
@@ -75,15 +76,7 @@ void serial_initialize(void)
serial_register(&eserial4_device);
#endif
#endif /* CONFIG_SYS_NS16550_SERIAL */
-#if defined(CONFIG_FFUART)
- serial_register(&serial_ffuart_device);
-#endif
-#if defined(CONFIG_BTUART)
- serial_register(&serial_btuart_device);
-#endif
-#if defined(CONFIG_STUART)
- serial_register(&serial_stuart_device);
-#endif
+ pxa_serial_initialize();
s3c24xx_serial_initialize();
#if defined(CONFIG_S5P)
serial_register(&s5p_serial0_device);
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index bd3b3cf..46d7689 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -314,4 +314,17 @@ __weak struct serial_device *default_serial_console(void)
#error "Bad CONFIG_CONS_INDEX."
#endif
}
+
+void pxa_serial_initialize(void)
+{
+#if defined(CONFIG_FFUART)
+ serial_register(&serial_ffuart_device);
+#endif
+#if defined(CONFIG_BTUART)
+ serial_register(&serial_btuart_device);
+#endif
+#if defined(CONFIG_STUART)
+ serial_register(&serial_stuart_device);
+#endif
+}
#endif
diff --git a/include/serial.h b/include/serial.h
index 4fac9af..10fce02 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -71,10 +71,6 @@ extern struct serial_device zoom2_serial_device2;
extern struct serial_device zoom2_serial_device3;
#endif
-extern struct serial_device serial_ffuart_device;
-extern struct serial_device serial_btuart_device;
-extern struct serial_device serial_stuart_device;
-
#if defined(CONFIG_SYS_BFIN_UART)
extern void serial_register_bfin_uart(void);
extern struct serial_device bfin_serial0_device;