Merge branch 'master' of /home/wd/git/u-boot/master

diff --combined include/configs/devkit8000.h
index c47e17c,fb81c64..fa7a6c7
--- 1/include/configs/devkit8000.h
--- 2/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@@ -38,8 -38,6 +38,8 @@@
  #define CONFIG_OMAP3430               1       /* which is in a 3430 */
  #define CONFIG_OMAP3_DEVKIT8000       1       /* working with DevKit8000 */
  
 +#define       CONFIG_SYS_TEXT_BASE    0x80008000
 +
  #define CONFIG_SDRC   /* The chip has SDRC controller */
  
  #include <asm/arch/cpu.h>             /* get chip and board defs */
@@@ -65,7 -63,6 +65,6 @@@
  #define CONFIG_ENV_SIZE                       (128 << 10)     /* 128 KiB */
                                                /* Sector */
  #define CONFIG_SYS_MALLOC_LEN         (CONFIG_ENV_SIZE + (128 << 10))
- #define CONFIG_SYS_GBL_DATA_SIZE      128     /* bytes reserved for */
                                                /* initial data */
  
  /* Hardware drivers */
@@@ -308,7 -305,4 +307,7 @@@ extern unsigned int boot_flash_sec
  extern unsigned int boot_flash_type;
  #endif
  
 +#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 +#define CONFIG_SYS_INIT_SP_ADDR        (LOW_LEVEL_SRAM_STACK - CONFIG_SYS_GBL_DATA_SIZE)
 +
  #endif /* __CONFIG_H */