diff options
| author | Harald Krapfenbauer <harald.krapfenbauer@bluetechnix.com> | 2011-05-17 15:45:36 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-06-03 13:26:52 -0400 |
| commit | ba5c1228463c19395d1cf4b88d4bae7171fe6d98 (patch) | |
| tree | 63e62efc90b7284f25c908f5a9d60d3c9b0524fd | |
| parent | acf04b3059ec89b0b1132d8bf8cc28be18325b00 (diff) | |
| download | u-boot-imx-ba5c1228463c19395d1cf4b88d4bae7171fe6d98.zip u-boot-imx-ba5c1228463c19395d1cf4b88d4bae7171fe6d98.tar.gz u-boot-imx-ba5c1228463c19395d1cf4b88d4bae7171fe6d98.tar.bz2 | |
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings
The recent commit ea882baf9c1 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>
| -rw-r--r-- | include/configs/cm-bf537e.h | 11 | ||||
| -rw-r--r-- | include/configs/cm-bf537u.h | 11 | ||||
| -rw-r--r-- | include/configs/tcm-bf537.h | 11 |
3 files changed, 15 insertions, 18 deletions
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 934b74b..04bca6c 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -89,13 +89,12 @@ * Env Storage Settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_OFFSET 0x4000 -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_OFFSET 0x8000 +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_SECT_SIZE 0x8000 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS) #define ENV_IS_EMBEDDED -#else -#define CONFIG_ENV_IS_EMBEDDED_IN_LDR #endif #ifdef ENV_IS_EMBEDDED /* WARNING - the following is hand-optimized to fit within @@ -127,7 +126,7 @@ #define CONFIG_UART_CONSOLE 0 #define CONFIG_BOOTCOMMAND "run flashboot" #define FLASHBOOT_ENV_SETTINGS \ - "flashboot=flread 20040000 1000000 300000;" \ + "flashboot=flread 20040000 1000000 3c0000;" \ "bootm 0x1000000\0" diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index c274c20..af2fe89 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -90,13 +90,12 @@ * Env Storage Settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_OFFSET 0x4000 -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_OFFSET 0x8000 +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_SECT_SIZE 0x8000 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS) #define ENV_IS_EMBEDDED -#else -#define CONFIG_ENV_IS_EMBEDDED_IN_LDR #endif #ifdef ENV_IS_EMBEDDED /* WARNING - the following is hand-optimized to fit within @@ -128,7 +127,7 @@ #define CONFIG_UART_CONSOLE 0 #define CONFIG_BOOTCOMMAND "run flashboot" #define FLASHBOOT_ENV_SETTINGS \ - "flashboot=flread 20040000 1000000 280000;" \ + "flashboot=flread 20040000 1000000 300000;" \ "bootm 0x1000000\0" diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index 8ded175..9a6100e 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -90,13 +90,12 @@ * Env Storage Settings */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_OFFSET 0x4000 -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_SECT_SIZE 0x20000 +#define CONFIG_ENV_OFFSET 0x8000 +#define CONFIG_ENV_SIZE 0x8000 +#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) #define ENV_IS_EMBEDDED -#else -#define CONFIG_ENV_IS_EMBEDDED_IN_LDR #endif #ifdef ENV_IS_EMBEDDED /* WARNING - the following is hand-optimized to fit within @@ -128,7 +127,7 @@ #define CONFIG_UART_CONSOLE 0 #define CONFIG_BOOTCOMMAND "run flashboot" #define FLASHBOOT_ENV_SETTINGS \ - "flashboot=flread 20040000 1000000 280000;" \ + "flashboot=flread 20040000 1000000 300000;" \ "bootm 0x1000000\0" |