ColdFire:Update the env settings for several boards.
Move the environment outside the u-boot for some boards and enlarge the u-boot size in some env settings. Signed-off-by: Jason Jin <Jason.jin@freescale.com>
This commit is contained in:
Jason Jin
jason
parent
90fa92dc08
commit
09933fb0ba
@ -124,8 +124,8 @@
|
||||
"u-boot=u-boot.bin\0" \
|
||||
"load=tftp ${loadaddr) ${u-boot}\0" \
|
||||
"upd=run load; run prog\0" \
|
||||
"prog=prot off 0 2ffff;" \
|
||||
"era 0 2ffff;" \
|
||||
"prog=prot off 0 3ffff;" \
|
||||
"era 0 3ffff;" \
|
||||
"cp.b ${loadaddr} 0 ${filesize};" \
|
||||
"save\0" \
|
||||
""
|
||||
|
||||
@ -124,8 +124,8 @@
|
||||
"u-boot=u-boot.bin\0" \
|
||||
"load=tftp ${loadaddr) ${u-boot}\0" \
|
||||
"upd=run load; run prog\0" \
|
||||
"prog=prot off 0 2ffff;" \
|
||||
"era 0 2ffff;" \
|
||||
"prog=prot off 0 3ffff;" \
|
||||
"era 0 3ffff;" \
|
||||
"cp.b ${loadaddr} 0 ${filesize};" \
|
||||
"save\0" \
|
||||
""
|
||||
|
||||
@ -127,7 +127,7 @@
|
||||
"load=tftp ${loadaddr} ${sbfhdr};" \
|
||||
"tftp " MK_STR(CONFIG_SYS_LOAD_ADDR2) " ${uboot} \0" \
|
||||
"upd=run load; run prog\0" \
|
||||
"prog=sf probe 0:1 10000 1;" \
|
||||
"prog=sf probe 0:1 1000000 3;" \
|
||||
"sf erase 0 30000;" \
|
||||
"sf write ${loadaddr} 0 30000;" \
|
||||
"save\0" \
|
||||
@ -244,14 +244,16 @@
|
||||
#define CONFIG_SYS_MEMTEST_END ((CONFIG_SYS_SDRAM_SIZE - 3) << 20)
|
||||
|
||||
#ifdef CONFIG_CF_SBF
|
||||
# define CONFIG_SERIAL_BOOT
|
||||
# define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x400)
|
||||
#else
|
||||
# define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400)
|
||||
#endif
|
||||
#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
|
||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
|
||||
#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
|
||||
@ -261,7 +263,8 @@
|
||||
#define CONFIG_SYS_BOOTMAPSZ (CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
|
||||
|
||||
/* 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.
|
||||
*/
|
||||
#if defined(CONFIG_SYS_STMICRO_BOOT)
|
||||
# define CONFIG_ENV_IS_IN_SPI_FLASH 1
|
||||
@ -271,9 +274,9 @@
|
||||
# define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
#else
|
||||
# define CONFIG_ENV_IS_IN_FLASH 1
|
||||
# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x8000)
|
||||
# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000)
|
||||
# define CONFIG_ENV_SIZE 0x2000
|
||||
# define CONFIG_ENV_SECT_SIZE 0x8000
|
||||
# define CONFIG_ENV_SECT_SIZE 0x20000
|
||||
#endif
|
||||
#undef CONFIG_ENV_OVERWRITE
|
||||
|
||||
|
||||
@ -134,7 +134,7 @@
|
||||
"load=tftp ${loadaddr} ${sbfhdr};" \
|
||||
"tftp " MK_STR(CONFIG_SYS_LOAD_ADDR2) " ${uboot} \0" \
|
||||
"upd=run load; run prog\0" \
|
||||
"prog=sf probe 0:1 10000 1;" \
|
||||
"prog=sf probe 0:1 1000000 3;" \
|
||||
"sf erase 0 30000;" \
|
||||
"sf write ${loadaddr} 0 0x30000;" \
|
||||
"save\0" \
|
||||
@ -304,13 +304,16 @@
|
||||
#define CONFIG_SYS_MEMTEST_END ((CONFIG_SYS_SDRAM_SIZE - 3) << 20)
|
||||
|
||||
#ifdef CONFIG_CF_SBF
|
||||
# define CONFIG_SERIAL_BOOT
|
||||
# define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x400)
|
||||
#else
|
||||
# define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400)
|
||||
#endif
|
||||
#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
|
||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
|
||||
#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
|
||||
@ -322,7 +325,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
|
||||
@ -346,8 +350,9 @@
|
||||
# define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
|
||||
# define CONFIG_SYS_FLASH0_BASE CONFIG_SYS_CS0_BASE
|
||||
# define CONFIG_SYS_FLASH1_BASE CONFIG_SYS_CS1_BASE
|
||||
# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x4000)
|
||||
# define CONFIG_ENV_SECT_SIZE 0x2000
|
||||
# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000)
|
||||
# define CONFIG_ENV_SIZE 0x2000
|
||||
# define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
#endif
|
||||
#ifdef CONFIG_SYS_INTEL_BOOT
|
||||
# define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
|
||||
|
||||
@ -171,7 +171,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" \
|
||||
""
|
||||
@ -243,8 +243,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
|
||||
@ -274,10 +275,12 @@
|
||||
#endif
|
||||
|
||||
/* Configuration for environment
|
||||
* Environment is embedded in u-boot in the second sector of the flash
|
||||
* Environment is not embedded in u-boot but at offset 0x40000 on the flash.
|
||||
* 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
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
|
||||
@ -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
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
|
||||
Loading…
Reference in New Issue
Block a user