diff options
| author | Petr Štetiar <ynezz@true.cz> | 2022-08-22 22:45:53 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-08-28 07:24:59 +0200 |
| commit | 4209c33ae27d6bb53722e79d7c1a696ea02e25ad (patch) | |
| tree | 3cdceede555fa6e21fa8b693a578c3cf2890949e /target/linux/ath25/patches-5.10/140-redboot_boardconfig.patch | |
| parent | a901a13505e13f2d0e60ceaa85d19feea15d4cd4 (diff) | |
| download | upstream-4209c33ae27d6bb53722e79d7c1a696ea02e25ad.tar.gz upstream-4209c33ae27d6bb53722e79d7c1a696ea02e25ad.tar.bz2 upstream-4209c33ae27d6bb53722e79d7c1a696ea02e25ad.zip | |
kernel: bump 5.10 to 5.10.137
Removed following upstreamed patch:
* bcm53xx: 081-next-ARM_dts_BCM53015-add-mr26.patch
All other patches automagically rebased.
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit d1163fd13f6498826d202f0b58cedf32d7891d52)
Diffstat (limited to 'target/linux/ath25/patches-5.10/140-redboot_boardconfig.patch')
| -rw-r--r-- | target/linux/ath25/patches-5.10/140-redboot_boardconfig.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ath25/patches-5.10/140-redboot_boardconfig.patch b/target/linux/ath25/patches-5.10/140-redboot_boardconfig.patch index 81b23e863e..07d75b9fba 100644 --- a/target/linux/ath25/patches-5.10/140-redboot_boardconfig.patch +++ b/target/linux/ath25/patches-5.10/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 -@@ -72,6 +74,7 @@ static int parse_redboot_partitions(stru +@@ -73,6 +75,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; -@@ -239,14 +242,15 @@ static int parse_redboot_partitions(stru +@@ -240,14 +243,15 @@ static int parse_redboot_partitions(stru } } #endif @@ -35,7 +35,7 @@ #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED if (nulllen > 0) { strcpy(nullname, nullstring); -@@ -265,6 +269,8 @@ static int parse_redboot_partitions(stru +@@ -266,6 +270,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; -@@ -298,6 +304,13 @@ static int parse_redboot_partitions(stru +@@ -299,6 +305,13 @@ static int parse_redboot_partitions(stru fl = fl->next; kfree(tmp_fl); } |