bcm63xx: refresh patches for kernel 5.4

[openwrt/staging/wigyori.git] / target / linux / bcm63xx / patches-5.4 / 400-bcm963xx_flashmap.patch

diff --git a/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch b/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch
index c693ace36324587bc76f49a617b738758b3be5cd..b80f096413b326bdaf1edbb9d8bb5ec65d6336cf 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch
+++ b/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch
@@ -21,9 +21,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  
  static struct physmap_flash_data flash_data = {
        .width                  = 2,
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -72,6 +72,7 @@ static int parse_redboot_partitions(stru
+--- a/drivers/mtd/parsers/redboot.c
++++ b/drivers/mtd/parsers/redboot.c
+@@ -79,6 +79,7 @@ static int parse_redboot_partitions(stru
        int nulllen = 0;
        int numslots;
        unsigned long offset;
@@ -31,7 +31,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
        static char nullstring[] = "unallocated";
  #endif
-@@ -176,6 +177,16 @@ static int parse_redboot_partitions(stru
+@@ -185,6 +186,16 @@ static int parse_redboot_partitions(stru
                goto out;
        }
  
@@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
        for (i = 0; i < numslots; i++) {
                struct fis_list *new_fl, **prev;
  
-@@ -196,10 +207,10 @@ static int parse_redboot_partitions(stru
+@@ -205,10 +216,10 @@ static int parse_redboot_partitions(stru
                        goto out;
                }
                new_fl->img = &buf[i];