summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-04-08 10:24:24 -0400
committerWolfgang Denk <wd@denx.de>2008-04-17 14:56:56 -0700
commite25cb8d3f4fcc265a9cdf8e9d577b59bdb64bbaf (patch)
tree036c0a574ef04eed0455b2cf1dcbb6c8cf44d774
parent188e94c370621708d13547d58dbc6ed3c5602aa8 (diff)
downloadu-boot-imx-e25cb8d3f4fcc265a9cdf8e9d577b59bdb64bbaf.zip
u-boot-imx-e25cb8d3f4fcc265a9cdf8e9d577b59bdb64bbaf.tar.gz
u-boot-imx-e25cb8d3f4fcc265a9cdf8e9d577b59bdb64bbaf.tar.bz2
Remove conflicting NAND ID
There are two NAND entries with ID 0xDC and this obviously causes problems. In the kernel, they punted the first entry, so we should do the same. See this upstream e-mail for more info: http://lists.infradead.org/pipermail/linux-mtd/2007-July/018795.html Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--drivers/mtd/nand/nand_ids.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 6d7e347..524b6b1 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -67,8 +67,6 @@ struct nand_flash_dev nand_flash_ids[] = {
{"NAND 256MiB 3,3V 8-bit", 0x71, 512, 256, 0x4000, 0},
- {"NAND 512MiB 3,3V 8-bit", 0xDC, 512, 512, 0x4000, 0},
-
/* These are the new chips with large page size. The pagesize
* and the erasesize is determined from the extended id bytes
*/