i.MX28: Add cache support to MXS NAND driver

[u-boot] / board / pcippc2 / pcippc2.c

diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c
index bab3c205a3b64eee4bf9f8e4eadad6d2f1ac87d4..4a91458e8e6a6b2c008d5d095ed08c908579d8b7 100644 (file)
--- a/board/pcippc2/pcippc2.c
+++ b/board/pcippc2/pcippc2.c
@@ -28,12 +28,15 @@
 #include <linux/mtd/doc2000.h>
 #include <watchdog.h>
 #include <pci.h>
+#include <netdev.h>
 
 #include "hardware.h"
 #include "pcippc2.h"
 #include "sconsole.h"
 #include "fpga_serial.h"
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #if defined(CONFIG_WATCHDOG)
 
 static int pcippc2_wdt_init_done = 0;
@@ -61,19 +64,21 @@ u32 pcippc2_sdram_size (void)
        return in32 (REG (CPC0, RGBAN1));
 }
 
-long initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        return cpc710_ram_init ();
 }
 
-void do_reset (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
+int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        out32 (REG (CPC0, SPOR), 0);
        iobarrier_rw ();
        while (1);
+       /* notreached */
+       return (-1);
 }
 
-int board_pre_init (void)
+int board_early_init_f (void)
 {
        out32 (REG (CPC0, RSTR), 0xC0000000);
        iobarrier_rw ();
@@ -106,11 +111,9 @@ int board_pre_init (void)
 
 void after_reloc (ulong dest_addr)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* Jump to the main U-Boot board init code
         */
-       board_init_r (gd, dest_addr);
+       board_init_r ((gd_t *)gd, dest_addr);
 }
 
 int misc_init_r (void)
@@ -144,10 +147,12 @@ void pci_init_board (void)
        cpc710_pci_enable_timeout ();
 }
 
+#ifdef CONFIG_CMD_DOC
 void doc_init (void)
 {
        doc_probe (pcippc2_fpga1_phys + HW_FPGA1_DOC);
 }
+#endif
 
 void pcippc2_cpci3264_init (void)
 {
@@ -200,8 +205,8 @@ void watchdog_reset (void)
                enable_interrupts ();
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
-int do_wd (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
+#if defined(CONFIG_CMD_BSP)
+int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        switch (argc) {
        case 1:
@@ -227,9 +232,21 @@ int do_wd (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
        default:
                break;
        }
-       printf ("Usage:\n%s\n", cmdtp->usage);
-       return 1;
+       return cmd_usage(cmdtp);
 }
 
-#endif /* CFG_CMD_BSP */
+U_BOOT_CMD(
+       wd,     2,      1,      do_wd,
+       "check and set watchdog",
+       "on   - switch watchDog on\n"
+       "wd off  - switch watchdog off\n"
+       "wd      - print current status"
+);
+
+#endif
 #endif /* CONFIG_WATCHDOG */
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}