summaryrefslogtreecommitdiffstats
path: root/include/configs
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2013-12-19 23:38:58 +0530
committerMichal Simek <michal.simek@xilinx.com>2014-02-19 09:41:21 +0100
commitbf83495040fcf273eba534f7c2c0cb2325d2240c (patch)
tree2b1a57422a586b1aecbaa8d11aedea28e631a6ec /include/configs
parent627981213ad1693591a03614d35ccdc060aa5935 (diff)
downloadu-boot-bf83495040fcf273eba534f7c2c0cb2325d2240c.tar.gz
u-boot-bf83495040fcf273eba534f7c2c0cb2325d2240c.tar.xz
u-boot-bf83495040fcf273eba534f7c2c0cb2325d2240c.zip
zynq: serial: Simplify serial driver initialization
Define both serial uarts in the driver and return default uart based on board configuration. - Move baseaddresses to hardware.h - Define default baudrate and clock values Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/zynq-common.h19
1 files changed, 2 insertions, 17 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index bafa01b2e3..b5bf7acadf 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -35,27 +35,12 @@
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
-/* Zynq Serial driver */
-#ifdef CONFIG_ZYNQ_SERIAL_UART0
-# define CONFIG_ZYNQ_SERIAL_BASEADDR0 0xE0000000
-# define CONFIG_ZYNQ_SERIAL_BAUDRATE0 CONFIG_BAUDRATE
-# define CONFIG_ZYNQ_SERIAL_CLOCK0 50000000
-#endif
-
-#ifdef CONFIG_ZYNQ_SERIAL_UART1
-# define CONFIG_ZYNQ_SERIAL_BASEADDR1 0xE0001000
-# define CONFIG_ZYNQ_SERIAL_BAUDRATE1 CONFIG_BAUDRATE
-# define CONFIG_ZYNQ_SERIAL_CLOCK1 50000000
-#endif
-
-#if defined(CONFIG_ZYNQ_SERIAL_UART0) || defined(CONFIG_ZYNQ_SERIAL_UART1)
-# define CONFIG_ZYNQ_SERIAL
-#endif
-
/* DCC driver */
#if defined(CONFIG_ZYNQ_DCC)
# define CONFIG_ARM_DCC
# define CONFIG_CPU_V6 /* Required by CONFIG_ARM_DCC */
+#else
+# define CONFIG_ZYNQ_SERIAL
#endif
/* Ethernet driver */