serial: mpc512x: Move serial registration from serial_initialize()

[karo-tx-uboot.git] / common / serial.c

diff --git a/common/serial.c b/common/serial.c
index 7423920b9316ca43b693a493361edef186ba9783..2ede80eb983ae3149d0879d21acfa7ccd64427ea 100644 (file)
--- a/common/serial.c
+++ b/common/serial.c
@@ -40,6 +40,14 @@ static void serial_null(void)
        void name(void)                                         \
                __attribute__((weak, alias("serial_null")));
 
+serial_initfunc(mpc8xx_serial_initialize);
+serial_initfunc(pxa_serial_initialize);
+serial_initfunc(s3c24xx_serial_initialize);
+serial_initfunc(s5p_serial_initialize);
+serial_initfunc(zynq_serial_initalize);
+serial_initfunc(mpc512x_serial_initialize);
+serial_initfunc(uartlite_serial_initialize);
+
 void serial_register(struct serial_device *dev)
 {
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
@@ -57,14 +65,7 @@ void serial_register(struct serial_device *dev)
 
 void serial_initialize(void)
 {
-#if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2)
-       serial_register(&serial_smc_device);
-#endif
-#if    defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) || \
-       defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4)
-       serial_register(&serial_scc_device);
-#endif
-
+       mpc8xx_serial_initialize();
 #if defined(CONFIG_SYS_NS16550_SERIAL)
 #if defined(CONFIG_SYS_NS16550_COM1)
        serial_register(&eserial1_device);
@@ -79,65 +80,15 @@ 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
-#if defined(CONFIG_S3C2410)
-       serial_register(&s3c24xx_serial0_device);
-       serial_register(&s3c24xx_serial1_device);
-       serial_register(&s3c24xx_serial2_device);
-#endif
-#if defined(CONFIG_S5P)
-       serial_register(&s5p_serial0_device);
-       serial_register(&s5p_serial1_device);
-       serial_register(&s5p_serial2_device);
-       serial_register(&s5p_serial3_device);
-#endif
-#if defined(CONFIG_MPC512X)
-#if defined(CONFIG_SYS_PSC1)
-       serial_register(&serial1_device);
-#endif
-#if defined(CONFIG_SYS_PSC3)
-       serial_register(&serial3_device);
-#endif
-#if defined(CONFIG_SYS_PSC4)
-       serial_register(&serial4_device);
-#endif
-#if defined(CONFIG_SYS_PSC6)
-       serial_register(&serial6_device);
-#endif
-#endif
+       pxa_serial_initialize();
+       s3c24xx_serial_initialize();
+       s5p_serial_initialize();
+       mpc512x_serial_initialize();
 #if defined(CONFIG_SYS_BFIN_UART)
        serial_register_bfin_uart();
 #endif
-#if defined(CONFIG_XILINX_UARTLITE)
-# ifdef XILINX_UARTLITE_BASEADDR
-       serial_register(&uartlite_serial0_device);
-# endif /* XILINX_UARTLITE_BASEADDR */
-# ifdef XILINX_UARTLITE_BASEADDR1
-       serial_register(&uartlite_serial1_device);
-# endif /* XILINX_UARTLITE_BASEADDR1 */
-# ifdef XILINX_UARTLITE_BASEADDR2
-       serial_register(&uartlite_serial2_device);
-# endif /* XILINX_UARTLITE_BASEADDR2 */
-# ifdef XILINX_UARTLITE_BASEADDR3
-       serial_register(&uartlite_serial3_device);
-# endif /* XILINX_UARTLITE_BASEADDR3 */
-#endif /* CONFIG_XILINX_UARTLITE */
-#if defined(CONFIG_ZYNQ_SERIAL)
-# ifdef CONFIG_ZYNQ_SERIAL_BASEADDR0
-       serial_register(&uart_zynq_serial0_device);
-# endif
-# ifdef CONFIG_ZYNQ_SERIAL_BASEADDR1
-       serial_register(&uart_zynq_serial1_device);
-# endif
-#endif
+       uartlite_serial_initialize();
+       zynq_serial_initalize();
        serial_assign(default_serial_console()->name);
 }