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/311-bcm63xxpart_use_cfedetection.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/311-bcm63xxpart_use_cfedetection.patch')
| -rw-r--r-- | target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch b/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch index bca6adbf3c..19ed994b85 100644 --- a/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch +++ b/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch @@ -1,6 +1,6 @@ ---- a/drivers/mtd/bcm63xxpart.c -+++ b/drivers/mtd/bcm63xxpart.c -@@ -35,6 +35,8 @@ +--- a/drivers/mtd/parsers/bcm63xxpart.c ++++ b/drivers/mtd/parsers/bcm63xxpart.c +@@ -21,6 +21,8 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/of.h> @@ -9,7 +9,7 @@ #define BCM963XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */ -@@ -46,30 +48,6 @@ +@@ -32,30 +34,6 @@ #define STR_NULL_TERMINATE(x) \ do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0) @@ -40,7 +40,7 @@ static int bcm63xx_read_nvram(struct mtd_info *master, struct bcm963xx_nvram *nvram) { -@@ -152,7 +130,7 @@ static int bcm63xx_parse_cfe_partitions( +@@ -138,7 +116,7 @@ static int bcm63xx_parse_cfe_partitions( struct bcm963xx_nvram *nvram = NULL; int ret; |