brcm63xx: backport bcm963xx_tag.h upstream changes

[openwrt/staging/noltari.git] / target / linux / brcm63xx / patches-4.4 / 401-bcm963xx_real_rootfs_length.patch

diff --git a/target/linux/brcm63xx/patches-4.4/401-bcm963xx_real_rootfs_length.patch b/target/linux/brcm63xx/patches-4.4/401-bcm963xx_real_rootfs_length.patch
index 92c264bd76ef694b59936974878e7e5c65f0bc9d..40cca94249e311c3b944430c79c39bdc25fb609b 100644 (file)
--- a/target/linux/brcm63xx/patches-4.4/401-bcm963xx_real_rootfs_length.patch
+++ b/target/linux/brcm63xx/patches-4.4/401-bcm963xx_real_rootfs_length.patch
@@ -1,21 +1,21 @@
---- 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 {
+--- a/include/linux/bcm963xx_tag.h
++++ b/include/linux/bcm963xx_tag.h
+@@ -91,8 +91,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 */
++      /* 228-231: Unused at present */
++      char reserved1[4];
++      /* 232-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
-@@ -110,7 +110,8 @@ static int bcm63xx_parse_cfe_partitions(
+@@ -108,7 +108,8 @@ static int bcm63xx_parse_cfe_partitions(
                } else {
                        /* OpenWrt layout */
                        rootfsaddr = kerneladdr + kernellen;