aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath25
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-07-14 18:20:29 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-07-17 13:21:03 +0200
commit2fe1b32156a2f28013c2807d1674dd1ced1a6fa1 (patch)
tree3d76ba0cf1eae9fdf7f2dd8d7a2deb92ce8e09e5 /target/linux/ath25
parent269e49577b8d8c49a2694cb8e9939822cd7c9eb3 (diff)
downloadupstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.tar.gz
upstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.tar.bz2
upstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.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 other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/ath25')
-rw-r--r--target/linux/ath25/patches-5.4/140-redboot_boardconfig.patch8
-rw-r--r--target/linux/ath25/patches-5.4/141-redboot_partition_scan.patch6
-rw-r--r--target/linux/ath25/patches-5.4/142-redboot_various_erase_size_fix.patch10
3 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/ath25/patches-5.4/140-redboot_boardconfig.patch b/target/linux/ath25/patches-5.4/140-redboot_boardconfig.patch
index 0ffa12eec0..81b23e863e 100644
--- a/target/linux/ath25/patches-5.4/140-redboot_boardconfig.patch
+++ b/target/linux/ath25/patches-5.4/140-redboot_boardconfig.patch
@@ -9,7 +9,7 @@
struct fis_image_desc {
unsigned char name[16]; // Null terminated name
uint32_t flash_base; // Address within FLASH of image
-@@ -67,6 +69,7 @@ static int parse_redboot_partitions(stru
+@@ -72,6 +74,7 @@ static int parse_redboot_partitions(stru
const struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
@@ -17,7 +17,7 @@
int nrparts = 0;
struct fis_image_desc *buf;
struct mtd_partition *parts;
-@@ -234,14 +237,15 @@ static int parse_redboot_partitions(stru
+@@ -239,14 +242,15 @@ static int parse_redboot_partitions(stru
}
}
#endif
@@ -35,7 +35,7 @@
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
if (nulllen > 0) {
strcpy(nullname, nullstring);
-@@ -260,6 +264,8 @@ static int parse_redboot_partitions(stru
+@@ -265,6 +269,8 @@ static int parse_redboot_partitions(stru
}
#endif
for ( ; i<nrparts; i++) {
@@ -44,7 +44,7 @@
parts[i].size = fl->img->size;
parts[i].offset = fl->img->flash_base;
parts[i].name = names;
-@@ -293,6 +299,13 @@ static int parse_redboot_partitions(stru
+@@ -298,6 +304,13 @@ static int parse_redboot_partitions(stru
fl = fl->next;
kfree(tmp_fl);
}
diff --git a/target/linux/ath25/patches-5.4/141-redboot_partition_scan.patch b/target/linux/ath25/patches-5.4/141-redboot_partition_scan.patch
index 3302d6d247..343eedc075 100644
--- a/target/linux/ath25/patches-5.4/141-redboot_partition_scan.patch
+++ b/target/linux/ath25/patches-5.4/141-redboot_partition_scan.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/parsers/redboot.c
+++ b/drivers/mtd/parsers/redboot.c
-@@ -88,12 +88,18 @@ static int parse_redboot_partitions(stru
+@@ -93,12 +93,18 @@ static int parse_redboot_partitions(stru
parse_redboot_of(master);
@@ -19,7 +19,7 @@
return -EIO;
}
offset -= master->erasesize;
-@@ -106,10 +112,6 @@ static int parse_redboot_partitions(stru
+@@ -111,10 +117,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);
-@@ -182,6 +184,11 @@ static int parse_redboot_partitions(stru
+@@ -187,6 +189,11 @@ static int parse_redboot_partitions(stru
}
if (i == numslots) {
/* Didn't find it */
diff --git a/target/linux/ath25/patches-5.4/142-redboot_various_erase_size_fix.patch b/target/linux/ath25/patches-5.4/142-redboot_various_erase_size_fix.patch
index 2ac0eb92bf..55cf84eeff 100644
--- a/target/linux/ath25/patches-5.4/142-redboot_various_erase_size_fix.patch
+++ b/target/linux/ath25/patches-5.4/142-redboot_various_erase_size_fix.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/parsers/redboot.c
+++ b/drivers/mtd/parsers/redboot.c
-@@ -65,6 +65,22 @@ static void parse_redboot_of(struct mtd_
+@@ -70,6 +70,22 @@ static void parse_redboot_of(struct mtd_
directory = dirblock;
}
@@ -23,7 +23,7 @@
static int parse_redboot_partitions(struct mtd_info *master,
const struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
-@@ -81,6 +97,7 @@ static int parse_redboot_partitions(stru
+@@ -86,6 +102,7 @@ static int parse_redboot_partitions(stru
int namelen = 0;
int nulllen = 0;
int numslots;
@@ -31,7 +31,7 @@
unsigned long offset;
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
static char nullstring[] = "unallocated";
-@@ -195,7 +212,10 @@ static int parse_redboot_partitions(stru
+@@ -200,7 +217,10 @@ static int parse_redboot_partitions(stru
goto out;
}
@@ -43,7 +43,7 @@
struct fis_list *new_fl, **prev;
if (buf[i].name[0] == 0xff) {
-@@ -271,12 +291,13 @@ static int parse_redboot_partitions(stru
+@@ -276,12 +296,13 @@ static int parse_redboot_partitions(stru
}
#endif
for ( ; i<nrparts; i++) {
@@ -59,7 +59,7 @@
strcpy(names, fl->img->name);
#ifdef CONFIG_MTD_REDBOOT_PARTS_READONLY
if (!memcmp(names, "RedBoot", 8) ||
-@@ -306,7 +327,9 @@ static int parse_redboot_partitions(stru
+@@ -311,7 +332,9 @@ static int parse_redboot_partitions(stru
fl = fl->next;
kfree(tmp_fl);
}