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>
45 lines
1.1 KiB
Diff
45 lines
1.1 KiB
Diff
--- a/drivers/mtd/parsers/redboot.c
|
|
+++ b/drivers/mtd/parsers/redboot.c
|
|
@@ -94,12 +94,18 @@ static int parse_redboot_partitions(stru
|
|
|
|
parse_redboot_of(master);
|
|
|
|
+ buf = vmalloc(master->erasesize);
|
|
+ if (!buf)
|
|
+ return -ENOMEM;
|
|
+
|
|
+restart:
|
|
if (directory < 0) {
|
|
offset = master->size + directory * master->erasesize;
|
|
while (mtd_block_isbad(master, offset)) {
|
|
if (!offset) {
|
|
nogood:
|
|
pr_notice("Failed to find a non-bad block to check for RedBoot partition table\n");
|
|
+ vfree(buf);
|
|
return -EIO;
|
|
}
|
|
offset -= master->erasesize;
|
|
@@ -112,10 +118,6 @@ nogood:
|
|
goto nogood;
|
|
}
|
|
}
|
|
- buf = vmalloc(master->erasesize);
|
|
-
|
|
- if (!buf)
|
|
- return -ENOMEM;
|
|
|
|
pr_notice("Searching for RedBoot partition table in %s at offset 0x%lx\n",
|
|
master->name, offset);
|
|
@@ -187,6 +189,11 @@ nogood:
|
|
}
|
|
if (i == numslots) {
|
|
/* Didn't find it */
|
|
+ if (offset + master->erasesize < master->size) {
|
|
+ /* not at the end of the flash yet, maybe next block */
|
|
+ directory++;
|
|
+ goto restart;
|
|
+ }
|
|
pr_notice("No RedBoot partition table detected in %s\n",
|
|
master->name);
|
|
ret = 0;
|