summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-05 11:15:26 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-05 11:15:26 +0200
commit19d829fa60fc4e6df514a046142faaaf9fc8185d (patch)
tree295c75b0d9f3c7180f23ec131442286cf91db5b1 /include/configs
parente62d5fb0da76ef168e90cae9bbbda80349aaf137 (diff)
parent8467faef7fce8c5faad7224b7737a58e16c52186 (diff)
downloadu-boot-imx-19d829fa60fc4e6df514a046142faaaf9fc8185d.zip
u-boot-imx-19d829fa60fc4e6df514a046142faaaf9fc8185d.tar.gz
u-boot-imx-19d829fa60fc4e6df514a046142faaaf9fc8185d.tar.bz2
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts: drivers/serial/serial.c The conflict above was a trivial case of adding one init function in each branch, and manually resolved in merge.
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/mxs.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index a684166..124dc1e 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -119,11 +119,16 @@
/* GPIO */
#define CONFIG_MXS_GPIO
-/* DUART Serial Driver */
+/*
+ * DUART Serial Driver.
+ * Conflicts with AUART driver which can be set by board.
+ */
+#ifndef CONFIG_MXS_AUART
#define CONFIG_PL011_SERIAL
#define CONFIG_PL011_CLOCK 24000000
#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE }
#define CONFIG_CONS_INDEX 0
+#endif
/* Default baudrate can be overriden by board! */
#ifndef CONFIG_BAUDRATE
#define CONFIG_BAUDRATE 115200