Merge branch 'fixes' into cleanups

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

diff --git a/board/esd/canbt/canbt.c b/board/esd/canbt/canbt.c
index bc7f0c70f0c6d7349b044e5dd756ab1410f3ad45..30fa605abb62ae5bce1468f7bc7b299d60c752a3 100644 (file)
--- a/board/esd/canbt/canbt.c
+++ b/board/esd/canbt/canbt.c
@@ -25,7 +25,12 @@
 #include "canbt.h"
 #include <asm/processor.h>
 #include <command.h>
-#include <cmd_boot.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*cmd_boot.c*/
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+
 
 /* ------------------------------------------------------------------------- */
 
@@ -44,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;
@@ -114,9 +117,9 @@ int board_pre_init (void)
        /*
         * Setup port pins for normal operation
         */
-       out32 (IBM405GP_GPIO0_ODR, 0x00000000); /* no open drain pins */
-       out32 (IBM405GP_GPIO0_TCR, 0x07038100); /* setup for output */
-       out32 (IBM405GP_GPIO0_OR, 0x07030100);  /* set output pins to high (default) */
+       out32 (GPIO0_ODR, 0x00000000);  /* no open drain pins */
+       out32 (GPIO0_TCR, 0x07038100);  /* setup for output */
+       out32 (GPIO0_OR, 0x07030100);   /* set output pins to high (default) */
 
        /*
         * IRQ 0-15  405GP internally generated; active high; level sensitive
@@ -152,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: ");
@@ -178,22 +181,3 @@ int checkboard (void)
 
        return 0;
 }
-
-/* ------------------------------------------------------------------------- */
-
-long int initdram (int board_type)
-{
-       return (16 * 1024 * 1024);
-}
-
-/* ------------------------------------------------------------------------- */
-
-int testdram (void)
-{
-       /* TODO: XXX XXX XXX */
-       printf ("test: 16 MB - ok\n");
-
-       return (0);
-}
-
-/* ------------------------------------------------------------------------- */