Merge with git://www.denx.de/git/u-boot.git

[platform/kernel/u-boot.git] / board / delta / nand.c

diff --git a/board/delta/nand.c b/board/delta/nand.c
index c332f71..a635a65 100644 (file)
--- a/board/delta/nand.c
+++ b/board/delta/nand.c
@@ -22,8 +22,8 @@
 
 #include <common.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
-#ifdef CONFIG_NEW_NAND_CODE
+#if defined(CONFIG_CMD_NAND)
+#if !defined(CFG_NAND_LEGACY)
 
 #include <nand.h>
 #include <asm/arch/pxa-regs.h>
@@ -229,7 +229,7 @@ static void wait_us(unsigned long us)
        }
 }
 
-static void dfc_clear_nddb()
+static void dfc_clear_nddb(void)
 {
        NDCR &= ~NDCR_ND_RUN;
        wait_us(CFG_NAND_OTHER_TO);
@@ -263,7 +263,7 @@ static unsigned long dfc_wait_event(unsigned long event)
 }
 
 /* we don't always wan't to do this */
-static void dfc_new_cmd()
+static void dfc_new_cmd(void)
 {
        int retry = 0;
        unsigned long status;
@@ -393,7 +393,7 @@ static void dfc_cmdfunc(struct mtd_info *mtd, unsigned command,
        return;
 }
 
-static void dfc_gpio_init()
+static void dfc_gpio_init(void)
 {
        DFC_DEBUG2("Setting up DFC GPIO's.\n");
 
@@ -448,7 +448,7 @@ static void dfc_gpio_init()
  * Members with a "?" were not set in the merged testing-NAND branch,
  * so they are not set here either.
  */
-void board_nand_init(struct nand_chip *nand)
+int board_nand_init(struct nand_chip *nand)
 {
        unsigned long tCH, tCS, tWH, tWP, tRH, tRP, tRP_high, tR, tWHR, tAR;
 
@@ -576,6 +576,7 @@ void board_nand_init(struct nand_chip *nand)
        nand->cmdfunc = dfc_cmdfunc;
        nand->autooob = &delta_oob;
        nand->badblock_pattern = &delta_bbt_descr;
+       return 0;
 }
 
 #else