diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2011-08-09 12:19:49 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2011-08-09 12:19:49 +0000 |
| commit | 6b5f483efa9f575c0cfb753de0b32364926b8d4a (patch) | |
| tree | 8ea3946a9418a8923a29fe20387676f1e77bf983 /target/linux/brcm63xx/patches-3.1/041-bcm963xx_real_rootfs_length.patch | |
| parent | cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4 (diff) | |
| download | upstream-6b5f483efa9f575c0cfb753de0b32364926b8d4a.tar.gz upstream-6b5f483efa9f575c0cfb753de0b32364926b8d4a.tar.bz2 upstream-6b5f483efa9f575c0cfb753de0b32364926b8d4a.zip | |
bcm63xx: add support for linux 3.1-rc1
SVN-Revision: 27941
Diffstat (limited to 'target/linux/brcm63xx/patches-3.1/041-bcm963xx_real_rootfs_length.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.1/041-bcm963xx_real_rootfs_length.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.1/041-bcm963xx_real_rootfs_length.patch b/target/linux/brcm63xx/patches-3.1/041-bcm963xx_real_rootfs_length.patch new file mode 100644 index 0000000000..67c0d7153d --- /dev/null +++ b/target/linux/brcm63xx/patches-3.1/041-bcm963xx_real_rootfs_length.patch @@ -0,0 +1,45 @@ +--- a/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h ++++ b/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h +@@ -86,8 +86,10 @@ struct bcm_tag { + char rootfs_crc[CRC_LEN]; + /* 224-227: CRC32 of kernel partition */ + char kernel_crc[CRC_LEN]; +- /* 228-235: Unused at present */ +- char reserved1[8]; ++ /* 228-231: Image sequence number */ ++ char image_sequence[4]; ++ /* 222-235: Openwrt: real rootfs length */ ++ char real_rootfs_length[4]; + /* 236-239: CRC32 of header excluding last 20 bytes */ + char header_crc[CRC_LEN]; + /* 240-255: Unused at present */ +--- a/drivers/mtd/maps/bcm963xx-flash.c ++++ b/drivers/mtd/maps/bcm963xx-flash.c +@@ -64,7 +64,7 @@ static int parse_cfe_partitions(struct m + int ret; + size_t retlen; + unsigned int rootfsaddr, kerneladdr, spareaddr; +- unsigned int rootfslen, kernellen, sparelen, totallen; ++ unsigned int rootfslen, kernellen, sparelen; + int namelen = 0; + int i; + char *boardid; +@@ -85,7 +85,7 @@ static int parse_cfe_partitions(struct m + + sscanf(buf->kernel_address, "%u", &kerneladdr); + sscanf(buf->kernel_length, "%u", &kernellen); +- sscanf(buf->total_length, "%u", &totallen); ++ rootfslen = *(uint32_t *)(&(buf->real_rootfs_length)); + tagversion = &(buf->tag_version[0]); + boardid = &(buf->board_id[0]); + +@@ -94,7 +94,8 @@ static int parse_cfe_partitions(struct m + + kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE; + rootfsaddr = kerneladdr + kernellen; +- spareaddr = roundup(totallen, master->erasesize) + master->erasesize; ++ rootfslen = roundup(rootfslen, master->erasesize); ++ spareaddr = rootfsaddr + rootfslen; + sparelen = master->size - spareaddr - master->erasesize; + rootfslen = spareaddr - rootfsaddr; + |