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

2015-05-05 07:00:11 -04:00
parent 622da1c36a b939689c7b
commit 3f2f1a0039
8 changed files with 113 additions and 13 deletions
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -34,7 +34,6 @@
 /* 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