Index: Common/ubl/src/nandboot.c
===================================================================
--- Common/ubl/src/nandboot.c	(revision 150)
+++ Common/ubl/src/nandboot.c	(working copy)
@@ -195,6 +195,23 @@
       page = 0;
       block++;
     }
+
+    // DAK - ONQ / Legrand
+    // Just skip over blocks marked factory bad
+
+NAND_skip_bad:
+
+    if(page == 0 || (block == gNandBoot.block))
+    {
+       readError = NAND_badBlockCheck(hNandInfo, block);
+
+       if(readError != E_PASS)
+       {
+          ++block;
+          goto NAND_skip_bad;
+       }
+    }
+
     readError = NAND_readPage(hNandInfo,block,page++,(&rxBuf[i*(hNandInfo->dataBytesPerPage)]));  /* Copy the data */
 
     // We attempt to read the app data twice.  If we fail twice then we go look for a new