diff options
| author | Sergey Ryazanov <ryazanov.s.a@gmail.com> | 2017-06-07 01:49:35 +0300 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2017-06-07 06:46:34 +0200 |
| commit | 64083848e2e9924c154aef047ae857e67409d5bf (patch) | |
| tree | 87cc9655f01b0da7fdbbc74c7c0588e3d7fc2b2d /target/linux/ath25/patches-4.9/141-redboot_partition_scan.patch | |
| parent | 9715beb04c74a918697945b3e2d23a139bd04b70 (diff) | |
| download | upstream-64083848e2e9924c154aef047ae857e67409d5bf.tar.gz upstream-64083848e2e9924c154aef047ae857e67409d5bf.tar.bz2 upstream-64083848e2e9924c154aef047ae857e67409d5bf.zip | |
ath25: add preliminary kernel 4.9 support
Copy and refresh patches and config from 4.4
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Diffstat (limited to 'target/linux/ath25/patches-4.9/141-redboot_partition_scan.patch')
| -rw-r--r-- | target/linux/ath25/patches-4.9/141-redboot_partition_scan.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/ath25/patches-4.9/141-redboot_partition_scan.patch b/target/linux/ath25/patches-4.9/141-redboot_partition_scan.patch new file mode 100644 index 0000000000..d1d281eaf4 --- /dev/null +++ b/target/linux/ath25/patches-4.9/141-redboot_partition_scan.patch @@ -0,0 +1,44 @@ +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -79,12 +79,18 @@ static int parse_redboot_partitions(stru + static char nullstring[] = "unallocated"; + #endif + ++ 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: + printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n"); ++ vfree(buf); + return -EIO; + } + offset -= master->erasesize; +@@ -97,10 +103,6 @@ static int parse_redboot_partitions(stru + goto nogood; + } + } +- buf = vmalloc(master->erasesize); +- +- if (!buf) +- return -ENOMEM; + + printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", + master->name, offset); +@@ -173,6 +175,11 @@ static int parse_redboot_partitions(stru + } + 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; ++ } + printk(KERN_NOTICE "No RedBoot partition table detected in %s\n", + master->name); + ret = 0; |