Merge branch 'master' of git://git.denx.de/u-boot-samsung

[oweals/u-boot.git] / drivers / serial / serial.c

diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 95c992a5a30d0493669598d533e20dac2332b2c6..f2bd0e404c730f3e79be2e1afd6e4cdf7b5c3f32 100644 (file)
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -109,8 +109,6 @@ U_BOOT_ENV_CALLBACK(baudrate, on_baudrate);
        void name(void)                                         \
                __attribute__((weak, alias("serial_null")));
 
-serial_initfunc(altera_jtag_serial_initialize);
-serial_initfunc(altera_serial_initialize);
 serial_initfunc(amirix_serial_initialize);
 serial_initfunc(arc_serial_initialize);
 serial_initfunc(arm_dcc_initialize);
@@ -127,7 +125,6 @@ serial_initfunc(evb64260_serial_initialize);
 serial_initfunc(imx_serial_initialize);
 serial_initfunc(iop480_serial_initialize);
 serial_initfunc(jz_serial_initialize);
-serial_initfunc(ks8695_serial_initialize);
 serial_initfunc(leon2_serial_initialize);
 serial_initfunc(leon3_serial_initialize);
 serial_initfunc(lh7a40x_serial_initialize);
@@ -136,7 +133,6 @@ serial_initfunc(marvell_serial_initialize);
 serial_initfunc(max3100_serial_initialize);
 serial_initfunc(mcf_serial_initialize);
 serial_initfunc(ml2_serial_initialize);
-serial_initfunc(mpc512x_serial_initialize);
 serial_initfunc(mpc5xx_serial_initialize);
 serial_initfunc(mpc8260_scc_serial_initialize);
 serial_initfunc(mpc8260_smc_serial_initialize);
@@ -155,6 +151,7 @@ serial_initfunc(sa1100_serial_initialize);
 serial_initfunc(sandbox_serial_initialize);
 serial_initfunc(sconsole_serial_initialize);
 serial_initfunc(sh_serial_initialize);
+serial_initfunc(stm32_serial_initialize);
 serial_initfunc(uartlite_serial_initialize);
 serial_initfunc(zynq_serial_initialize);
 
@@ -202,8 +199,6 @@ void serial_register(struct serial_device *dev)
  */
 void serial_initialize(void)
 {
-       altera_jtag_serial_initialize();
-       altera_serial_initialize();
        amirix_serial_initialize();
        arc_serial_initialize();
        arm_dcc_initialize();
@@ -220,7 +215,6 @@ void serial_initialize(void)
        imx_serial_initialize();
        iop480_serial_initialize();
        jz_serial_initialize();
-       ks8695_serial_initialize();
        leon2_serial_initialize();
        leon3_serial_initialize();
        lh7a40x_serial_initialize();
@@ -229,10 +223,6 @@ void serial_initialize(void)
        max3100_serial_initialize();
        mcf_serial_initialize();
        ml2_serial_initialize();
-       mpc512x_serial_initialize();
-       mpc5xx_serial_initialize();
-       mpc8260_scc_serial_initialize();
-       mpc8260_smc_serial_initialize();
        mpc85xx_serial_initialize();
        mpc8xx_serial_initialize();
        mxc_serial_initialize();
@@ -248,6 +238,7 @@ void serial_initialize(void)
        sandbox_serial_initialize();
        sconsole_serial_initialize();
        sh_serial_initialize();
+       stm32_serial_initialize();
        uartlite_serial_initialize();
        zynq_serial_initialize();
 
@@ -531,7 +522,7 @@ static const int bauds[] = CONFIG_SYS_BAUDRATE_TABLE;
  *
  * Do a loopback test of the currently selected serial port. This
  * function is only useful in the context of the POST testing framwork.
- * The serial port is firstly configured into loopback mode and then
+ * The serial port is first configured into loopback mode and then
  * characters are sent through it.
  *
  * Returns 0 on success, value otherwise.