From: Harald Krapfenbauer <harald.krapfenba...@bluetechnix.com>
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.krapfenba...@bluetechnix.com>
Signed-off-by: Mike Frysinger <vap...@gentoo.org>
---
include/configs/cm-bf537e.h | 11 +++++------
include/configs/cm-bf537u.h | 11 +++++------
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 7040567..9649e18 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -99,13 +99,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
@@ -145,7 +144,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 5dca810..84846ef 100644
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -97,13 +97,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
@@ -142,7 +141,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 dc16f2e..2375fc5 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -99,13 +99,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
@@ -144,7 +143,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"
--
1.7.5.rc3
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
