diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-08-18 21:57:54 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-08-18 21:57:54 +0000 |
| commit | c41d5581c190d6feba0232a32bc99e8a3d307555 (patch) | |
| tree | 883519b0efc61edaa6bac4d25f40b06e8ac45bf3 /target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch | |
| parent | d2fc14ca6c9e36f50c7ba4989496793d9904db1a (diff) | |
| download | upstream-c41d5581c190d6feba0232a32bc99e8a3d307555.tar.gz upstream-c41d5581c190d6feba0232a32bc99e8a3d307555.tar.bz2 upstream-c41d5581c190d6feba0232a32bc99e8a3d307555.zip | |
kernel: 3.14: update bcm47xxpart
It it used by brcm47xx and bcm53xx targets, so put patches in generic.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42212 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch b/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch new file mode 100644 index 0000000000..48f8d36da4 --- /dev/null +++ b/target/linux/generic/patches-3.14/049-mtd-bcm47xxpart-find-NVRAM-partitions-in-middle-bloc.patch @@ -0,0 +1,19 @@ +--- a/drivers/mtd/bcm47xxpart.c ++++ b/drivers/mtd/bcm47xxpart.c +@@ -199,6 +199,16 @@ static int bcm47xxpart_parse(struct mtd_ + continue; + } + ++ /* New (ARM?) devices may have NVRAM in some middle block. Last ++ * block will be checked later, so skip it. ++ */ ++ if (offset != master->size - blocksize && ++ buf[0x000 / 4] == NVRAM_HEADER) { ++ bcm47xxpart_add_part(&parts[curr_part++], "nvram", ++ offset, 0); ++ continue; ++ } ++ + /* Read middle of the block */ + if (mtd_read(master, offset + 0x8000, 0x4, + &bytes_read, (uint8_t *)buf) < 0) { |