diff mbox

[U-Boot,1/5] microblaze: Enable uart16550 DM by default

Message ID 54b8f38158a20f8f00107273d157f859f969ca6b.1449835012.git.michal.simek@xilinx.com
State Accepted
Commit f0e353ce5538367aa4c61a60702723f32e7c5cfb
Delegated to: Michal Simek
Headers show

Commit Message

Michal Simek Dec. 11, 2015, 11:56 a.m. UTC 
Microblaze is uses uartlite or uart16550 as console drivers.

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

 configs/microblaze-generic_defconfig |  1 +
 include/configs/microblaze-generic.h | 13 -------------
 2 files changed, 1 insertion(+), 13 deletions(-)
diff mbox

Patch

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 9a7bb915466f..499848f9eca0 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -9,4 +9,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 6e3c80b14350..19d5506f4e1f 100644
--- 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*/