aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.4/141-0002-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-01-11 09:53:44 +0100
committerRafał Miłecki <rafal@milecki.pl>2017-01-11 09:54:47 +0100
commit7c8a36340c3a5f0443329731ada1be43489d3050 (patch)
tree6cde5afb583b4b975bcc4820115662f26c30eee8 /target/linux/generic/patches-4.4/141-0002-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch
parent593240075f8d3074164ffce99ab67a88277f9fb3 (diff)
downloadupstream-7c8a36340c3a5f0443329731ada1be43489d3050.tar.gz
upstream-7c8a36340c3a5f0443329731ada1be43489d3050.tar.bz2
upstream-7c8a36340c3a5f0443329731ada1be43489d3050.zip
kernel: update bcm47xxpart failsafe partition patches
V2 using helper function was sent for upstream kernel Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.4/141-0002-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch')
-rw-r--r--target/linux/generic/patches-4.4/141-0002-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-4.4/141-0002-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch b/target/linux/generic/patches-4.4/141-0002-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch
index 1065322fd8..2d97be7508 100644
--- a/target/linux/generic/patches-4.4/141-0002-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch
+++ b/target/linux/generic/patches-4.4/141-0002-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch
@@ -24,7 +24,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-@@ -147,6 +148,30 @@ static int bcm47xxpart_parse_trx(struct
+@@ -144,6 +145,30 @@ static int bcm47xxpart_parse_trx(struct
return curr_part;
}
@@ -55,7 +55,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
static int bcm47xxpart_parse(struct mtd_info *master,
struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
-@@ -157,7 +182,8 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -154,7 +179,8 @@ static int bcm47xxpart_parse(struct mtd_
size_t bytes_read;
uint32_t offset;
uint32_t blocksize = master->erasesize;
@@ -65,7 +65,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
int err;
-@@ -246,7 +272,11 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -243,7 +269,11 @@ static int bcm47xxpart_parse(struct mtd_
if (buf[0x000 / 4] == TRX_MAGIC) {
struct trx_header *trx;
@@ -78,7 +78,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
bcm47xxpart_add_part(&parts[curr_part++], "firmware",
offset, 0);
-@@ -332,14 +362,20 @@ static int bcm47xxpart_parse(struct mtd_
+@@ -329,14 +359,20 @@ static int bcm47xxpart_parse(struct mtd_
}
/* If there was TRX parse it now */