From 73cca9c36cc2f7df05da57197b1c769458a78653 Mon Sep 17 00:00:00 2001 From: Sergey Sharshunov Date: Sun, 1 Dec 2019 20:25:35 +0500 Subject: [PATCH 1/2] Fix initramfs image boot --- target/linux/hi35xx/image/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/hi35xx/image/Makefile b/target/linux/hi35xx/image/Makefile index 50d62aa268..e7fe0084de 100644 --- a/target/linux/hi35xx/image/Makefile +++ b/target/linux/hi35xx/image/Makefile @@ -77,6 +77,7 @@ define Device/hi35xx-default IMAGES := sysupgrade.bin factory.bin IMAGE_PREFIX := $(IMG_PREFIX)-$(1) KERNEL_PREFIX := $(IMG_PREFIX)-$(1) + KERNEL_INITRAMFS_PREFIX := $(IMG_PREFIX)-$(1)-initramfs KERNEL_NAME = zImage KERNEL_SUFFIX := -uImage KERNEL_INSTALL := 1 @@ -84,7 +85,7 @@ define Device/hi35xx-default ROOT_FS_SIZE:=5120k KERNEL_PAD_SIZE:=2097088 KERNEL := kernel-bin | uImage none - KERNEL_INITRAMFS := kernel-bin | uImage none + KERNEL_INITRAMFS := kernel-bin BLOCKSIZE := 128k FILESYSTEMS = $(filter-out jffs2-%,$(TARGET_FILESYSTEMS)) jffs2-$$(BLOCKSIZE) IMAGE/sysupgrade.bin := append-kernel $${KERNEL_SIZE} | pad-to 64k | append-rootfs $${ROOT_FS_SIZE} | sysupgrade-header From a8defd683d6b5dfd99bf698222db151975e62a0c Mon Sep 17 00:00:00 2001 From: Igor Zalatov Date: Thu, 20 Feb 2020 18:18:20 +0300 Subject: [PATCH 2/2] 941-mac80211-fix-wiphy-supported_band-access-kernelcheck.patch --- ...x-wiphy-supported_band-access-kernelcheck.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 package/kernel/mac80211/patches/941-mac80211-fix-wiphy-supported_band-access-kernelcheck.patch diff --git a/package/kernel/mac80211/patches/941-mac80211-fix-wiphy-supported_band-access-kernelcheck.patch b/package/kernel/mac80211/patches/941-mac80211-fix-wiphy-supported_band-access-kernelcheck.patch deleted file mode 100644 index 8647fa6fdb..0000000000 --- a/package/kernel/mac80211/patches/941-mac80211-fix-wiphy-supported_band-access-kernelcheck.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/net/wireless/util.c 2019-07-21 02:18:00.303302041 +0200 -+++ b/net/wireless/util.c 2019-07-21 02:19:39.748557471 +0200 -@@ -746,7 +746,11 @@ - u8 *payload; - int offset = 0, remaining, err; - struct ethhdr eth; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) -+ bool reuse_frag = 0; -+#else - bool reuse_frag = skb->head_frag && !skb_has_frag_list(skb); -+#endif - bool reuse_skb = false; - bool last = false; -