Merge tag 'mips-pull-2019-10-25' of git://git.denx.de/u-boot-mips

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

diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index c499601f000fef359f3176cd2dba5d87237c051a..bf5f39215d1df9521e270399fb69dea5450b7b3f 100644 (file)
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -5,7 +5,7 @@
  */
 
 #include <common.h>
-#include <environment.h>
+#include <env_internal.h>
 #include <serial.h>
 #include <stdio_dev.h>
 #include <post.h>
@@ -119,12 +119,12 @@ U_BOOT_ENV_CALLBACK(baudrate, on_baudrate);
 serial_initfunc(atmel_serial_initialize);
 serial_initfunc(mcf_serial_initialize);
 serial_initfunc(mpc85xx_serial_initialize);
-serial_initfunc(mpc8xx_serial_initialize);
 serial_initfunc(mxc_serial_initialize);
 serial_initfunc(ns16550_serial_initialize);
 serial_initfunc(pl01x_serial_initialize);
 serial_initfunc(pxa_serial_initialize);
 serial_initfunc(sh_serial_initialize);
+serial_initfunc(mtk_serial_initialize);
 
 /**
  * serial_register() - Register serial driver with serial driver core
@@ -173,12 +173,12 @@ void serial_initialize(void)
        atmel_serial_initialize();
        mcf_serial_initialize();
        mpc85xx_serial_initialize();
-       mpc8xx_serial_initialize();
        mxc_serial_initialize();
        ns16550_serial_initialize();
        pl01x_serial_initialize();
        pxa_serial_initialize();
        sh_serial_initialize();
+       mtk_serial_initialize();
 
        serial_assign(default_serial_console()->name);
 }