diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-08 00:37:27 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-08 00:37:27 +0100 |
| commit | 7ba6d591b5a6ec4ed502de7d94ff726bce13fe61 (patch) | |
| tree | bc671d9907e30d2fdf836fdc26de2f6572f0363e /include/configs | |
| parent | 36a9a15b7ab251b65a55a87a13d66b7d968e1d77 (diff) | |
| parent | f3aed65339ad9644517d4e1e401eb850962d8408 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
* 'master' of git://git.denx.de/u-boot-coldfire:
ColdFire: The EB+MCF-EV123 boards config update
ColdFire: Fix the compile issue for M52277
ColdFire:Moving the remaining coldfire boards to boards.cfg
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/M52277EVB.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 57225447fb..bfbb06c008 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -246,7 +246,8 @@ /* * Configuration for environment - * Environment is embedded in u-boot in the second sector of the flash + * Environment is not embedded in u-boot. First time runing may have env + * crc error warning if there is no correct environment on the flash. */ #ifdef CONFIG_CF_SBF # define CONFIG_ENV_IS_IN_SPI_FLASH @@ -261,6 +262,7 @@ */ #ifdef CONFIG_SYS_STMICRO_BOOT # define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE +# define CONFIG_SYS_FLASH0_BASE CONFIG_SYS_CS0_BASE # define CONFIG_ENV_OFFSET 0x30000 # define CONFIG_ENV_SIZE 0x1000 # define CONFIG_ENV_SECT_SIZE 0x10000 @@ -268,7 +270,7 @@ #ifdef CONFIG_SYS_SPANSION_BOOT # define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE # define CONFIG_SYS_FLASH0_BASE CONFIG_SYS_CS0_BASE -# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x8000) +# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000) # define CONFIG_ENV_SIZE 0x1000 # define CONFIG_ENV_SECT_SIZE 0x8000 #endif |