From 4500b9010563e4fe77eb7ba9b1f877ac77c6c96e Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 30 Sep 2021 14:24:12 +0200 Subject: [PATCH 1/5] Apply mac80211 patch only for 5.14 --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 554a5dce..77f410e7 100755 --- a/build.sh +++ b/build.sh @@ -494,6 +494,7 @@ if [ "$OMR_KERNEL" = "5.4" ]; then echo "Set to kernel 5.4 for mediatek arch (BPI-R2)" find target/linux/mediatek -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=5.10%KERNEL_PATCHVER:=5.4%g' {} \; echo "Done" + rm package/kernel/mac80211/patches/build/firmware-replace-HOTPLUG-with-UEVENT-in-FW_ACTION-defines.patch fi if [ "$OMR_KERNEL" = "5.10" ]; then echo "Set to kernel 5.10 for rpi arch" From bee0272fe08826dd71f5d42da216680e6901c9d2 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 30 Sep 2021 15:29:03 +0200 Subject: [PATCH 2/5] Remove RPI patch --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 77f410e7..df279ec2 100755 --- a/build.sh +++ b/build.sh @@ -473,9 +473,9 @@ fi #if [ -f target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch ]; then # rm -f target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch #fi -#if [ -f target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch ]; then -# rm -f target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch -#fi +if [ -f target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch ]; then + rm -f target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch +fi #if [ -f target/linux/generic/pending-5.4/770-16-net-ethernet-mediatek-mtk_eth_soc-add-flow-offloadin.patch ]; then # rm -f target/linux/generic/pending-5.4/770-16-net-ethernet-mediatek-mtk_eth_soc-add-flow-offloadin.patch #fi From ddab424418a62c2dae1cadc14279c8635efc850c Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 30 Sep 2021 15:31:51 +0200 Subject: [PATCH 3/5] Disable SHORTCUT_FE by default --- root/target/linux/generic/config-5.4 | 1 + 1 file changed, 1 insertion(+) diff --git a/root/target/linux/generic/config-5.4 b/root/target/linux/generic/config-5.4 index 27ad2f43..9e6e60ff 100644 --- a/root/target/linux/generic/config-5.4 +++ b/root/target/linux/generic/config-5.4 @@ -4954,6 +4954,7 @@ CONFIG_SERIAL_EARLYCON=y # CONFIG_SG_POOL is not set # CONFIG_SG_SPLIT is not set CONFIG_SHMEM=y +# CONFIG_SHORTCUT_FE is not set # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set # CONFIG_SH_ETH is not set # CONFIG_SH_TIMER_CMT is not set From a3179ced210aac506e4b9a6924f3998e208078b2 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 30 Sep 2021 16:50:49 +0200 Subject: [PATCH 4/5] Complete config 5.4 --- root/target/linux/generic/config-5.4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root/target/linux/generic/config-5.4 b/root/target/linux/generic/config-5.4 index 9e6e60ff..e78e834b 100644 --- a/root/target/linux/generic/config-5.4 +++ b/root/target/linux/generic/config-5.4 @@ -3280,6 +3280,7 @@ CONFIG_MTD_OF_PARTS=y # CONFIG_MTD_ONENAND is not set # CONFIG_MTD_OOPS is not set # CONFIG_MTD_OTP is not set +# CONFIG_MTD_PARSER_TRX is not set # CONFIG_MTD_PARTITIONED_MASTER is not set # CONFIG_MTD_PCI is not set # CONFIG_MTD_PCMCIA is not set @@ -5595,6 +5596,7 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_TCIC is not set CONFIG_TCP_CONG_ADVANCED=y # CONFIG_TCP_CONG_BBR is not set +# CONFIG_TCP_CONG_BBR2 is not set # CONFIG_TCP_CONG_BIC is not set # CONFIG_TCP_CONG_CDG is not set CONFIG_TCP_CONG_CUBIC=y From b437e52d297e16a56796eeba9fa604db7d6ee354 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 30 Sep 2021 17:35:05 +0200 Subject: [PATCH 5/5] Remove btusb --- root/package/kernel/linux/modules/other.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root/package/kernel/linux/modules/other.mk b/root/package/kernel/linux/modules/other.mk index 0bc865b7..6e999eb2 100644 --- a/root/package/kernel/linux/modules/other.mk +++ b/root/package/kernel/linux/modules/other.mk @@ -53,9 +53,8 @@ define KernelPackage/bluetooth $(LINUX_DIR)/net/bluetooth/bnep/bnep.ko \ $(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \ $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \ - $(LINUX_DIR)/drivers/bluetooth/btusb.ko \ $(LINUX_DIR)/drivers/bluetooth/btintel.ko - AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb) + AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart) endef define KernelPackage/bluetooth/description