From: Mike Frysinger <vapier@gentoo.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 7/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings
Date: Mon, 23 May 2011 23:31:00 -0400 [thread overview]
Message-ID: <1306207860-5124-8-git-send-email-vapier@gentoo.org> (raw)
In-Reply-To: <1306207860-5124-1-git-send-email-vapier@gentoo.org>
From: Harald Krapfenbauer <harald.krapfenbauer@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.krapfenbauer@bluetechnix.com>
Signed-off-by: Mike Frysinger <vapier@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
next prev parent reply other threads:[~2011-05-24 3:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-24 3:30 [U-Boot] [PATCH 0/7] Blackfin fixes for 2011.06 Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 1/7] Blackfin: use common LDSCRIPT logic Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 2/7] Blackfin: use on-chip reset func with newer parts Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 3/7] Blackfin: bf548-ezkit/bf561-ezkit: update env location Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 4/7] Blackfin: boards: build zlib dir with -O2 Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 5/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings Mike Frysinger
2011-05-24 3:30 ` [U-Boot] [PATCH 6/7] Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support Mike Frysinger
2011-05-24 3:31 ` Mike Frysinger [this message]
2011-05-24 3:32 ` [U-Boot] Pull request u-boot-blackfin.git Mike Frysinger
2011-06-01 19:58 ` Wolfgang Denk
2011-06-02 15:02 ` Mike Frysinger
2011-06-02 20:46 ` Wolfgang Denk
2011-06-03 17:28 ` [U-Boot] Pull request u-boot-blackfin.git (v2) Mike Frysinger
2011-06-08 21:28 ` Wolfgang Denk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1306207860-5124-8-git-send-email-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.