diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-02-21 17:45:54 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-02-21 17:45:54 +0000 |
commit | 14d8e68c1c33b29b1ee996b183684b4e3b471d2b (patch) | |
tree | e5c4694fa2611c8c0cb5ab6ed00c05b19d9833b9 /target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch | |
parent | 2799c19eaa3d1acd4771e4f98165162b794cc9e8 (diff) |
atheros: add support for linux kernel v3.8
This builds and boots.
Because of the function pointer indirection (e.g. mtd_info's read
function pointer is assigned to spiflash_read), it is difficult for me
to understand where the calls are coming from (could be anywhere,
conditionally pointing at spiflash versions), so I punted and used the
renamed function pointers (_erase, _read, _write). If someone knows
better what to do, please fix.
Cleaned up other sundry kernel tracking issues like get_phy_id and
__devinit,etc.
[juhosg: don't switch to that yet]
Signed-off-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35727 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch')
-rw-r--r-- | target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch b/target/linux/atheros/patches-3.8/141-redboot_partition_scan.patch new file mode 100644 index 000000000..c83823a21 --- /dev/null +++ b/target/linux/atheros/patches-3.8/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; |