diff options
author | Nick Hainke <vincent@systemli.org> | 2022-09-28 11:23:24 +0200 |
---|---|---|
committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-12 13:02:42 +0200 |
commit | 975b436cdf05e53e4792f14f9f601759416761fb (patch) | |
tree | 063a9df5315531c29aafc1374074cbaffdad47be /target/linux/ath25/patches-5.15/140-redboot_boardconfig.patch | |
parent | d7ab4d76b12ce01c792b3e51974e20463185d4ca (diff) | |
download | upstream-975b436cdf05e53e4792f14f9f601759416761fb.tar.gz upstream-975b436cdf05e53e4792f14f9f601759416761fb.tar.bz2 upstream-975b436cdf05e53e4792f14f9f601759416761fb.zip |
ath25: 5.15: enable 5.15 testing kernel
Manually refreshed:
- 140-redboot_boardconfig.patch
- 141-redboot_partition_scan.patch
- 142-redboot_various_erase_size_fix.patch
Automatically refreshed:
- 107-ar5312_gpio.patch
- 108-ar2315_gpio.patch
- 110-ar2313_ethernet.patch
- 120-spiflash.patch
- 130-watchdog.patch
- 330-board_leds.patch
Use "make kernel_oldconfig" to refresh the new kernel config.
The Ubiquiti Nanostation 2 (XS2) and Ubiquiti Nanostation 5 (XS5) should
be marked as broken when switching to 5.15 by default. The new kernel
does not fit anymore into the partition.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Diffstat (limited to 'target/linux/ath25/patches-5.15/140-redboot_boardconfig.patch')
-rw-r--r-- | target/linux/ath25/patches-5.15/140-redboot_boardconfig.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/ath25/patches-5.15/140-redboot_boardconfig.patch b/target/linux/ath25/patches-5.15/140-redboot_boardconfig.patch index 07d75b9fba..5f506aaa3a 100644 --- a/target/linux/ath25/patches-5.15/140-redboot_boardconfig.patch +++ b/target/linux/ath25/patches-5.15/140-redboot_boardconfig.patch @@ -7,8 +7,8 @@ +#define BOARD_CONFIG_PART "boardconfig" + struct fis_image_desc { - unsigned char name[16]; // Null terminated name - uint32_t flash_base; // Address within FLASH of image + unsigned char name[16]; // Null terminated name + u32 flash_base; // Address within FLASH of image @@ -73,6 +75,7 @@ static int parse_redboot_partitions(stru const struct mtd_partition **pparts, struct mtd_part_parser_data *data) @@ -17,11 +17,11 @@ int nrparts = 0; struct fis_image_desc *buf; struct mtd_partition *parts; -@@ -240,14 +243,15 @@ static int parse_redboot_partitions(stru +@@ -239,14 +242,15 @@ nogood: } } #endif -- parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL); +- parts = kzalloc(sizeof(*parts) * nrparts + nulllen + namelen, GFP_KERNEL); + parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + + sizeof(BOARD_CONFIG_PART), GFP_KERNEL); @@ -33,18 +33,18 @@ - nullname = (char *)&parts[nrparts]; + nullname = (char *)&parts[nrparts + 1]; #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED - if (nulllen > 0) { + if (nulllen > 0) strcpy(nullname, nullstring); -@@ -266,6 +270,8 @@ static int parse_redboot_partitions(stru +@@ -264,6 +268,8 @@ nogood: } #endif - for ( ; i<nrparts; i++) { + for ( ; i < nrparts; i++) { + if (max_offset < buf[i].flash_base + buf[i].size) -+ max_offset = buf[i].flash_base + buf[i].size; ++ max_offset = buf[i].flash_base + buf[i].size; parts[i].size = fl->img->size; parts[i].offset = fl->img->flash_base; parts[i].name = names; -@@ -299,6 +305,13 @@ static int parse_redboot_partitions(stru +@@ -297,6 +303,13 @@ nogood: fl = fl->next; kfree(tmp_fl); } |