1 files changed, 30 insertions, 0 deletions

diff --git a/meta/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch b/meta/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch
new file mode 100644
index 0000000000..a5800e2499
--- /dev/null
+++ b/meta/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch
@@ -0,0 +1,30 @@
+This patch makes nand_block_checkbad check both the BBT and the actual
+OOB data. This avoids accidently passing blocks as good when BBT and
+OOB markers are not synchronized, e.g., before "nand createbbt".
+
+Experimental.
+
+- Werner Almesberger <werner@openmoko.org>
+
+Index: u-boot/drivers/nand/nand_base.c
+===================================================================
+--- u-boot.orig/drivers/nand/nand_base.c
++++ u-boot/drivers/nand/nand_base.c
+@@ -517,11 +517,14 @@ static int nand_block_checkbad (struct m
+ {
+        struct nand_chip *this = mtd->priv;
+ 
+-       if (!this->bbt)
+-               return this->block_bad(mtd, ofs, getchip);
++       if (this->block_bad(mtd, ofs, getchip))
++               return 1;
+ 
+        /* Return info from the table */
+-       return nand_isbad_bbt (mtd, ofs, allowbbt);
++       if (this->bbt && nand_isbad_bbt (mtd, ofs, allowbbt))
++               return 1;
++
++       return 0;
+ }
+ 
+ /**