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/ath79/patches-5.4/408-mtd-redboot_partition_scan.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/ath79/patches-5.4/408-mtd-redboot_partition_scan.patch')
-rw-r--r-- | target/linux/ath79/patches-5.4/408-mtd-redboot_partition_scan.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ath79/patches-5.4/408-mtd-redboot_partition_scan.patch b/target/linux/ath79/patches-5.4/408-mtd-redboot_partition_scan.patch index 8f3ee32f57..e5b06e14a5 100644 --- a/target/linux/ath79/patches-5.4/408-mtd-redboot_partition_scan.patch +++ b/target/linux/ath79/patches-5.4/408-mtd-redboot_partition_scan.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -85,12 +85,18 @@ static int parse_redboot_partitions(stru +@@ -90,12 +90,18 @@ static int parse_redboot_partitions(stru parse_redboot_of(master); @@ -19,7 +19,7 @@ return -EIO; } offset -= master->erasesize; -@@ -103,10 +109,6 @@ static int parse_redboot_partitions(stru +@@ -108,10 +114,6 @@ static int parse_redboot_partitions(stru goto nogood; } } @@ -30,7 +30,7 @@ printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", master->name, offset); -@@ -179,6 +181,11 @@ static int parse_redboot_partitions(stru +@@ -184,6 +186,11 @@ static int parse_redboot_partitions(stru } if (i == numslots) { /* Didn't find it */ |