NAND: rename NAND_MAX_CHIPS to CONFIG_SYS_NAND_MAX_CHIPS

[platform/kernel/u-boot.git] / drivers / mtd / nand_legacy / nand_legacy.c

diff --git a/drivers/mtd/nand_legacy/nand_legacy.c b/drivers/mtd/nand_legacy/nand_legacy.c
index fafefad..441780a 100644 (file)
--- a/drivers/mtd/nand_legacy/nand_legacy.c
+++ b/drivers/mtd/nand_legacy/nand_legacy.c
@@ -14,9 +14,6 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <watchdog.h>
-
-#if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
-
 #include <linux/mtd/nand_legacy.h>
 #include <linux/mtd/nand_ids.h>
 #include <jffs2/jffs2.h>
@@ -69,7 +66,7 @@ struct nand_oob_config {
        int eccvalid_pos;
 } oob_config = { {0}, 0, 0};
 
-struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE] = {{0}};
+struct nand_chip nand_dev_desc[CONFIG_SYS_MAX_NAND_DEVICE] = {{0}};
 
 int curr_device = -1; /* Current NAND Device */
 
@@ -460,7 +457,7 @@ static void NanD_ScanChips(struct nand_chip *nand)
 {
        int floor, chip;
        int numchips[NAND_MAX_FLOORS];
-       int maxchips = NAND_MAX_CHIPS;
+       int maxchips = CONFIG_SYS_NAND_MAX_CHIPS;
        int ret = 1;
 
        nand->numchips = 0;
@@ -985,7 +982,7 @@ static int nand_write_ecc (struct nand_chip* nand, size_t to, size_t len,
 #ifdef CONFIG_OMAP1510
        archflashwp(0,0);
 #endif
-#ifdef CFG_NAND_WP
+#ifdef CONFIG_SYS_NAND_WP
        NAND_WP_OFF();
 #endif
 
@@ -1039,7 +1036,7 @@ out:
 #ifdef CONFIG_OMAP1510
        archflashwp(0,1);
 #endif
-#ifdef CFG_NAND_WP
+#ifdef CONFIG_SYS_NAND_WP
        NAND_WP_ON();
 #endif
 
@@ -1238,7 +1235,7 @@ int nand_legacy_erase(struct nand_chip* nand, size_t ofs, size_t len, int clean)
 #ifdef CONFIG_OMAP1510
        archflashwp(0,0);
 #endif
-#ifdef CFG_NAND_WP
+#ifdef CONFIG_SYS_NAND_WP
        NAND_WP_OFF();
 #endif
     NAND_ENABLE_CE(nand);  /* set pin low */
@@ -1324,7 +1321,7 @@ out:
 #ifdef CONFIG_OMAP1510
        archflashwp(0,1);
 #endif
-#ifdef CFG_NAND_WP
+#ifdef CONFIG_SYS_NAND_WP
        NAND_WP_ON();
 #endif
 
@@ -1361,7 +1358,7 @@ unsigned long nand_probe(unsigned long physadr)
 #endif
        oob_config.badblock_pos = 5;
 
-       for (i=0; i<CFG_MAX_NAND_DEVICE; i++) {
+       for (i=0; i<CONFIG_SYS_MAX_NAND_DEVICE; i++) {
                if (nand_dev_desc[i].ChipID == NAND_ChipID_UNKNOWN) {
                        nand = &nand_dev_desc[i];
                        break;
@@ -1608,5 +1605,3 @@ int read_jffs2_nand(size_t start, size_t len,
                        start, len, retlen, buf);
 }
 #endif /* CONFIG_JFFS2_NAND */
-
-#endif