Prepare v2011.06-rc1

[karo-tx-uboot.git] / board / ppmc7xx / ppmc7xx.c

diff --git a/board/ppmc7xx/ppmc7xx.c b/board/ppmc7xx/ppmc7xx.c
index 402ac5e20198b6c0b961bcc90fb4654ddc76f4be..432d366a40fad529aeab58ceb2cfad045d04bd18 100644 (file)
--- a/board/ppmc7xx/ppmc7xx.c
+++ b/board/ppmc7xx/ppmc7xx.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <netdev.h>
 
 
 /* Define some MPC107 (memory controller) registers */
@@ -18,8 +19,7 @@
 
 
 /* Function prototypes */
-extern void unlock_ram_in_cache( void );
-extern void _start_warm(void);
+extern void _start(void);
 
 
 /*
@@ -29,9 +29,9 @@ extern void _start_warm(void);
  * the SDRAM was already initialised by board_asm_init (see init.S) so we just
  * return the size of RAM.
  */
-long initdram( int board_type )
+phys_size_t initdram( int board_type )
 {
-    return CFG_SDRAM_SIZE;
+    return CONFIG_SYS_SDRAM_SIZE;
 }
 
 
@@ -88,7 +88,7 @@ int misc_init_r( void )
  *
  * Shell command to reset the board.
  */
-void do_reset( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        printf( "Resetting...\n" );
 
@@ -96,9 +96,17 @@ void do_reset( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
        icache_disable();
        dcache_disable();
 
-       /* Jump to warm start (in RAM) */
-       _start_warm();
+       /* Jump to cold reset point (in RAM) */
+       _start();
 
        /* Should never get here */
-       while(1);
+       while(1)
+               ;
+
+       return 1;
+}
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
 }