diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-30 13:19:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-30 13:19:53 +0000 |
| commit | 2530640f07cd2b3b14fe9ec03fa63a586452cc5f (patch) | |
| tree | da4d0e63a6771cbd044d3ba8d8dc97bd0615920f /target/linux/ar71xx/patches-4.4/408-mtd-redboot_partition_scan.patch | |
| parent | e5b5cce442f6fdaccf86064657518a5d0404f78e (diff) | |
| download | upstream-2530640f07cd2b3b14fe9ec03fa63a586452cc5f.tar.gz upstream-2530640f07cd2b3b14fe9ec03fa63a586452cc5f.tar.bz2 upstream-2530640f07cd2b3b14fe9ec03fa63a586452cc5f.zip | |
ar71xx: add support for linux 4.4
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48563
Diffstat (limited to 'target/linux/ar71xx/patches-4.4/408-mtd-redboot_partition_scan.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-4.4/408-mtd-redboot_partition_scan.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-4.4/408-mtd-redboot_partition_scan.patch b/target/linux/ar71xx/patches-4.4/408-mtd-redboot_partition_scan.patch new file mode 100644 index 0000000000..cd41e7ceb2 --- /dev/null +++ b/target/linux/ar71xx/patches-4.4/408-mtd-redboot_partition_scan.patch @@ -0,0 +1,44 @@ +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -76,12 +76,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; +@@ -94,10 +100,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); +@@ -170,6 +172,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; |