diff options
author | matteo <matteo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-02-28 15:30:07 +0000 |
---|---|---|
committer | matteo <matteo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-02-28 15:30:07 +0000 |
commit | a569d19be442c8437a51cc63a94bc1f7dbeee29c (patch) | |
tree | b7eda6a62c8ae4669a2aa463e01ce97bcf1e17aa /target/linux/atheros/patches-2.6.33/140-redboot_partition_scan.patch | |
parent | 277b4f4f307b33f0d51359a82e868a1783f4e62f (diff) |
atheros: 2.6.33 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19906 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-2.6.33/140-redboot_partition_scan.patch')
-rw-r--r-- | target/linux/atheros/patches-2.6.33/140-redboot_partition_scan.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-2.6.33/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.33/140-redboot_partition_scan.patch new file mode 100644 index 000000000..289d4eb99 --- /dev/null +++ b/target/linux/atheros/patches-2.6.33/140-redboot_partition_scan.patch @@ -0,0 +1,54 @@ +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -60,31 +60,32 @@ 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 (master->block_isbad && ++ while (master->block_isbad && + master->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; + } + } else { + offset = directory * master->erasesize; +- while (master->block_isbad && ++ while (master->block_isbad && + master->block_isbad(master, offset)) { + offset += master->erasesize; + if (offset == master->size) + 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); + +@@ -156,6 +157,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; |