diff options
| author | Jason Jin <Jason.jin@freescale.com> | 2011-10-27 15:44:52 +0800 |
|---|---|---|
| committer | jason <jason@jason-ThinkPad-T61.(none)> | 2011-11-07 22:02:33 +0800 |
| commit | 27f7ae70d6c91e3ca309b1372c98a6c21245d559 (patch) | |
| tree | 1bbd3a32aaca5a067a6d55e0589126307a1edd69 | |
| parent | e30a91ba0cc7c80b766ba6b846bb3fb20368dc0a (diff) | |
| download | u-boot-27f7ae70d6c91e3ca309b1372c98a6c21245d559.tar.gz | |
ColdFire: Fix the compile issue for M52277
After commit 327474f854a33b5b7a11c374b0446d1d40d9f673, the
M52277EVB_stmicro configuration fail to build. Fix it by moving
the env outside the flash and update the lds file.
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| -rw-r--r-- | board/freescale/m52277evb/u-boot.lds | 3 | ||||
| -rw-r--r-- | include/configs/M52277EVB.h | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/board/freescale/m52277evb/u-boot.lds b/board/freescale/m52277evb/u-boot.lds index e7b22e3fc3..3e9f4c3460 100644 --- a/board/freescale/m52277evb/u-boot.lds +++ b/board/freescale/m52277evb/u-boot.lds @@ -32,9 +32,6 @@ SECTIONS arch/m68k/cpu/mcf5227x/libmcf5227x.o (.text*) arch/m68k/lib/libm68k.o (.text*) - . = DEFINED(env_offset) ? env_offset : .; - common/env_embedded.o (.text*) - *(.text*) } _etext = .; 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 |