Update board NetStar

[oweals/u-boot.git] / board / netstar / nand.c

diff --git a/board/netstar/nand.c b/board/netstar/nand.c
index f470c1a01e05f72f5988188b0222356203e795c4..b76d2a3324a4ede962a3047c795a8fb5cfefbf69 100644 (file)
--- a/board/netstar/nand.c
+++ b/board/netstar/nand.c
@@ -22,7 +22,7 @@
 
 #include <common.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
 
 #include <nand.h>
 
@@ -45,22 +45,12 @@ static void netstar_nand_hwcontrol(struct mtd_info *mtd, int cmd)
        this->IO_ADDR_W = (void *) IO_ADDR_W;
 }
 
-/*
- *     chip R/B detection
- */
-/***
-static int netstar_nand_ready(struct mtd_info *mtd)
-{
-       return (*(volatile ushort *)GPIO_DATA_INPUT_REG) & 0x02;
-}
-***/
-
-void board_nand_init(struct nand_chip *nand)
+int board_nand_init(struct nand_chip *nand)
 {
        nand->options = NAND_SAMSUNG_LP_OPTIONS;
        nand->eccmode = NAND_ECC_SOFT;
        nand->hwcontrol = netstar_nand_hwcontrol;
-/*     nand->dev_ready = netstar_nand_ready; */
-       nand->chip_delay = 18;
+       nand->chip_delay = 400;
+       return 0;
 }
 #endif