From: Wolfgang Denk <wd@denx.de>
Date: Mon, 9 Jul 2007 21:41:45 +0000 (+0200)
Subject: Merge with /home/hs/Atronic/u-boot
X-Git-Tag: v1.3.0-rc1~42^2~1
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=bf6a9ca9b2aa219612c3678444b8123e28aa8940

Merge with /home/hs/Atronic/u-boot
---

bf6a9ca9b2aa219612c3678444b8123e28aa8940
diff --cc include/configs/pcs440ep.h
index 751b51277c,c2b5cb8f9f..0e83e4881a
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@@ -104,9 -103,11 +104,11 @@@
  #define CFG_FLASH_EMPTY_INFO		/* print 'E' for empty sector on flinfo */
  
  #ifdef CFG_ENV_IS_IN_FLASH
 -#define CFG_ENV_SECT_SIZE	0x10000 	/* size of one complete sector	*/
 +#define CFG_ENV_SECT_SIZE	0x10000	/* size of one complete sector		*/
  #define CFG_ENV_ADDR		(CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
- #define	CFG_ENV_SIZE		0x2000	/* Total Size of Environment Sector	*/
+ #define CFG_ENV_SIZE		0x2000	/* Total Size of Environment Sector	*/
+ 
+ #define CONFIG_ENV_OVERWRITE	1
  
  /* Address and size of Redundant Environment Sector	*/
  #define CFG_ENV_ADDR_REDUND	(CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)