diff options
author | Wolfgang Denk <wd@denx.de> | 2011-09-04 22:53:04 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-09-04 22:53:04 +0200 |
commit | 684cad5717ea5887a09f3c67732a17774a658b34 (patch) | |
tree | b9732b98c6ceba2095e57e0cc2fd002cbb1e026c /include/configs/M5485EVB.h | |
parent | 6dfbf49c6dc3687efbc6d7f9e25bb46ed2d6c833 (diff) | |
parent | 3f8ce93956fea1fe30db9ea81bc7db1deb401eea (diff) | |
download | u-boot-684cad5717ea5887a09f3c67732a17774a658b34.tar.gz |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
* 'master' of git://git.denx.de/u-boot-coldfire:
ColdFire:Clean up the CONFIG_STANDALONE_LOAD_ADDR usage
ColdFire:Add mb for 5253 dram initialization
ColdFire:Define the DM9000 byteswap for M5253 board.
ColdFire:Update the env settings for several boards.
ColdFire:disable the NFS define for 52277 board.
ColdFire:Update the timer_init since it was unified.
ColdFire: Cleanup for partial linking and --gc-sections
ColdFire: Update compile flags for each CPUs
ColdFire:Fix the configuration broken for some boards.
Diffstat (limited to 'include/configs/M5485EVB.h')
-rw-r--r-- | include/configs/M5485EVB.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index e178e35097..f3a295cb49 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -157,7 +157,7 @@ "load=tftp ${loadaddr) ${u-boot}\0" \ "upd=run load; run prog\0" \ "prog=prot off bank 1;" \ - "era ff800000 ff82ffff;" \ + "era ff800000 ff83ffff;" \ "cp.b ${loadaddr} ff800000 ${filesize};"\ "save\0" \ "" @@ -229,8 +229,9 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024 -#define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ +/* Reserve 256 kB for malloc() */ +#define CONFIG_SYS_MALLOC_LEN (256 << 10) /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is @@ -260,10 +261,11 @@ #endif /* 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. */ -#define CONFIG_ENV_OFFSET 0x2000 -#define CONFIG_ENV_SECT_SIZE 0x2000 +#define CONFIG_ENV_OFFSET 0x40000 +#define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_IS_IN_FLASH 1 /*----------------------------------------------------------------------- |