mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
975b436cdf
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>
61 lines
1.7 KiB
Diff
61 lines
1.7 KiB
Diff
--- a/drivers/mtd/parsers/redboot.c
|
|
+++ b/drivers/mtd/parsers/redboot.c
|
|
@@ -16,6 +16,8 @@
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/module.h>
|
|
|
|
+#define BOARD_CONFIG_PART "boardconfig"
|
|
+
|
|
struct fis_image_desc {
|
|
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)
|
|
{
|
|
+ unsigned long max_offset = 0;
|
|
int nrparts = 0;
|
|
struct fis_image_desc *buf;
|
|
struct mtd_partition *parts;
|
|
@@ -239,14 +242,15 @@ nogood:
|
|
}
|
|
}
|
|
#endif
|
|
- parts = kzalloc(sizeof(*parts) * nrparts + nulllen + namelen, GFP_KERNEL);
|
|
+ parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen +
|
|
+ sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
|
|
|
|
if (!parts) {
|
|
ret = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
- nullname = (char *)&parts[nrparts];
|
|
+ nullname = (char *)&parts[nrparts + 1];
|
|
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
|
|
if (nulllen > 0)
|
|
strcpy(nullname, nullstring);
|
|
@@ -264,6 +268,8 @@ nogood:
|
|
}
|
|
#endif
|
|
for ( ; i < nrparts; i++) {
|
|
+ if (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;
|
|
@@ -297,6 +303,13 @@ nogood:
|
|
fl = fl->next;
|
|
kfree(tmp_fl);
|
|
}
|
|
+ if (master->size - max_offset >= master->erasesize) {
|
|
+ parts[nrparts].size = master->size - max_offset;
|
|
+ parts[nrparts].offset = max_offset;
|
|
+ parts[nrparts].name = names;
|
|
+ strcpy(names, BOARD_CONFIG_PART);
|
|
+ nrparts++;
|
|
+ }
|
|
ret = nrparts;
|
|
*pparts = parts;
|
|
out:
|