Patchwork [U-Boot,14/34] Blackfin: fix bd_t handling

login
register
mail settings
Submitter Mike Frysinger
Date April 3, 2011, 8:58 a.m.
Message ID <1301821121-26743-15-git-send-email-vapier@gentoo.org>
Download mbox | patch
Permalink /patch/89485/
State Accepted
Delegated to: Wolfgang Denk
Headers show

Comments

Mike Frysinger - April 3, 2011, 8:58 a.m.
The recent global data changes (making the size autogenerated) broke the
board info handling on Blackfin ports as we were lying and lumping the
bd_t size in with the gd_t size.  So use the new dedicated bd_t size to
setup its own address in memory.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 arch/blackfin/include/asm/config.h |    5 ++++-
 arch/blackfin/lib/board.c          |   10 ++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

Patch

diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h
index f0f3a39..89814cd 100644
--- a/arch/blackfin/include/asm/config.h
+++ b/arch/blackfin/include/asm/config.h
@@ -109,8 +109,11 @@ 
 #ifndef CONFIG_SYS_GBL_DATA_ADDR
 # define CONFIG_SYS_GBL_DATA_ADDR (CONFIG_SYS_MALLOC_BASE - GENERATED_GBL_DATA_SIZE)
 #endif
+#ifndef CONFIG_SYS_BD_INFO_ADDR
+# define CONFIG_SYS_BD_INFO_ADDR (CONFIG_SYS_GBL_DATA_ADDR - GENERATED_BD_INFO_SIZE)
+#endif
 #ifndef CONFIG_STACKBASE
-# define CONFIG_STACKBASE (CONFIG_SYS_GBL_DATA_ADDR - 4)
+# define CONFIG_STACKBASE (CONFIG_SYS_BD_INFO_ADDR - 4)
 #endif
 #ifndef CONFIG_SYS_MEMTEST_START
 # define CONFIG_SYS_MEMTEST_START 0
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index 2b1f78c..47d487f 100644
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -207,7 +207,6 @@  extern int timer_init(void);
 
 void board_init_f(ulong bootflag)
 {
-	ulong addr;
 	bd_t *bd;
 	char buf[32];
 
@@ -244,14 +243,9 @@  void board_init_f(ulong bootflag)
 	gd = (gd_t *) (CONFIG_SYS_GBL_DATA_ADDR);
 	memset((void *)gd, 0, GENERATED_GBL_DATA_SIZE);
 
-	/* Board data initialization */
-	addr = (CONFIG_SYS_GBL_DATA_ADDR + sizeof(gd_t));
-
-	/* Align to 4 byte boundary */
-	addr &= ~(4 - 1);
-	bd = (bd_t *) addr;
+	bd = (bd_t *) (CONFIG_SYS_BD_INFO_ADDR);
 	gd->bd = bd;
-	memset((void *)bd, 0, sizeof(bd_t));
+	memset((void *)bd, 0, GENERATED_BD_INFO_SIZE);
 
 	bd->bi_r_version = version_string;
 	bd->bi_cpu = MK_STR(CONFIG_BFIN_CPU);