From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 9 Dec 2015 11:42:16 +0000 (+0100)
Subject: microblaze: Move baudrate setting out driver selection
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=67659e2e94b6f8d3d1352a14c9262d79a1200252;p=u-boot.git

microblaze: Move baudrate setting out driver selection

Preparation of moving to DM. Uartlite ignores baudrate setting.

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

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 64248a8c61..10ac8328b8 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -32,11 +32,14 @@
 #endif
 
 /* uart */
+# define CONFIG_BAUDRATE	115200
+/* The following table includes the supported baudrates */
+# define CONFIG_SYS_BAUDRATE_TABLE \
+	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
+
 #ifdef XILINX_UARTLITE_BASEADDR
 # define CONFIG_XILINX_UARTLITE
 # define CONFIG_SERIAL_BASE	XILINX_UARTLITE_BASEADDR
-# define CONFIG_BAUDRATE	XILINX_UARTLITE_BAUDRATE
-# define CONFIG_SYS_BAUDRATE_TABLE	{ CONFIG_BAUDRATE }
 #elif XILINX_UART16550_BASEADDR
 # define CONFIG_SYS_NS16550_SERIAL
 # if defined(__MICROBLAZEEL__)
@@ -48,11 +51,6 @@
 # define CONFIG_SYS_NS16550_COM1 \
 		((XILINX_UART16550_BASEADDR & ~0xF) + 0x1000)
 # define CONFIG_SYS_NS16550_CLK	XILINX_UART16550_CLOCK_HZ
-# define CONFIG_BAUDRATE	115200
-
-/* The following table includes the supported baudrates */
-# define CONFIG_SYS_BAUDRATE_TABLE \
-	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 #else
 # error Undefined uart
 #endif