diff --git a/dl/warp_20231229-5f71ec.tar.xz b/dl/warp_20231229-5f71ec.tar.xz new file mode 100644 index 0000000000..6b0ab97d77 Binary files /dev/null and b/dl/warp_20231229-5f71ec.tar.xz differ diff --git a/package/mtk/drivers/warp/Makefile b/package/mtk/drivers/warp/Makefile index 348ea31628..4508e3cc06 100644 --- a/package/mtk/drivers/warp/Makefile +++ b/package/mtk/drivers/warp/Makefile @@ -8,18 +8,13 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=warp -PKG_VERSION:=20221209-3e6ae1 -PKG_SOURCE:=warp_20221209-3e6ae1-src.tar.xz - -MT7981_NEW_WOFW_DIR := mt7981-fw-20230411 -MT7986_NEW_WOFW_DIR := mt7986-fw-20230421 +PKG_VERSION:=20231229-5f71ec +PKG_SOURCE:=warp_20231229-5f71ec.tar.xz PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) PKG_KCONFIG:= \ WARP_VERSION \ - WARP_ATC_SUPPORT \ WARP_DBG_SUPPORT \ - WARP_WDMA_RECYCLE_SUPPORT \ WED_HW_RRO_SUPPORT \ MTK_MEMORY_SHRINK \ WARP_CHIPSET \ @@ -46,14 +41,6 @@ define KernelPackage/warp/config source "$(SOURCE)/config.in" endef - -ifeq ($(CONFIG_WARP_VERSION), 3) -MTK_WIFI_DIR:=$(TOPDIR)/../ko_module/wlan_driver/logan -else -MTK_WIFI_DIR:=$(TOPDIR)/../ko_module/wlan_driver/jedi -endif -USE_BIN_DIR:=$(MTK_WIFI_DIR)/warp_driver/bin - define Build/Compile $(MAKE) -C "$(LINUX_DIR)" V=1 \ $(KERNEL_MAKE_FLAGS) \ @@ -74,17 +61,9 @@ MAKE_FLAGS += CONFIG_SUPPORT_OPENWRT=y define KernelPackage/warp/install $(INSTALL_DIR) $(1)/lib/firmware if [ "$$(CONFIG_WARP_CHIPSET)" = "mt7981" ]; then \ - if [ "$$(CONFIG_WARP_NEW_FW)" = "y" ]; then \ - cp ./files/$$(MT7981_NEW_WOFW_DIR)/7981*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; \ - else \ - cp $(PKG_BUILD_DIR)/bin/7981*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; \ - fi; \ + cp $(PKG_BUILD_DIR)/bin/7981*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; \ elif [ "$$(CONFIG_WARP_CHIPSET)" = "mt7986" ]; then \ - if [ "$$(CONFIG_WARP_NEW_FW)" = "y" ]; then \ - cp ./files/$$(MT7986_NEW_WOFW_DIR)/7986*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; \ - else \ - cp $(PKG_BUILD_DIR)/bin/7986*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; \ - fi; \ + cp $(PKG_BUILD_DIR)/bin/7986*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; \ fi endef diff --git a/package/mtk/drivers/warp/config.in b/package/mtk/drivers/warp/config.in index 9c61b4b149..a2dca0ad2d 100644 --- a/package/mtk/drivers/warp/config.in +++ b/package/mtk/drivers/warp/config.in @@ -7,18 +7,10 @@ config WARP_VERSION default 2 if TARGET_mediatek_mt7986 default 3 if TARGET_mediatek_mt7988 -config WARP_ATC_SUPPORT - bool "WARP Driver Address Translate Support for CR mirror" - default n - config WARP_DBG_SUPPORT bool "WARP Driver Debug Info Support" default y -config WARP_WDMA_RECYCLE_SUPPORT - bool "WARP WDMA Recycle Support" - default n - config WED_HW_RRO_SUPPORT bool "WED HW RRO Support" default y @@ -44,8 +36,4 @@ config WARP_WO_EMBEDDED_LOAD help Once enabled, firmware download flow try embedded version once externel version being invalid. -config WARP_NEW_FW - bool "Use new warp firmware" - default n endif - diff --git a/package/mtk/drivers/warp/files/mt7981-fw-20230330/7981_WOCPU0_RAM_CODE_release.bin b/package/mtk/drivers/warp/files/mt7981-fw-20230330/7981_WOCPU0_RAM_CODE_release.bin deleted file mode 100644 index 0054f7f080..0000000000 Binary files a/package/mtk/drivers/warp/files/mt7981-fw-20230330/7981_WOCPU0_RAM_CODE_release.bin and /dev/null differ diff --git a/package/mtk/drivers/warp/files/mt7981-fw-20230411/7981_WOCPU0_RAM_CODE_release.bin b/package/mtk/drivers/warp/files/mt7981-fw-20230411/7981_WOCPU0_RAM_CODE_release.bin deleted file mode 100644 index bb6ed9b600..0000000000 Binary files a/package/mtk/drivers/warp/files/mt7981-fw-20230411/7981_WOCPU0_RAM_CODE_release.bin and /dev/null differ diff --git a/package/mtk/drivers/warp/files/mt7981-fw-20230717/7981_WOCPU0_RAM_CODE_release.bin b/package/mtk/drivers/warp/files/mt7981-fw-20230717/7981_WOCPU0_RAM_CODE_release.bin deleted file mode 100644 index 3f6aad107a..0000000000 Binary files a/package/mtk/drivers/warp/files/mt7981-fw-20230717/7981_WOCPU0_RAM_CODE_release.bin and /dev/null differ diff --git a/package/mtk/drivers/warp/files/mt7981-fw-20231024/7981_WOCPU0_RAM_CODE_release.bin b/package/mtk/drivers/warp/files/mt7981-fw-20231024/7981_WOCPU0_RAM_CODE_release.bin deleted file mode 100644 index 1bbc36467b..0000000000 Binary files a/package/mtk/drivers/warp/files/mt7981-fw-20231024/7981_WOCPU0_RAM_CODE_release.bin and /dev/null differ diff --git a/package/mtk/drivers/warp/files/mt7986-fw-20230421/7986_WOCPU0_RAM_CODE_release.bin b/package/mtk/drivers/warp/files/mt7986-fw-20230421/7986_WOCPU0_RAM_CODE_release.bin deleted file mode 100644 index aeb27789d4..0000000000 Binary files a/package/mtk/drivers/warp/files/mt7986-fw-20230421/7986_WOCPU0_RAM_CODE_release.bin and /dev/null differ diff --git a/package/mtk/drivers/warp/files/mt7986-fw-20230421/7986_WOCPU1_RAM_CODE_release.bin b/package/mtk/drivers/warp/files/mt7986-fw-20230421/7986_WOCPU1_RAM_CODE_release.bin deleted file mode 100644 index b7014aebc3..0000000000 Binary files a/package/mtk/drivers/warp/files/mt7986-fw-20230421/7986_WOCPU1_RAM_CODE_release.bin and /dev/null differ diff --git a/package/mtk/drivers/warp/files/mt7986-fw-20230808/7986_WOCPU0_RAM_CODE_release.bin b/package/mtk/drivers/warp/files/mt7986-fw-20230808/7986_WOCPU0_RAM_CODE_release.bin deleted file mode 100644 index 16576baaf6..0000000000 Binary files a/package/mtk/drivers/warp/files/mt7986-fw-20230808/7986_WOCPU0_RAM_CODE_release.bin and /dev/null differ diff --git a/package/mtk/drivers/warp/files/mt7986-fw-20230808/7986_WOCPU1_RAM_CODE_release.bin b/package/mtk/drivers/warp/files/mt7986-fw-20230808/7986_WOCPU1_RAM_CODE_release.bin deleted file mode 100644 index 5f84206b8b..0000000000 Binary files a/package/mtk/drivers/warp/files/mt7986-fw-20230808/7986_WOCPU1_RAM_CODE_release.bin and /dev/null differ diff --git a/package/mtk/drivers/warp/files/mt7986-fw-20231024/7986_WOCPU0_RAM_CODE_release.bin b/package/mtk/drivers/warp/files/mt7986-fw-20231024/7986_WOCPU0_RAM_CODE_release.bin deleted file mode 100644 index 43d23eb3b5..0000000000 Binary files a/package/mtk/drivers/warp/files/mt7986-fw-20231024/7986_WOCPU0_RAM_CODE_release.bin and /dev/null differ diff --git a/package/mtk/drivers/warp/files/mt7986-fw-20231024/7986_WOCPU1_RAM_CODE_release.bin b/package/mtk/drivers/warp/files/mt7986-fw-20231024/7986_WOCPU1_RAM_CODE_release.bin deleted file mode 100644 index a7f8b8d835..0000000000 Binary files a/package/mtk/drivers/warp/files/mt7986-fw-20231024/7986_WOCPU1_RAM_CODE_release.bin and /dev/null differ