summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-02-04 13:39:40 -0600
committerScott Wood <scottwood@freescale.com>2009-02-06 17:29:29 -0600
commit10dc6a9bef73d7d4cb25b3fde27ee91f8484b126 (patch)
treecd6913837aa8ad4aa9b6c2098b7cc1483bd3d679
parentad09ab2e3ac28f304372eceb4a5cb4d24e102a13 (diff)
downloadu-boot-imx-10dc6a9bef73d7d4cb25b3fde27ee91f8484b126.zip
u-boot-imx-10dc6a9bef73d7d4cb25b3fde27ee91f8484b126.tar.gz
u-boot-imx-10dc6a9bef73d7d4cb25b3fde27ee91f8484b126.tar.bz2
NAND: Silence warning when CONFIG_SYS_NAND_QUIET_TEST
Commit cfa460adfdefcc30d104e1a9ee44994ee349bb7b removed support for disabling the "No NAND device found!!!" warning when CONFIG_SYS_NAND_QUIET_TEST was defined. This re-adds support for silencing the warning. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
-rw-r--r--drivers/mtd/nand/nand_base.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index ef37f97..bfa7874 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2618,7 +2618,9 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips)
type = nand_get_flash_type(mtd, chip, busw, &nand_maf_id);
if (IS_ERR(type)) {
+#ifndef CONFIG_SYS_NAND_QUIET_TEST
printk(KERN_WARNING "No NAND device found!!!\n");
+#endif
chip->select_chip(mtd, -1);
return PTR_ERR(type);
}