summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-02-23 10:02:29 +0100
committerTom Rini <trini@konsulko.com>2016-02-25 19:06:37 -0500
commit636ac181fa66c45a0761d89f711ae52f68dce095 (patch)
tree05a3f2f9bb7a80a1fbc3f071bac107c2852a9eb5 /include
parent966bfa7347ba2d1bc938988abca8ed3f65f8e57a (diff)
downloadtalos-obmc-uboot-636ac181fa66c45a0761d89f711ae52f68dce095.tar.gz
talos-obmc-uboot-636ac181fa66c45a0761d89f711ae52f68dce095.zip
ARM: zynq: zynqmp: Enable DCC serial driver by default
Compile DCC serial driver by default. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/xilinx_zynqmp.h9
-rw-r--r--include/configs/zynq-common.h8
2 files changed, 5 insertions, 12 deletions
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index da868b8237..1121ea46ec 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -53,12 +53,9 @@
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x2000000)
/* Serial setup */
-#if defined(CONFIG_ZYNQMP_DCC)
-# define CONFIG_ARM_DCC
-# define CONFIG_CPU_ARMV8
-#else
-# define CONFIG_ZYNQ_SERIAL
-#endif
+#define CONFIG_ARM_DCC
+#define CONFIG_CPU_ARMV8
+#define CONFIG_ZYNQ_SERIAL
#define CONFIG_CONS_INDEX 0
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 4a81d41d0f..982905debd 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -36,12 +36,8 @@
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
-/* DCC driver */
-#if defined(CONFIG_ZYNQ_DCC)
-# define CONFIG_ARM_DCC
-#else
-# define CONFIG_ZYNQ_SERIAL
-#endif
+#define CONFIG_ARM_DCC
+#define CONFIG_ZYNQ_SERIAL
#define CONFIG_ZYNQ_GPIO
OpenPOWER on IntegriCloud