mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
3a187fa718
Also add a new kconfig symbol (CONFIG_KCMP) to the generic config, disabling the SYS_kcmp syscall (it was split from CONFIG_CHECKPOINT_RESTORE, which is disabled by default, so the previous behaviour is kept). Removed (upstreamed) patches: 070-net-icmp-pass-zeroed-opts-from-icmp-v6-_ndo_send-bef.patch 081-wireguard-device-do-not-generate-ICMP-for-non-IP-pac.patch 082-wireguard-queueing-get-rid-of-per-peer-ring-buffers.patch 083-wireguard-kconfig-use-arm-chacha-even-with-no-neon.patch 830-v5.12-0002-usb-serial-option-update-interface-mapping-for-ZTE-P685M.patch Manually rebased patches: 313-helios4-dts-status-led-alias.patch 104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch Run tested: ath79 (TL-WDR3600) mvebu (Turris Omnia) Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
28 lines
863 B
Diff
28 lines
863 B
Diff
--- 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
|
|
@@ -136,7 +136,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;
|