aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.18
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-03-17 07:07:00 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-03-17 07:07:00 +0000
commit917fb7632186137dc7750b3f010be729718369fb (patch)
tree4dc9cdc4983288d1b9ee33432ebcba5d006c7eb6 /target/linux/brcm47xx/patches-3.18
parent8f63c1405f4dcbe354ad18e1f36a3b768bdf6d0b (diff)
downloadupstream-917fb7632186137dc7750b3f010be729718369fb.tar.gz
upstream-917fb7632186137dc7750b3f010be729718369fb.tar.bz2
upstream-917fb7632186137dc7750b3f010be729718369fb.zip
brcm47xx: rename (and refresh) MTD patch for safety "nvram" partition
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 44854
Diffstat (limited to 'target/linux/brcm47xx/patches-3.18')
-rw-r--r--target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch (renamed from target/linux/brcm47xx/patches-3.18/027-mtd-bcm47xxpart-get-nvram.patch)8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/027-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch
index 47f51ef8b0..df51191ad8 100644
--- a/target/linux/brcm47xx/patches-3.18/027-mtd-bcm47xxpart-get-nvram.patch
+++ b/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch
@@ -1,14 +1,14 @@
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
-@@ -93,6 +93,7 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -97,6 +97,7 @@ static int bcm47xxpart_parse(struct mtd_
int trx_part = -1;
int last_trx_part = -1;
int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
+ bool found_nvram = false;
- if (blocksize <= 0x10000)
- blocksize = 0x10000;
-@@ -281,12 +282,23 @@ static int bcm47xxpart_parse(struct mtd_
+ /*
+ * Some really old flashes (like AT45DB*) had smaller erasesize-s, but
+@@ -300,12 +301,23 @@ static int bcm47xxpart_parse(struct mtd_
if (buf[0] == NVRAM_HEADER) {
bcm47xxpart_add_part(&parts[curr_part++], "nvram",
master->size - blocksize, 0);