mtd: nand: mxs: Replace magic number for bits per ECC level with macro

[karo-tx-uboot.git] / tools / mxsboot.c

diff --git a/tools/mxsboot.c b/tools/mxsboot.c
index 3d9cc10f0fa8761277509954376e3b7dc3fc9234..08219b34e8c1c9a865a51e84b212ba417bb363ba 100644 (file)
--- a/tools/mxsboot.c
+++ b/tools/mxsboot.c
@@ -28,14 +28,14 @@
  *
  * TWEAK this if you have different kind of NAND chip.
  */
-uint32_t nand_writesize = 2048;
-uint32_t nand_oobsize = 64;
-uint32_t nand_erasesize = 128 * 1024;
+static uint32_t nand_writesize = 2048;
+static uint32_t nand_oobsize = 64;
+static uint32_t nand_erasesize = 128 * 1024;
 
 /*
  * Sector on which the SigmaTel boot partition (0x53) starts.
  */
-uint32_t sd_sector = 2048;
+static uint32_t sd_sector = 2048;
 
 /*
  * Each of the U-Boot bootstreams is at maximum 1MB big.
@@ -48,6 +48,7 @@ uint32_t sd_sector = 2048;
 #define        MXS_NAND_DMA_DESCRIPTOR_COUNT           4
 #define        MXS_NAND_CHUNK_DATA_CHUNK_SIZE          512
 #define        MXS_NAND_METADATA_SIZE                  10
+#define        MXS_NAND_BITS_PER_ECC_LEVEL             13
 #define        MXS_NAND_COMMAND_BUFFER_SIZE            32
 
 struct mx28_nand_fcb {
@@ -127,7 +128,7 @@ struct mx28_sd_config_block {
 
 static inline uint32_t mx28_nand_ecc_size_in_bits(uint32_t ecc_strength)
 {
-       return ecc_strength * 13;
+       return ecc_strength * MXS_NAND_BITS_PER_ECC_LEVEL;
 }
 
 static inline uint32_t mx28_nand_get_ecc_strength(uint32_t page_data_size,
@@ -142,6 +143,9 @@ static inline uint32_t mx28_nand_get_ecc_strength(uint32_t page_data_size,
 
                if (page_oob_size == 218)
                        return 16;
+
+               if (page_oob_size == 224)
+                       return 16;
        }
 
        return 0;
@@ -269,6 +273,9 @@ static struct mx28_nand_fcb *mx28_nand_get_fcb(uint32_t size)
                } else if (nand_oobsize == 218) {
                        fcb->ecc_block_n_ecc_type =     8;
                        fcb->ecc_block_0_ecc_type =     8;
+               } else if (nand_oobsize == 224) {
+                       fcb->ecc_block_n_ecc_type =     8;
+                       fcb->ecc_block_0_ecc_type =     8;
                }
        }
 
@@ -379,7 +386,7 @@ static uint8_t *mx28_nand_fcb_block(struct mx28_nand_fcb *fcb)
        return block;
 }
 
-static int mx28_nand_write_fcb(struct mx28_nand_fcb *fcb, char *buf)
+static int mx28_nand_write_fcb(struct mx28_nand_fcb *fcb, uint8_t *buf)
 {
        uint32_t offset;
        uint8_t *fcbblock;
@@ -393,13 +400,15 @@ static int mx28_nand_write_fcb(struct mx28_nand_fcb *fcb, char *buf)
        for (i = 0; i < STRIDE_PAGES * STRIDE_COUNT; i += STRIDE_PAGES) {
                offset = i * nand_writesize;
                memcpy(buf + offset, fcbblock, nand_writesize + nand_oobsize);
+               /* Mark the NAND page is OK. */
+               buf[offset + nand_writesize] = 0xff;
        }
 
        free(fcbblock);
        return ret;
 }
 
-static int mx28_nand_write_dbbt(struct mx28_nand_dbbt *dbbt, char *buf)
+static int mx28_nand_write_dbbt(struct mx28_nand_dbbt *dbbt, uint8_t *buf)
 {
        uint32_t offset;
        int i = STRIDE_PAGES * STRIDE_COUNT;
@@ -413,7 +422,7 @@ static int mx28_nand_write_dbbt(struct mx28_nand_dbbt *dbbt, char *buf)
 }
 
 static int mx28_nand_write_firmware(struct mx28_nand_fcb *fcb, int infd,
-                                       char *buf)
+                                   uint8_t *buf)
 {
        int ret;
        off_t size;
@@ -434,7 +443,7 @@ static int mx28_nand_write_firmware(struct mx28_nand_fcb *fcb, int infd,
        return 0;
 }
 
-void usage(void)
+static void usage(void)
 {
        printf(
                "Usage: mxsboot [ops] <type> <infile> <outfile>\n"
@@ -462,7 +471,7 @@ static int mx28_create_nand_image(int infd, int outfd)
        struct mx28_nand_fcb *fcb;
        struct mx28_nand_dbbt *dbbt;
        int ret = -1;
-       char *buf;
+       uint8_t *buf;
        int size;
        ssize_t wr_size;
 
@@ -575,7 +584,7 @@ err0:
        return ret;
 }
 
-int parse_ops(int argc, char **argv)
+static int parse_ops(int argc, char **argv)
 {
        int i;
        int tmp;