Merge branch 'master' of git://git.denx.de/u-boot-usb

[u-boot] / include / configs / zynq.h

diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index 34ac3ef3d1f90d2b732d57fe8ebb3a694a1fbea8..2989e723e04c6f5633aa80d978570a553096e06b 100644 (file)
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -45,7 +45,6 @@
 #define CONFIG_BAUDRATE                115200
 
 /* XPSS Serial driver */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_ZYNQ_SERIAL
 #define CONFIG_ZYNQ_SERIAL_BASEADDR0   0xE0001000
 #define CONFIG_ZYNQ_SERIAL_BAUDRATE0   CONFIG_BAUDRATE
@@ -59,6 +58,11 @@
 #define CONFIG_ZYNQ_GEM
 #define CONFIG_ZYNQ_GEM_BASEADDR0      0xE000B000
 
+#if defined(CONFIG_ZYNQ_DCC)
+# define CONFIG_ARM_DCC
+# define CONFIG_CPU_V6 /* Required by CONFIG_ARM_DCC */
+#endif
+
 #define CONFIG_BOOTP_SERVERIP
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_GATEWAY