diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2013-01-14 03:46:50 +0000 | 
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-05-31 17:12:03 -0500 | 
| commit | dfe64e2c89731a3f9950d7acd8681b68df2bae03 (patch) | |
| tree | 880eae93d5f4bd3e9747960eea71502c67e49d8e /drivers/mtd/ubi/build.c | |
| parent | a1b81ab26fbbdcbaa6e2a096397c75415181c298 (diff) | |
| download | olio-uboot-2014.01-dfe64e2c89731a3f9950d7acd8681b68df2bae03.tar.xz olio-uboot-2014.01-dfe64e2c89731a3f9950d7acd8681b68df2bae03.zip | |
mtd: resync with Linux-3.7.1
This patch is essentially an update of u-boot MTD subsystem to
the state of Linux-3.7.1 with exclusion of some bits:
- the update is concentrated on NAND, no onenand or CFI/NOR/SPI
flashes interfaces are updated EXCEPT for API changes.
- new large NAND chips support is there, though some updates
have got in Linux-3.8.-rc1, (which will follow on top of this patch).
To produce this update I used tag v3.7.1 of linux-stable repository.
The update was made using application of relevant patches,
with changes relevant to U-Boot-only stuff sticked together
to keep bisectability. Then all changes were grouped together
to this patch.
Signed-off-by: Sergey Lapin <slapin@ossfans.org>
[scottwood@freescale.com: some eccstrength and build fixes]
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers/mtd/ubi/build.c')
| -rw-r--r-- | drivers/mtd/ubi/build.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index a708162e4..25888220d 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -539,7 +539,7 @@ static int io_init(struct ubi_device *ubi)  	ubi->peb_count  = mtd_div_by_eb(ubi->mtd->size, ubi->mtd);  	ubi->flash_size = ubi->mtd->size; -	if (ubi->mtd->block_isbad && ubi->mtd->block_markbad) +	if (mtd_can_have_bb(ubi->mtd))  		ubi->bad_allowed = 1;  	ubi->min_io_size = ubi->mtd->writesize; |