diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-19 12:06:55 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-19 12:06:55 +0100 |
| commit | 1528db03143fc81e00e7a48880ab834b6907117b (patch) | |
| tree | a6ca37852821f95cd8242e8b464cf5d6ef9dfd73 /drivers/mtd | |
| parent | bfba1b6cab3213409fdb709ee3646300f6550883 (diff) | |
| parent | 790266c24de9582b56872ef5ee869442fbb76fa5 (diff) | |
| download | barebox-1528db03143fc81e00e7a48880ab834b6907117b.tar.gz barebox-1528db03143fc81e00e7a48880ab834b6907117b.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 20f9f33713..1cc29a8eca 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -41,16 +41,21 @@ config NAND_INFO Show informational strings about the vendor and nand flash type during startup +config NAND_READ_OOB + bool + config NAND_BBT bool + select NAND_READ_OOB default y prompt "support bad block tables" help Say y here to include support for bad block tables. This speeds up the process of checking for bad blocks -config NAND_READ_OOB +config NAND_OOB_DEVICE bool + select NAND_READ_OOB default y prompt "create a device for reading the OOB data" diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c index 6db21d637c..130e2af3be 100644 --- a/drivers/mtd/nand/nand.c +++ b/drivers/mtd/nand/nand.c @@ -186,7 +186,7 @@ static struct file_operations nand_ops = { .lseek = dev_lseek_default, }; -#ifdef CONFIG_NAND_READ_OOB +#ifdef CONFIG_NAND_OOB_DEVICE static ssize_t nand_read_oob(struct cdev *cdev, void *buf, size_t count, ulong offset, ulong flags) { struct mtd_info *info = cdev->priv; |