Added support for the TQM8272 board from TQ

[karo-tx-uboot.git] / drivers / nand / nand_base.c

diff --git a/drivers/nand/nand_base.c b/drivers/nand/nand_base.c
index e0b406041fb7cd00b4ebdcabf167c3f838fc433e..95d6e4ede6a01dabd15693a2a9d97c639d68fdfe 100644 (file)
--- a/drivers/nand/nand_base.c
+++ b/drivers/nand/nand_base.c
@@ -72,11 +72,7 @@
 
 #include <common.h>
 
-#ifdef CFG_NAND_LEGACY
-#error CFG_NAND_LEGACY defined in a file not using the legacy NAND support!
-#endif
-
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
 
 #include <malloc.h>
 #include <watchdog.h>
@@ -2411,7 +2407,9 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
        }
 
        if (!nand_flash_ids[i].name) {
+#if !defined(CONFIG_TQM8272)
                printk (KERN_WARNING "No NAND device found!!!\n");
+#endif
                this->select_chip(mtd, -1);
                return 1;
        }