kernel: update bcm47xxpart failsafe partition patches

[openwrt/openwrt.git] / target / linux / generic / patches-4.4 / 141-0002-mtd-bcm47xxpart-support-layouts-with-multiple-TRX-pa.patch

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 1065322fd8bc187c238909b30a0e0ddd10ae9a78..2d97be750839d6d33443388d096499bd8b85352e 100644 (file)
--- 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 */