NAND: Add 16bit NAND support for the NDFC

[karo-tx-uboot.git] / nand_spl / nand_boot.c

diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c
index 9545a9a7b51ea73173fc5935c4705e6e60575f2c..4683c7c52c33e216d7c64a677ee9322250e16b23 100644 (file)
--- a/nand_spl/nand_boot.c
+++ b/nand_spl/nand_boot.c
@@ -122,10 +122,15 @@ static int nand_is_bad_block(struct mtd_info *mtd, int block)
        nand_command(mtd, block, 0, CONFIG_SYS_NAND_BAD_BLOCK_POS, NAND_CMD_READOOB);
 
        /*
-        * Read one byte
+        * Read one byte (or two if it's a 16 bit chip).
         */
-       if (readb(this->IO_ADDR_R) != 0xff)
-               return 1;
+       if (this->options & NAND_BUSWIDTH_16) {
+               if (readw(this->IO_ADDR_R) != 0xffff)
+                       return 1;
+       } else {
+               if (readb(this->IO_ADDR_R) != 0xff)
+                       return 1;
+       }
 
        return 0;
 }