diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-03-28 20:42:09 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-03-28 20:42:09 +0000 |
commit | 44d546290ac04ce74b3851cb0d21d598b1130bc3 (patch) | |
tree | 37a8e1f2b48b16992e0883e0eb2463c20be2141b /target/linux/brcm63xx/patches-3.3/041-bcm963xx_real_rootfs_length.patch | |
parent | 13b6ec1d0562c6e97a2e71f58f2cbf93d5ed9c0b (diff) | |
download | upstream-44d546290ac04ce74b3851cb0d21d598b1130bc3.tar.gz upstream-44d546290ac04ce74b3851cb0d21d598b1130bc3.tar.bz2 upstream-44d546290ac04ce74b3851cb0d21d598b1130bc3.zip |
bcm63xx: reorder patches
Reorder patches for a clearer distinction between the purposes of
the different patches.
SVN-Revision: 31127
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/041-bcm963xx_real_rootfs_length.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.3/041-bcm963xx_real_rootfs_length.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/041-bcm963xx_real_rootfs_length.patch b/target/linux/brcm63xx/patches-3.3/041-bcm963xx_real_rootfs_length.patch deleted file mode 100644 index 0476699edb..0000000000 --- a/target/linux/brcm63xx/patches-3.3/041-bcm963xx_real_rootfs_length.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h -+++ b/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h -@@ -85,8 +85,10 @@ struct bcm_tag { - __u32 rootfs_crc; - /* 224-227: CRC32 of kernel partition */ - __u32 kernel_crc; -- /* 228-235: Unused at present */ -- char reserved1[8]; -+ /* 228-231: Image sequence number */ -+ char image_sequence[4]; -+ /* 222-235: Openwrt: real rootfs length */ -+ __u32 real_rootfs_length; - /* 236-239: CRC32 of header excluding last 20 bytes */ - __u32 header_crc; - /* 240-255: Unused at present */ ---- a/drivers/mtd/bcm63xxpart.c -+++ b/drivers/mtd/bcm63xxpart.c -@@ -77,7 +77,7 @@ static int bcm63xx_parse_cfe_partitions( - int ret; - size_t retlen; - unsigned int rootfsaddr, kerneladdr, spareaddr; -- unsigned int rootfslen, kernellen, sparelen, totallen; -+ unsigned int rootfslen, kernellen, sparelen; - unsigned int cfelen, nvramlen; - int namelen = 0; - int i; -@@ -111,14 +111,15 @@ static int bcm63xx_parse_cfe_partitions( - - sscanf(buf->kernel_address, "%u", &kerneladdr); - sscanf(buf->kernel_length, "%u", &kernellen); -- sscanf(buf->total_length, "%u", &totallen); -+ rootfslen = buf->real_rootfs_length; - - pr_info("CFE boot tag found with version %s and board type %s\n", - tagversion, boardid); - - kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE; - rootfsaddr = kerneladdr + kernellen; -- spareaddr = roundup(totallen, master->erasesize) + cfelen; -+ rootfslen = roundup(rootfslen, master->erasesize); -+ spareaddr = rootfsaddr + rootfslen; - sparelen = master->size - spareaddr - nvramlen; - rootfslen = spareaddr - rootfsaddr; - } else { |