diff options
author | John Crispin <blogic@openwrt.org> | 2012-11-12 07:56:37 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2012-11-12 07:56:37 +0000 |
commit | f0675c7cae3ca392dba128fcca72b484167a8c1c (patch) | |
tree | ae06006a96f10499ccc466d89e0cd14368770f2c /target/linux/atheros/patches-3.3/141-redboot_partition_scan.patch | |
parent | 505a81f173aad0941645e039df6154ff5f8def8e (diff) | |
download | master-187ad058-f0675c7cae3ca392dba128fcca72b484167a8c1c.tar.gz master-187ad058-f0675c7cae3ca392dba128fcca72b484167a8c1c.tar.bz2 master-187ad058-f0675c7cae3ca392dba128fcca72b484167a8c1c.zip |
[atheros] move redboot boardconfig patch into target folder
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34166 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-3.3/141-redboot_partition_scan.patch')
-rw-r--r-- | target/linux/atheros/patches-3.3/141-redboot_partition_scan.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-3.3/141-redboot_partition_scan.patch b/target/linux/atheros/patches-3.3/141-redboot_partition_scan.patch new file mode 100644 index 0000000000..c83823a219 --- /dev/null +++ b/target/linux/atheros/patches-3.3/141-redboot_partition_scan.patch @@ -0,0 +1,45 @@ +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -79,6 +79,11 @@ 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_can_have_bb(master) && +@@ -86,6 +91,7 @@ static int parse_redboot_partitions(stru + 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; +@@ -99,10 +105,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); +@@ -175,6 +177,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; |