Blackfin: fix bd_t handling

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>

diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h
index f0f3a395348afd2767053ae675d7859beb877ca9..89814cd5853b11bc9f59519c827027359e9b11a5 100644 (file)
--- 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_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
 #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
 #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 2b1f78c636b8f27b5c70cfdecf12418251a7cdfb..47d487fae55daa04563ad16b4ae52fd9c844ce80 100644 (file)
--- 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)
 {
 
 void board_init_f(ulong bootflag)
 {

-       ulong addr;

        bd_t *bd;
        char buf[32];
 
        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);
 
        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;
        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);
 
        bd->bi_r_version = version_string;
        bd->bi_cpu = MK_STR(CONFIG_BFIN_CPU);