Merge branch 'u-boot/master' into 'u-boot-arm/master'

diff --combined include/configs/zynq-common.h
index a7c6dce1c4f2c77a227cd199b4324fb408d76e35,b83e037f6f595bf56ea44f6eaf8ffc52e1d48ae2..926b381580654d8c6144609da3174d3dff75695b
--- 1/include/configs/zynq-common.h
--- 2/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@@ -34,10 -34,14 +34,13 @@@
  /* 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
  
+ #define CONFIG_ZYNQ_GPIO
+ #define CONFIG_CMD_GPIO
+ 
  /* Ethernet driver */
  #if defined(CONFIG_ZYNQ_GEM0) || defined(CONFIG_ZYNQ_GEM1)
  # define CONFIG_NET_MULTI
@@@ -290,7 -294,7 +293,7 @@@
  # define CONFIG_SYS_MMC_MAX_DEVICE    1
  #endif
  
- #define CONFIG_SYS_LDSCRIPT  "arch/arm/cpu/armv7/zynq/u-boot.lds"
+ #define CONFIG_SYS_LDSCRIPT  "arch/arm/mach-zynq/u-boot.lds"
  
  /* Commands */
  #include <config_cmd_default.h>
@@@ -308,7 -312,7 +311,7 @@@
  #define CONFIG_SPL_SERIAL_SUPPORT
  #define CONFIG_SPL_BOARD_INIT
  
- #define CONFIG_SPL_LDSCRIPT   "arch/arm/cpu/armv7/zynq/u-boot-spl.lds"
+ #define CONFIG_SPL_LDSCRIPT   "arch/arm/mach-zynq/u-boot-spl.lds"
  
  /* MMC support */
  #ifdef CONFIG_ZYNQ_SDHCI0