Merge branch 'master-next'

diff --cc include/configs/zynq_zed.h
index a29d6bcf326a9d7157bc6b5487c1e8b0dcba094f,d8e6525c624ee485944e5d2fc448df2445c29804..5e4fa87ab37c2eff49e756607d9d3abb4590ed1b
--- 1/include/configs/zynq_zed.h
--- 2/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@@ -55,29 -49,14 +49,13 @@@
  
  #define CONFIG_TIMESTAMP      /* print image timestamp on bootm, etc */
  
- /* IPADDR, SERVERIP */
- /* Need I2C for RTC? */
+ #define CONFIG_PANIC_HANG /* For development/debugging */
  
- #define CONFIG_PANIC_HANG     1 /* For development/debugging */
- 
- #define CONFIG_AUTO_COMPLETE  1
- #define CONFIG_CMDLINE_EDITING        1
+ #define CONFIG_AUTO_COMPLETE
+ #define CONFIG_CMDLINE_EDITING
  
 -#undef CONFIG_SYS_PROMPT
  #define CONFIG_SYS_PROMPT     "zed-boot> "
  
- #undef CONFIG_SKIP_RELOCATE_UBOOT
- 
- /* Uncomment it if you don't want Flash */
- /*#define CONFIG_SYS_NO_FLASH */
- 
- #define CONFIG_SYS_SDRAM_BASE 0
- 
- #define CONFIG_L2_OFF
- 
- //#define CONFIG_PELE_INIT_GEM        //this is to initialize GEM at uboot start
- #define CONFIG_PELE_IP_ENV    //this is to set ipaddr, ethaddr and serverip env variables.
- 
- 
  #ifndef CONFIG_SYS_NO_FLASH
  
  /* FLASH organization */
@@@ -196,8 -117,8 +116,7 @@@
  #endif
  #endif
  
--/* Secure Digital */
- #define CONFIG_MMC     1
+ #define CONFIG_MMC
  
  #ifdef CONFIG_MMC
  #define CONFIG_GENERIC_MMC