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/141-redboot_partition_scan.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/141-redboot_partition_scan.patch')
| -rw-r--r-- | target/linux/ath25/patches-5.15/141-redboot_partition_scan.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/ath25/patches-5.15/141-redboot_partition_scan.patch b/target/linux/ath25/patches-5.15/141-redboot_partition_scan.patch index 68019f90ea..f9c98c9a37 100644 --- a/target/linux/ath25/patches-5.15/141-redboot_partition_scan.patch +++ b/target/linux/ath25/patches-5.15/141-redboot_partition_scan.patch @@ -8,18 +8,18 @@ + if (!buf) + return -ENOMEM; + -+ restart: - if ( directory < 0 ) { ++restart: + if (directory < 0) { offset = master->size + directory * master->erasesize; while (mtd_block_isbad(master, offset)) { if (!offset) { - nogood: - printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n"); + 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 @@ static int parse_redboot_partitions(stru +@@ -112,10 +118,6 @@ nogood: goto nogood; } } @@ -28,9 +28,9 @@ - if (!buf) - return -ENOMEM; - printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", - master->name, offset); -@@ -188,6 +190,11 @@ static int parse_redboot_partitions(stru + 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 */ @@ -39,6 +39,6 @@ + directory++; + goto restart; + } - printk(KERN_NOTICE "No RedBoot partition table detected in %s\n", - master->name); + pr_notice("No RedBoot partition table detected in %s\n", + master->name); ret = 0; |