On Wed, 8 Sep 2010 05:53:57 -0700
Steve Sakoman <st...@sakoman.com> wrote:
> This printk was added recently and results in ugly output on systems
> with no NAND:
>
> NAND: nand_get_flash_type: unknown NAND device: Manufacturer ID: 0x00, Chip
> ID: 0x00 0 MiB
>
> instead of:
>
> NAND: 0 MiB
>
> Signed-off-by: Steve Sakoman <st...@sakoman.com>
> ---
> drivers/mtd/nand/nand_base.c | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> index ed1c9c9..7d17846 100644
> --- a/drivers/mtd/nand/nand_base.c
> +++ b/drivers/mtd/nand/nand_base.c
> @@ -2653,9 +2653,12 @@ static struct nand_flash_dev
> *nand_get_flash_type(struct mtd_info *mtd,
> }
>
> if (!type) {
> - printk(KERN_INFO "%s: unknown NAND device: Manufacturer ID:"
> - " 0x%02x, Chip ID: 0x%02x\n", __func__,
> - *maf_id, dev_id);
> + /* supress warning if there is no nand */
> + if (*maf_id != 0x00 && *maf_id != 0xff &&
> + dev_id != 0x00 && dev_id != 0xff)
> + printk(KERN_INFO "%s: unknown NAND device: "
> + "Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n",
> + __func__, *maf_id, dev_id);
> return ERR_PTR(-ENODEV);
> }
>
Acked-by: Scott Wood <scottw...@freescale.com>
-Scott
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
