From: John Linn <john.linn@xilinx.com>
Date: Wed, 6 Jun 2012 20:16:03 +0000 (-0700)
Subject: Merge branch 'master-next'
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34626362332b7fd2d67c3d03e35073f1714c3047;p=thirdparty%2Fu-boot.git

Merge branch 'master-next'
---

34626362332b7fd2d67c3d03e35073f1714c3047
diff --cc include/configs/zynq_zed.h
index a29d6bcf326,d8e6525c624..5e4fa87ab37
--- a/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