diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-27 11:42:19 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 11:00:33 +0100 |
| commit | 3cbe9b9ae936f4d43be5a792ea07ec27ca674ba0 (patch) | |
| tree | 2b470ecaec3abeee3c37d7f450ed41516b7a6281 /include | |
| parent | 68bd6e930953d2a289adf3b141d3a33b93a1e580 (diff) | |
| download | barebox-3cbe9b9ae936f4d43be5a792ea07ec27ca674ba0.tar.gz barebox-3cbe9b9ae936f4d43be5a792ea07ec27ca674ba0.tar.xz | |
mtd: nand: replace NAND_USE_FLASH_BBT with NAND_BBT_USE_FLASH
To sync with the kernel.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/bbm.h | 6 | ||||
| -rw-r--r-- | include/linux/mtd/nand.h | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h index 503ec6d357..d546f40cd8 100644 --- a/include/linux/mtd/bbm.h +++ b/include/linux/mtd/bbm.h @@ -80,6 +80,12 @@ struct nand_bbt_descr { /* Search good / bad pattern on the first and the second page */ #define NAND_BBT_SCAN2NDPAGE 0x00004000 +/* + * Use a flash based bad block table. By default, OOB identifier is saved in + * OOB area. This option is passed to the default bad block table function. + */ +#define NAND_BBT_USE_FLASH 0x00020000 + /* The maximum number of blocks to scan for a bbt */ #define NAND_BBT_SCAN_MAXBLOCKS 4 diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index d8331f4b44..dc141a5186 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -189,9 +189,6 @@ typedef enum { #define NAND_CHIPOPTIONS_MSK (0x0000ffff & ~NAND_NO_AUTOINCR) /* Non chip related options */ -/* Use a flash based bad block table. This option is passed to the - * default bad block table function. */ -#define NAND_USE_FLASH_BBT 0x00010000 /* This option skips the bbt scan during initialization. */ #define NAND_SKIP_BBTSCAN 0x00020000 /* This option is defined if the board driver allocates its own buffers @@ -409,6 +406,9 @@ struct nand_buffers { * @data_poi: [INTERN] pointer to a data buffer * @options: [BOARDSPECIFIC] various chip options. They can partly be set to inform nand_scan about * special functionality. See the defines for further explanation + * @bbt_options: [INTERN] bad block specific options. All options used + * here must come from bbm.h. By default, these options + * will be copied to the appropriate nand_bbt_descr's. * @badblockpos: [INTERN] position of the bad block marker in the oob area * @cellinfo: [INTERN] MLC/multichip data from chip ident * @numchips: [INTERN] number of physical chips @@ -459,6 +459,7 @@ struct nand_chip { int chip_delay; unsigned int options; + unsigned int bbt_options; int page_shift; int phys_erase_shift; |