diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-03-13 02:57:41 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-13 02:57:41 +0000 |
commit | bc66ec6772d914dd5b533aa9e059df2588620b22 (patch) | |
tree | 3d78ff3229d7488a1071db66bb2062287b98b65a /target/linux/atheros/patches-3.18/141-redboot_partition_scan.patch | |
parent | 5dcaa0ab0905342f3d5fa590f056ffa0111bb9c5 (diff) | |
download | master-187ad058-bc66ec6772d914dd5b533aa9e059df2588620b22.tar.gz master-187ad058-bc66ec6772d914dd5b533aa9e059df2588620b22.tar.bz2 master-187ad058-bc66ec6772d914dd5b533aa9e059df2588620b22.zip |
atheros: add v3.18 support
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44705 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-3.18/141-redboot_partition_scan.patch')
-rw-r--r-- | target/linux/atheros/patches-3.18/141-redboot_partition_scan.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-3.18/141-redboot_partition_scan.patch b/target/linux/atheros/patches-3.18/141-redboot_partition_scan.patch new file mode 100644 index 0000000000..d1d281eaf4 --- /dev/null +++ b/target/linux/atheros/patches-3.18/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; |