X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fesd%2Fcanbt%2Fcanbt.c;h=2ced6cb17f282767fbf8aad2a658a165da19f2aa;hb=038ccac511214b062c56f22b9413f784b86bcd87;hp=bc7f0c70f0c6d7349b044e5dd756ab1410f3ad45;hpb=153d511e36917ee67d52d36d5d5e9ca41406610a;p=u-boot

diff --git a/board/esd/canbt/canbt.c b/board/esd/canbt/canbt.c
index bc7f0c70f0..2ced6cb17f 100644
--- a/board/esd/canbt/canbt.c
+++ b/board/esd/canbt/canbt.c
@@ -25,7 +25,11 @@
 #include "canbt.h"
 #include <asm/processor.h>
 #include <command.h>
-#include <cmd_boot.h>
+
+
+/*cmd_boot.c*/
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+
 
 /* ------------------------------------------------------------------------- */
 
@@ -44,7 +48,7 @@ const unsigned char fpgadata[] = {
 #include "../common/fpga.c"
 
 
-int board_pre_init (void)
+int board_early_init_f (void)
 {
 	DECLARE_GLOBAL_DATA_PTR;
 
@@ -114,9 +118,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 +156,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: ");