From: Jörg Krause Date: Wed, 15 Apr 2015 07:27:22 +0000 (+0200) Subject: mtd: nand: mxs: Replace magic number for bits per ECC level with macro X-Git-Tag: KARO-TX6-2015-09-18~1950 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=14a7d09bb3a95d2153bae09cf89e3be56cb21cbe;ds=sidebyside mtd: nand: mxs: Replace magic number for bits per ECC level with macro Signed-off-by: Jörg Krause Reviewed-by: Marek Vasut --- diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index 0688dd2e27..cca29fa1b2 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -37,7 +37,7 @@ #define MXS_NAND_CHUNK_DATA_CHUNK_SIZE_SHIFT 0 #endif #define MXS_NAND_METADATA_SIZE 10 - +#define MXS_NAND_BITS_PER_ECC_LEVEL 13 #define MXS_NAND_COMMAND_BUFFER_SIZE 32 /* BCH timeout in microseconds */ @@ -243,7 +243,7 @@ static uint32_t mxs_nand_ecc_chunk_cnt(struct mtd_info *mtd) static inline uint32_t mxs_nand_ecc_size_in_bits(uint32_t ecc_strength) { - return ecc_strength * 13; + return ecc_strength * MXS_NAND_BITS_PER_ECC_LEVEL; } static uint32_t mxs_nand_aux_status_offset(void) @@ -286,7 +286,8 @@ static inline uint32_t mxs_nand_get_ecc_strength(uint32_t page_data_size, * (page oob size - meta data size) * (bits per byte) */ ecc_strength = ((page_oob_size - MXS_NAND_METADATA_SIZE) * 8) - / (13 * mxs_nand_ecc_chunk_cnt(page_data_size)); + / (MXS_NAND_BITS_PER_ECC_LEVEL * + mxs_nand_ecc_chunk_cnt(page_data_size)); return round_down(ecc_strength, 2); } diff --git a/tools/mxsboot.c b/tools/mxsboot.c index 6d48cfb3e4..08219b34e8 100644 --- a/tools/mxsboot.c +++ b/tools/mxsboot.c @@ -48,6 +48,7 @@ static 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,