ColdFire: Fix the compile issue for M52277
After commit 327474f854
, 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>
This commit is contained in:
parent
e30a91ba0c
commit
27f7ae70d6
|
@ -32,9 +32,6 @@ SECTIONS
|
||||||
arch/m68k/cpu/mcf5227x/libmcf5227x.o (.text*)
|
arch/m68k/cpu/mcf5227x/libmcf5227x.o (.text*)
|
||||||
arch/m68k/lib/libm68k.o (.text*)
|
arch/m68k/lib/libm68k.o (.text*)
|
||||||
|
|
||||||
. = DEFINED(env_offset) ? env_offset : .;
|
|
||||||
common/env_embedded.o (.text*)
|
|
||||||
|
|
||||||
*(.text*)
|
*(.text*)
|
||||||
}
|
}
|
||||||
_etext = .;
|
_etext = .;
|
||||||
|
|
|
@ -246,7 +246,8 @@
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Configuration for environment
|
* 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
|
#ifdef CONFIG_CF_SBF
|
||||||
# define CONFIG_ENV_IS_IN_SPI_FLASH
|
# define CONFIG_ENV_IS_IN_SPI_FLASH
|
||||||
|
@ -261,6 +262,7 @@
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_SYS_STMICRO_BOOT
|
#ifdef CONFIG_SYS_STMICRO_BOOT
|
||||||
# define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
|
# 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_OFFSET 0x30000
|
||||||
# define CONFIG_ENV_SIZE 0x1000
|
# define CONFIG_ENV_SIZE 0x1000
|
||||||
# define CONFIG_ENV_SECT_SIZE 0x10000
|
# define CONFIG_ENV_SECT_SIZE 0x10000
|
||||||
|
@ -268,7 +270,7 @@
|
||||||
#ifdef CONFIG_SYS_SPANSION_BOOT
|
#ifdef CONFIG_SYS_SPANSION_BOOT
|
||||||
# define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
|
# define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
|
||||||
# define CONFIG_SYS_FLASH0_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_SIZE 0x1000
|
||||||
# define CONFIG_ENV_SECT_SIZE 0x8000
|
# define CONFIG_ENV_SECT_SIZE 0x8000
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue