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

diff --cc Makefile
Simple merge

diff --cc board/pcs440ep/pcs440ep.c
Simple merge

diff --cc cpu/ppc4xx/44x_spd_ddr.c
Simple merge

diff --cc cpu/ppc4xx/44x_spd_ddr2.c
Simple merge

diff --cc include/configs/pcs440ep.h
index 751b51277cefb885a768ceca2726842f39e32b96,c2b5cb8f9f598bf92d9a0d6fd4d5b4c501b36fcf..0e83e4881a421ed649b826051017ee6ad519e4ec
--- 1/include/configs/pcs440ep.h
--- 2/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)

diff --cc net/eth.c
Simple merge

diff --cc tools/Makefile
Simple merge