From f8f1dc6eab935f90b31401d87f412e3f8769dfd0 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 3 Apr 2020 12:26:23 +0200 Subject: bcm63xx: copy files to kernel 5.4 Copy config and patches to kernel 5.4. make kernel_oldconfig has been run on 4.19 beforehand. Signed-off-by: Adrian Schmutzler --- .../401-bcm963xx_real_rootfs_length.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 target/linux/bcm63xx/patches-5.4/401-bcm963xx_real_rootfs_length.patch (limited to 'target/linux/bcm63xx/patches-5.4/401-bcm963xx_real_rootfs_length.patch') diff --git a/target/linux/bcm63xx/patches-5.4/401-bcm963xx_real_rootfs_length.patch b/target/linux/bcm63xx/patches-5.4/401-bcm963xx_real_rootfs_length.patch new file mode 100644 index 0000000000..efefba41b5 --- /dev/null +++ b/target/linux/bcm63xx/patches-5.4/401-bcm963xx_real_rootfs_length.patch @@ -0,0 +1,27 @@ +--- a/include/linux/bcm963xx_tag.h ++++ b/include/linux/bcm963xx_tag.h +@@ -92,8 +92,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: Unused at present */ ++ char reserved1[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/parsers/parser_imagetag.c ++++ b/drivers/mtd/parsers/parser_imagetag.c +@@ -137,7 +137,8 @@ static int bcm963xx_parse_imagetag_parti + } else { + /* OpenWrt layout */ + rootfsaddr = kerneladdr + kernellen; +- rootfslen = spareaddr - rootfsaddr; ++ rootfslen = buf->real_rootfs_length; ++ spareaddr = rootfsaddr + rootfslen; + } + } else { + goto out; -- cgit v1.2.3