microblaze: Enable uart16550 DM by default

Microblaze is uses uartlite or uart16550 as console drivers.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index dc4ac0558c272143166ad77b704b7155a25ee1bf..0947c46e4e19ce346ef9d6de4c7f7b58f2d47bc4 100644 (file)
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -10,4 +10,5 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_SYS_NS16550=y
 CONFIG_XILINX_UARTLITE=y

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 6e3c80b1435014a7c424112fcb71e091d786b8cf..19d5506f4e1fddfa0cbcd18f91c9d89c4deebda0 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -37,19 +37,6 @@
 # define CONFIG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-#if XILINX_UART16550_BASEADDR
-# define CONFIG_SYS_NS16550_SERIAL
-# if defined(__MICROBLAZEEL__)
-#  define CONFIG_SYS_NS16550_REG_SIZE  -4
-# else
-#  define CONFIG_SYS_NS16550_REG_SIZE  4
-# endif
-# define CONFIG_CONS_INDEX             1
-# define CONFIG_SYS_NS16550_COM1 \
-               ((XILINX_UART16550_BASEADDR & ~0xF) + 0x1000)
-# define CONFIG_SYS_NS16550_CLK        XILINX_UART16550_CLOCK_HZ
-#endif
-
 /* setting reset address */
 /*#define      CONFIG_SYS_RESET_ADDRESS        CONFIG_SYS_TEXT_BASE*/