From 250c0fc072e6a6db084c08a29c0f33819444fe7a Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Sat, 18 Oct 2025 11:42:07 +0200 Subject: [PATCH] Remove legacy patches; use libustream-mbedtls Signed-off-by: Daniel Pawlik --- configs/common/openssl | 4 +- .../0001-Add-kmod-thermal-for-BPI-R4.patch | 25 --------- patches/0001-Add-mt7925-firmware-rule.patch | 52 ------------------- 3 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 patches/0001-Add-kmod-thermal-for-BPI-R4.patch delete mode 100644 patches/0001-Add-mt7925-firmware-rule.patch diff --git a/configs/common/openssl b/configs/common/openssl index 2586e90..af168ad 100644 --- a/configs/common/openssl +++ b/configs/common/openssl @@ -3,8 +3,8 @@ # CONFIG_PACKAGE_luci-ssl-openssl is not set CONFIG_PACKAGE_apk-openssl=y CONFIG_PACKAGE_wpad-openssl=y -CONFIG_PACKAGE_libustream-mbedtls=m -CONFIG_PACKAGE_libustream-openssl=y +CONFIG_PACKAGE_libustream-mbedtls=y +# CONFIG_PACKAGE_libustream-openssl is not set # CONFIG_PACKAGE_wpad-mbedtls is not set # CONFIG_PACKAGE_wpad-basic-mbedtls is not set # CONFIG_PACKAGE_wpad-basic-openssl is not set diff --git a/patches/0001-Add-kmod-thermal-for-BPI-R4.patch b/patches/0001-Add-kmod-thermal-for-BPI-R4.patch deleted file mode 100644 index f2955c0..0000000 --- a/patches/0001-Add-kmod-thermal-for-BPI-R4.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8d0659eb7f86e2d7ea81ec11829654a26a8c3407 Mon Sep 17 00:00:00 2001 -From: Daniel Pawlik -Date: Wed, 24 Jul 2024 13:37:46 +0000 -Subject: [PATCH] Enable kmod-thermal for BPI-R4 - ---- - target/linux/mediatek/image/filogic.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk -index 74eaf06ea9..6e79832623 100644 ---- a/target/linux/mediatek/image/filogic.mk -+++ b/target/linux/mediatek/image/filogic.mk -@@ -365,7 +365,7 @@ define Device/bananapi_bpi-r4-common - DEVICE_DTS_LOADADDR := 0x45f00000 - DEVICE_DTS_OVERLAY:= mt7988a-bananapi-bpi-r4-emmc mt7988a-bananapi-bpi-r4-rtc mt7988a-bananapi-bpi-r4-sd mt7988a-bananapi-bpi-r4-wifi-mt7996a - DEVICE_DTC_FLAGS := --pad 4096 -- DEVICE_PACKAGES := kmod-hwmon-pwmfan kmod-i2c-mux-pca954x kmod-eeprom-at24 kmod-mt7996-firmware \ -+ DEVICE_PACKAGES := kmod-hwmon-pwmfan kmod-thermal kmod-i2c-mux-pca954x kmod-eeprom-at24 kmod-mt7996-firmware \ - kmod-rtc-pcf8563 kmod-sfp kmod-usb3 e2fsprogs f2fsck mkf2fs - IMAGES := sysupgrade.itb - KERNEL_LOADADDR := 0x46000000 --- -2.45.2 - diff --git a/patches/0001-Add-mt7925-firmware-rule.patch b/patches/0001-Add-mt7925-firmware-rule.patch deleted file mode 100644 index 252fc00..0000000 --- a/patches/0001-Add-mt7925-firmware-rule.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 9db3daefa4ef538e497a7b2bf44ca7140481a333 Mon Sep 17 00:00:00 2001 -From: Daniel Pawlik -Date: Wed, 24 Jul 2024 13:39:48 +0000 -Subject: [PATCH] Add definition for mt7925 firmware - ---- - package/kernel/mt76/Makefile | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile -index f71070dbb9..c4421c0b23 100644 ---- a/package/kernel/mt76/Makefile -+++ b/package/kernel/mt76/Makefile -@@ -231,6 +231,12 @@ define KernelPackage/mt7915-firmware - DEPENDS+=+kmod-mt7915e - endef - -+define KernelPackage/mt7925-firmware -+ $(KernelPackage/mt76-default) -+ TITLE:=MediaTek MT7925 firmware -+ DEPENDS+=+kmod-mt7925e -+endef -+ - define KernelPackage/mt7915e - $(KernelPackage/mt76-default) - TITLE:=MediaTek MT7915e wireless driver -@@ -616,6 +622,14 @@ define KernelPackage/mt7922-firmware/install - $(1)/lib/firmware/mediatek - endef - -+define KernelPackage/mt7925-firmware/install -+ $(INSTALL_DIR) $(1)/lib/firmware/mediatek/mt7925 -+ cp \ -+ $(PKG_BUILD_DIR)/firmware/mt7925/WIFI_MT7925_PATCH_MCU_1_1_hdr.bin \ -+ $(PKG_BUILD_DIR)/firmware/mt7925/WIFI_RAM_CODE_MT7925_1_1.bin \ -+ $(1)/lib/firmware/mediatek/mt7925 -+endef -+ - define KernelPackage/mt7996-firmware/install - $(INSTALL_DIR) $(1)/lib/firmware/mediatek/mt7996 - cp \ -@@ -666,6 +680,7 @@ $(eval $(call KernelPackage,mt7981-firmware)) - $(eval $(call KernelPackage,mt7986-firmware)) - $(eval $(call KernelPackage,mt7921-firmware)) - $(eval $(call KernelPackage,mt7922-firmware)) -+$(eval $(call KernelPackage,mt7925-firmware)) - $(eval $(call KernelPackage,mt792x-common)) - $(eval $(call KernelPackage,mt792x-usb)) - $(eval $(call KernelPackage,mt7921-common)) --- -2.45.2 -