summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-03-03 15:15:07 +0100
committerWolfgang Denk <wd@denx.de>2012-03-03 15:15:07 +0100
commite91004201c4265edf7897c4f8e0c21cd1dce0505 (patch)
tree97ca0cd21a4909774d9475f3198b610eeb7324c9 /include
parent8a1239e74cdf4d94738eb71928769d6e78bcc78c (diff)
parentcfdae12f37ad126d1198f6c1ffa4ada9e69dd206 (diff)
downloadu-boot-imx-e91004201c4265edf7897c4f8e0c21cd1dce0505.zip
u-boot-imx-e91004201c4265edf7897c4f8e0c21cd1dce0505.tar.gz
u-boot-imx-e91004201c4265edf7897c4f8e0c21cd1dce0505.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
* 'master' of git://git.denx.de/u-boot-nand-flash: cmd_nand.c: Fix 'nand dump' after latest MTD resync mtd/nand:Fix wrong usage of is_blank() in fsl_ifc_run_command mtd/nand: Fix IFC driver to support 2K NAND page nand: reinstate lazy bad block scanning Revert "nand: make 1-bit software ECC configurable"
Diffstat (limited to 'include')
-rw-r--r--include/linux/mtd/nand.h2
-rw-r--r--include/linux/mtd/nand_ecc.h25
2 files changed, 2 insertions, 25 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 99668d5..da6fa18 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -232,6 +232,8 @@ typedef enum {
#define NAND_CREATE_EMPTY_BBT 0x01000000
/* Options set by nand scan */
+/* bbt has already been read */
+#define NAND_BBT_SCANNED 0x40000000
/* Nand scan has allocated controller struct */
#define NAND_CONTROLLER_ALLOC 0x80000000
diff --git a/include/linux/mtd/nand_ecc.h b/include/linux/mtd/nand_ecc.h
index 9715a53..090da50 100644
--- a/include/linux/mtd/nand_ecc.h
+++ b/include/linux/mtd/nand_ecc.h
@@ -15,10 +15,6 @@
struct mtd_info;
-#if defined(CONFIG_MTD_ECC_SOFT)
-
-static inline int mtd_nand_has_ecc_soft(void) { return 1; }
-
/*
* Calculate 3 byte ECC code for 256 byte block
*/
@@ -29,25 +25,4 @@ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code
*/
int nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc);
-#else
-
-static inline int mtd_nand_has_ecc_soft(void) { return 0; }
-
-static inline int
-nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)
-{
- return -1;
-}
-
-static inline int
-nand_correct_data(struct mtd_info *mtd,
- u_char *dat,
- u_char *read_ecc,
- u_char *calc_ecc)
-{
- return -1;
-}
-
-#endif
-
#endif /* __MTD_NAND_ECC_H__ */