unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / devs / flash / arm / mxc / v2_0 / include / tx27_nand_bbt.h

diff --git a/packages/devs/flash/arm/mxc/v2_0/include/tx27_nand_bbt.h b/packages/devs/flash/arm/mxc/v2_0/include/tx27_nand_bbt.h
index 6331fb53f7576db6ea5ee16b001b078c9d16a74c..8224a1c990dfeaba3563c7ef72dd1a59dc09cb6b 100644 (file)
--- a/packages/devs/flash/arm/mxc/v2_0/include/tx27_nand_bbt.h
+++ b/packages/devs/flash/arm/mxc/v2_0/include/tx27_nand_bbt.h
@@ -2,18 +2,13 @@ static cyg_int8 bbt_pattern[] = {'B', 'b', 't', '0' };
 static cyg_int8 mirror_pattern[] = {'1', 't', 'b', 'B' };
 
 static struct nand_bbt_descr tx27_bbt_main_descr = {
-#if 1
        .options = (NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE |
                    NAND_BBT_2BIT | NAND_BBT_VERSION),
-#else
-       .options = (NAND_BBT_CREATE | NAND_BBT_WRITE |
-                   NAND_BBT_2BIT | NAND_BBT_VERSION),
-#endif
        .offs = 12,
        .len = 4,
        .veroffs = 11,
        .maxblocks = 4,
-       .pattern = bbt_pattern
+       .pattern = bbt_pattern,
 };
 
 static struct nand_bbt_descr tx27_bbt_mirror_descr = {
@@ -23,7 +18,7 @@ static struct nand_bbt_descr tx27_bbt_mirror_descr = {
        .len = 4,
        .veroffs = 11,
        .maxblocks = 4,
-       .pattern = mirror_pattern
+       .pattern = mirror_pattern,
 };
 
 static struct nand_bbt_descr *g_mxc_nfc_bbt_main_descr = &tx27_bbt_main_descr;