Patchwork [U-Boot,3/7] Blackfin: bf548-ezkit/bf561-ezkit: update env location

login
register
mail settings
Submitter Mike Frysinger
Date May 24, 2011, 3:30 a.m.
Message ID <1306207860-5124-4-git-send-email-vapier@gentoo.org>
Download mbox | patch
Permalink /patch/97117/
State Accepted
Commit 1b48f126d640d1262d53553bbc68a689b87564eb
Delegated to: Mike Frysinger
Headers show

Comments

Mike Frysinger - May 24, 2011, 3:30 a.m.
Relocate the env to one of the small end sectors to avoid issues with
embedding it, such as support being broken (by recent commit ea882baf9c1),
and for taking a while to save updates.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 include/configs/bf548-ezkit.h |   10 +++++-----
 include/configs/bf561-ezkit.h |   23 +++--------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

Patch

diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 4d7d877..3550fd3 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -113,12 +113,12 @@ 
 #define CONFIG_ENV_OFFSET	0x60000
 #define CONFIG_ENV_SIZE		0x20000
 #else
+/* The BF548-EZKIT uses a top boot flash */
 #define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR		0x20002000
-#define CONFIG_ENV_OFFSET	0x2000
-#define CONFIG_ENV_SIZE		0x2000
-#define CONFIG_ENV_SECT_SIZE	(128 * 1024)
-#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
+#define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_OFFSET	(0x1000000 - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE		CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE	0x8000
 #endif
 
 
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 33c7e18..6cfc19b 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -80,27 +80,10 @@ 
 #define CONFIG_SYS_MAX_FLASH_SECT	135
 /* The BF561-EZKIT uses a top boot flash */
 #define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_OFFSET	0x4000
+#define CONFIG_ENV_OFFSET	(0x800000 - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
-#define CONFIG_ENV_SIZE		0x2000
-#define CONFIG_ENV_SECT_SIZE	0x10000
-#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
- * the sector before the environment sector. If it throws
- * an error during compilation remove an object here to get
- * it linked after the configuration sector.
- */
-# define LDS_BOARD_TEXT \
-	arch/blackfin/lib/libblackfin.o (.text*); \
-	arch/blackfin/cpu/libblackfin.o (.text*); \
-	. = DEFINED(env_offset) ? env_offset : .; \
-	common/env_embedded.o (.text*);
-#endif
+#define CONFIG_ENV_SIZE		CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE	0x2000
 
 
 /*