Merge with /home/stefan/git/u-boot/denx-merge-sr

[u-boot] / board / esd / canbt / canbt.c

diff --git a/board/esd/canbt/canbt.c b/board/esd/canbt/canbt.c
index ae0e8805f24b6d6f626bdb4cd73a3d345c864bd5..055a39773061ac05cb8839d07b4d8d1a0430e701 100644 (file)
--- a/board/esd/canbt/canbt.c
+++ b/board/esd/canbt/canbt.c
@@ -26,6 +26,7 @@
 #include <asm/processor.h>
 #include <command.h>
 
+DECLARE_GLOBAL_DATA_PTR;
 
 /*cmd_boot.c*/
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
@@ -48,10 +49,8 @@ const unsigned char fpgadata[] = {
 #include "../common/fpga.c"
 
 
-int board_pre_init (void)
+int board_early_init_f (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        unsigned long cntrl0Reg;
        int index, len, i;
        int status;
@@ -156,7 +155,7 @@ int checkboard (void)
 {
        int index;
        int len;
-       unsigned char str[64];
+       char str[64];
        int i = getenv_r ("serial#", str, sizeof (str));
 
        puts ("Board: ");