diff options
| author | Matteo Croce <matteo@openwrt.org> | 2008-05-04 17:05:26 +0000 |
|---|---|---|
| committer | Matteo Croce <matteo@openwrt.org> | 2008-05-04 17:05:26 +0000 |
| commit | b671161b4a95e95b85998e3e4b5e7fc04c6ca21a (patch) | |
| tree | a9639e7ec291e0bddcd2009cf72d51b00142d4b4 /target | |
| parent | 88da00005308479a022e2df971c2bb8ac5aad10b (diff) | |
| download | upstream-b671161b4a95e95b85998e3e4b5e7fc04c6ca21a.tar.gz upstream-b671161b4a95e95b85998e3e4b5e7fc04c6ca21a.tar.bz2 upstream-b671161b4a95e95b85998e3e4b5e7fc04c6ca21a.zip | |
ar7: backport small fixes from linux-mips
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11045 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch b/target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch new file mode 100644 index 0000000000..1b90fc7ea4 --- /dev/null +++ b/target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch @@ -0,0 +1,61 @@ +--- linux/drivers/mtd/ar7part.c 2007-09-20 21:47:22.000000000 +0200 ++++ linux-mips/drivers/mtd/ar7part.c 2008-05-04 18:49:04.000000000 +0200 +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2007 Eugene Konev <ejka@openwrt.org> ++ * Copyright © 2007 Eugene Konev <ejka@openwrt.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -34,6 +34,10 @@ + #define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42) + #define LOADER_MAGIC2 le32_to_cpu(0xfeed1281) + ++#ifndef SQUASHFS_MAGIC ++#define SQUASHFS_MAGIC 0x73717368 ++#endif ++ + struct ar7_bin_rec { + unsigned int checksum; + unsigned int length; +@@ -47,7 +51,8 @@ + unsigned long origin) + { + struct ar7_bin_rec header; +- unsigned int offset, len; ++ unsigned int offset; ++ size_t len; + unsigned int pre_size = master->erasesize, post_size = 0; + unsigned int root_offset = ROOT_OFFSET; + +@@ -66,7 +71,7 @@ + do { /* Try 10 blocks starting from master->erasesize */ + offset = pre_size; + master->read(master, offset, +- sizeof(header), &len, (u8 *)&header); ++ sizeof(header), &len, (uint8_t *)&header); + if (!strncmp((char *)&header, "TIENV0.8", 8)) + ar7_parts[1].offset = pre_size; + if (header.checksum == LOADER_MAGIC1) +@@ -88,7 +93,7 @@ + while (header.length) { + offset += sizeof(header) + header.length; + master->read(master, offset, sizeof(header), +- &len, (u8 *)&header); ++ &len, (uint8_t *)&header); + } + root_offset = offset + sizeof(header) + 4; + break; +@@ -96,10 +101,10 @@ + while (header.length) { + offset += sizeof(header) + header.length; + master->read(master, offset, sizeof(header), +- &len, (u8 *)&header); ++ &len, (uint8_t *)&header); + } + root_offset = offset + sizeof(header) + 4 + 0xff; +- root_offset &= ~(u32)0xff; ++ root_offset &= ~(uint32_t)0xff; + break; + default: + printk(KERN_WARNING "Unknown magic: %08x\n", header.checksum); |