Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings

The recent commit ea882baf9c broke embedding environments in the middle
of a sector, so relocate it to the start of the 2nd sector.

Signed-off-by: Harald Krapfenbauer <harald.krapfenbauer@bluetechnix.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Harald Krapfenbauer 2011-05-17 15:45:36 -04:00 committed by Mike Frysinger
parent acf04b3059
commit ba5c122846
3 changed files with 15 additions and 18 deletions

View file

@ -89,13 +89,12 @@
* Env Storage Settings * Env Storage Settings
*/ */
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_OFFSET 0x8000
#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_SECT_SIZE 0x8000
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS) #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
#define ENV_IS_EMBEDDED #define ENV_IS_EMBEDDED
#else
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#endif #endif
#ifdef ENV_IS_EMBEDDED #ifdef ENV_IS_EMBEDDED
/* WARNING - the following is hand-optimized to fit within /* WARNING - the following is hand-optimized to fit within
@ -127,7 +126,7 @@
#define CONFIG_UART_CONSOLE 0 #define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run flashboot" #define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS \ #define FLASHBOOT_ENV_SETTINGS \
"flashboot=flread 20040000 1000000 300000;" \ "flashboot=flread 20040000 1000000 3c0000;" \
"bootm 0x1000000\0" "bootm 0x1000000\0"

View file

@ -90,13 +90,12 @@
* Env Storage Settings * Env Storage Settings
*/ */
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_OFFSET 0x8000
#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_SECT_SIZE 0x8000
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS) #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
#define ENV_IS_EMBEDDED #define ENV_IS_EMBEDDED
#else
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#endif #endif
#ifdef ENV_IS_EMBEDDED #ifdef ENV_IS_EMBEDDED
/* WARNING - the following is hand-optimized to fit within /* WARNING - the following is hand-optimized to fit within
@ -128,7 +127,7 @@
#define CONFIG_UART_CONSOLE 0 #define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run flashboot" #define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS \ #define FLASHBOOT_ENV_SETTINGS \
"flashboot=flread 20040000 1000000 280000;" \ "flashboot=flread 20040000 1000000 300000;" \
"bootm 0x1000000\0" "bootm 0x1000000\0"

View file

@ -90,13 +90,12 @@
* Env Storage Settings * Env Storage Settings
*/ */
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_OFFSET 0x8000
#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SIZE 0x8000
#define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x8000
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS) #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
#define ENV_IS_EMBEDDED #define ENV_IS_EMBEDDED
#else
#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
#endif #endif
#ifdef ENV_IS_EMBEDDED #ifdef ENV_IS_EMBEDDED
/* WARNING - the following is hand-optimized to fit within /* WARNING - the following is hand-optimized to fit within
@ -128,7 +127,7 @@
#define CONFIG_UART_CONSOLE 0 #define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run flashboot" #define CONFIG_BOOTCOMMAND "run flashboot"
#define FLASHBOOT_ENV_SETTINGS \ #define FLASHBOOT_ENV_SETTINGS \
"flashboot=flread 20040000 1000000 280000;" \ "flashboot=flread 20040000 1000000 300000;" \
"bootm 0x1000000\0" "bootm 0x1000000\0"