diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-04-03 15:28:10 +0200 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-04-12 12:36:43 +0200 |
commit | 04c07e05a119d860b4d3b3191ff78d699aa5c209 (patch) | |
tree | 81c249a041728ae46aef05e47ea33e5fd240432f /target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch | |
parent | f8f1dc6eab935f90b31401d87f412e3f8769dfd0 (diff) | |
download | upstream-04c07e05a119d860b4d3b3191ff78d699aa5c209.tar.gz upstream-04c07e05a119d860b4d3b3191ff78d699aa5c209.tar.bz2 upstream-04c07e05a119d860b4d3b3191ff78d699aa5c209.zip |
bcm63xx: refresh patches for kernel 5.4
Refresh patches to make them apply to kernel 5.4.
The removed patches have been merged upstream.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch')
-rw-r--r-- | target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 c693ace363..b80f096413 100644 --- 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]; |