diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-18 23:51:48 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-19 22:47:17 +0200 |
| commit | a1d50e7b45080f60a0066e9ca88ad756480dd1f8 (patch) | |
| tree | 22dcfbbc4fc62d12483e9ffb961385d2da9993f3 /target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch | |
| parent | 88c8d0a2193bd3dd2cf00bc875def6155f2e34db (diff) | |
| download | upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.tar.gz upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.tar.bz2 upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.zip | |
kernel: bump 5.4 to 5.4.132
Manually rebased
layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch
All others updated automatically.
Compile-tested on: ramips/mt7621
Runtime-tested on: ramips/mt7621
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.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 | 6 |
1 files changed, 3 insertions, 3 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 f57950b44a..5a9532c321 100644 --- a/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch +++ b/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch @@ -23,7 +23,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> .width = 2, --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -79,6 +79,7 @@ static int parse_redboot_partitions(stru +@@ -84,6 +84,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 -@@ -185,6 +186,16 @@ static int parse_redboot_partitions(stru +@@ -190,6 +191,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; -@@ -205,10 +216,10 @@ static int parse_redboot_partitions(stru +@@ -210,10 +221,10 @@ static int parse_redboot_partitions(stru goto out; } new_fl->img = &buf[i]; |