Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / nand / nand_bbt.c

diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index cc81cd67f8733b4bad9aacf07b01b9ba6f4a3e5c..22234a1fe52916e3f553f212bef12f345b3a0455 100644 (file)
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -1210,6 +1210,10 @@ int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
        if (md)
                mark_bbt_region(mtd, md);
 
+#ifdef CONFIG_MTD_NAND_RK29
+    extern void mark_reserve_region(struct mtd_info *mtd,struct nand_bbt_descr *td,struct nand_bbt_descr *md);
+    mark_reserve_region(mtd, td, md);
+#endif    
        vfree(buf);
        return res;
 }
@@ -1293,8 +1297,8 @@ static uint8_t mirror_pattern[] = {'1', 't', 'b', 'B' };
 
 static struct nand_bbt_descr bbt_main_descr = {
        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-               | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-       .offs = 8,
+               | NAND_BBT_2BIT /*| NAND_BBT_VERSION */| NAND_BBT_PERCHIP,
+       .offs =0,  //8,  // meet to rk2818 nandc spare
        .len = 4,
        .veroffs = 12,
        .maxblocks = 4,
@@ -1303,8 +1307,8 @@ static struct nand_bbt_descr bbt_main_descr = {
 
 static struct nand_bbt_descr bbt_mirror_descr = {
        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-               | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-       .offs = 8,
+               | NAND_BBT_2BIT /*| NAND_BBT_VERSION */| NAND_BBT_PERCHIP,
+       .offs =0,   //8,  // meet to rk2818 nandc spare
        .len = 4,
        .veroffs = 12,
        .maxblocks = 4,