Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[u-boot] / drivers / mtd / nand / s3c64xx.c

diff --git a/drivers/mtd/nand/s3c64xx.c b/drivers/mtd/nand/s3c64xx.c
index 159fe76aa5f88d7d60b18a716ccaa6983b27a1f3..87f03410666aef3a328f00030b1d113015a7f96b 100644 (file)
--- a/drivers/mtd/nand/s3c64xx.c
+++ b/drivers/mtd/nand/s3c64xx.c
@@ -28,7 +28,9 @@
 #include <common.h>
 
 #include <nand.h>
-#include <s3c6400.h>
+#include <linux/mtd/nand.h>
+
+#include <asm/arch/s3c6400.h>
 
 #include <asm/io.h>
 #include <asm/errno.h>
@@ -60,32 +62,6 @@ static void print_oob(const char *header, struct mtd_info *mtd)
 }
 #endif /* S3C_NAND_DEBUG */
 
-#ifdef CONFIG_NAND_SPL
-static u_char nand_read_byte(struct mtd_info *mtd)
-{
-       struct nand_chip *this = mtd->priv;
-       return readb(this->IO_ADDR_R);
-}
-
-static void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-
-       for (i = 0; i < len; i++)
-               writeb(buf[i], this->IO_ADDR_W);
-}
-
-static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
-{
-       int i;
-       struct nand_chip *this = mtd->priv;
-
-       for (i = 0; i < len; i++)
-               buf[i] = readb(this->IO_ADDR_R);
-}
-#endif
-
 static void s3c_nand_select_chip(struct mtd_info *mtd, int chip)
 {
        int ctrl = readl(NFCONT);
@@ -141,7 +117,7 @@ static int s3c_nand_device_ready(struct mtd_info *mtdinfo)
        return !!(readl(NFSTAT) & NFSTAT_RnB);
 }
 
-#ifdef CFG_S3C_NAND_HWECC
+#ifdef CONFIG_SYS_S3C_NAND_HWECC
 /*
  * This function is called before encoding ecc codes to ready ecc engine.
  * Written by jsgood
@@ -256,7 +232,7 @@ static int s3c_nand_correct_data(struct mtd_info *mtd, u_char *dat,
 
        return ret;
 }
-#endif /* CFG_S3C_NAND_HWECC */
+#endif /* CONFIG_SYS_S3C_NAND_HWECC */
 
 /*
  * Board-specific NAND initialization. The following members of the
@@ -297,7 +273,7 @@ int board_nand_init(struct nand_chip *nand)
        nand->read_buf          = nand_read_buf;
 #endif
 
-#ifdef CFG_S3C_NAND_HWECC
+#ifdef CONFIG_SYS_S3C_NAND_HWECC
        nand->ecc.hwctl         = s3c_nand_enable_hwecc;
        nand->ecc.calculate     = s3c_nand_calculate_ecc;
        nand->ecc.correct       = s3c_nand_correct_data;
@@ -307,11 +283,11 @@ int board_nand_init(struct nand_chip *nand)
         * board one day, it will get more complicated...
         */
        nand->ecc.mode          = NAND_ECC_HW;
-       nand->ecc.size          = CFG_NAND_ECCSIZE;
-       nand->ecc.bytes         = CFG_NAND_ECCBYTES;
+       nand->ecc.size          = CONFIG_SYS_NAND_ECCSIZE;
+       nand->ecc.bytes         = CONFIG_SYS_NAND_ECCBYTES;
 #else
        nand->ecc.mode          = NAND_ECC_SOFT;
-#endif /* ! CFG_S3C_NAND_HWECC */
+#endif /* ! CONFIG_SYS_S3C_NAND_HWECC */
 
        nand->priv              = nand_cs + chip_n++;