diff --git a/dl/mt798x-7.6.6.1-src.tar.xz b/dl/mt798x-7.6.6.1-src.tar.xz deleted file mode 100644 index b0ede9d806..0000000000 Binary files a/dl/mt798x-7.6.6.1-src.tar.xz and /dev/null differ diff --git a/dl/mt79xx_20220907-8b55f5.tar.xz b/dl/mt79xx_20220907-8b55f5.tar.xz new file mode 100644 index 0000000000..48a3fae2a8 Binary files /dev/null and b/dl/mt79xx_20220907-8b55f5.tar.xz differ diff --git a/package/mtk/drivers/mt_wifi/Makefile b/package/mtk/drivers/mt_wifi/Makefile index 4fbb2a8f52..e4c74b1513 100644 --- a/package/mtk/drivers/mt_wifi/Makefile +++ b/package/mtk/drivers/mt_wifi/Makefile @@ -17,7 +17,7 @@ endif endif ifeq ($(CONFIG_MTK_MT_WIFI_DRIVER_VERSION_7661),y) -PKG_SOURCE:=mt798x-7.6.6.1-src.tar.xz +PKG_SOURCE:=mt79xx_20220907-8b55f5.tar.xz PKG_VERSION:=7.6.6.1-$(PKG_SUFFIX) PATCH_DIR:=patches-7661 else @@ -290,12 +290,9 @@ TAR_CMD=$(HOST_TAR) -C $(1)/ $(TAR_OPTIONS) define KernelPackage/mt_wifi CATEGORY:=MTK Properties TITLE:=MTK wifi AP driver - DEPENDS:=+wifi-dats - DEPENDS+=+kmod-conninfra - DEPENDS+=+kmod-mediatek_hnat + DEPENDS:=+wifi-dats +kmod-conninfra +kmod-mediatek_hnat +kmod-warp FILES:=$(PKG_BUILD_DIR)/mt_wifi_ap/mt_wifi.ko \ $(PKG_BUILD_DIR)/mt_wifi/embedded/plug_in/warp_proxy/mtk_warp_proxy.ko - DEPENDS+=+kmod-warp AUTOLOAD:=$(call AutoProbe,mt_wifi mtk_warp_proxy) SUBMENU:=Drivers MENU:=1 @@ -309,9 +306,6 @@ define MT_WIFI_SRC_PATCH @if [ "$$(CONFIG_MTK_FW_NEW_API_PATCH)" = "y" ]; then \ echo "Fixup new mcu fw API"; \ patch -p1 -d $(PKG_BUILD_DIR) < ./files/fix-new-mcu-fw-api.patch; \ - fi ; \ - if [ "$$(CONFIG_MTK_MT_WIFI_DRIVER_VERSION_7661)" = "y" ]; then \ - $(CP) ./files-7661/* $(PKG_BUILD_DIR) ; \ fi endef @@ -339,10 +333,10 @@ if [ "$$(CONFIG_MTK_CHIP_MT7981)" = "y" ] ; then \ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/mt7981/rebb/MT7981_* $(1)/lib/firmware/; \ fi ; \ if [ "$$(CONFIG_MTK_WIFI_FW_BIN_LOAD)" = "y" ]; then \ - if [ "$$(CONFIG_MTK_MT_WIFI_FIRMWARE_PATH)" != "" ]; then \ - $(INSTALL_BIN) ./files/$$(CONFIG_MTK_MT_WIFI_FIRMWARE_PATH)/* $(1)/lib/firmware/; \ - else \ - if [ "$$(CONFIG_MTK_CHIP_MT7986)" = "y" ] ; then \ + if [ "$$(CONFIG_MTK_CHIP_MT7986)" = "y" ] ; then \ + if [ "$$(CONFIG_MTK_MT_WIFI_FIRMWARE_PATH_MT7986)" != "" ]; then \ + $(INSTALL_BIN) ./files/$$(CONFIG_MTK_MT_WIFI_FIRMWARE_PATH_MT7986)/* $(1)/lib/firmware/; \ + else \ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/mt7986/rebb/WIFI_RAM_CODE_MT7986.bin \ $(PKG_BUILD_DIR)/bin/mt7986/rebb/WIFI_RAM_CODE_MT7986_MT7975.bin \ $(PKG_BUILD_DIR)/bin/mt7986/rebb/mt7986_patch_e1_hdr.bin \ @@ -350,13 +344,21 @@ if [ "$$(CONFIG_MTK_WIFI_FW_BIN_LOAD)" = "y" ]; then \ $(PKG_BUILD_DIR)/bin/mt7986/rebb/7986_WACPU_RAM_CODE_release.bin \ $(1)/lib/firmware/; \ fi ; \ - if [ "$$(CONFIG_MTK_CHIP_MT7916)" = "y" ] ; then \ + fi ; \ + if [ "$$(CONFIG_MTK_CHIP_MT7916)" = "y" ] ; then \ + if [ "$$(CONFIG_MTK_MT_WIFI_FIRMWARE_PATH_MT7916)" != "" ]; then \ + $(INSTALL_BIN) ./files/$$(CONFIG_MTK_MT_WIFI_FIRMWARE_PATH_MT7916)/* $(1)/lib/firmware/; \ + else \ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/mt7916/rebb/7916_WACPU_RAM_CODE_release.bin \ $(PKG_BUILD_DIR)/bin/mt7916/rebb/mt7916_patch_e1_hdr.bin \ $(PKG_BUILD_DIR)/bin/mt7916/rebb/WIFI_RAM_CODE_MT7916.bin \ $(1)/lib/firmware/; \ fi ; \ - if [ "$$(CONFIG_MTK_CHIP_MT7981)" = "y" ] ; then \ + fi ; \ + if [ "$$(CONFIG_MTK_CHIP_MT7981)" = "y" ] ; then \ + if [ "$$(CONFIG_MTK_MT_WIFI_FIRMWARE_PATH_MT7981)" != "" ]; then \ + $(INSTALL_BIN) ./files/$$(CONFIG_MTK_MT_WIFI_FIRMWARE_PATH_MT7981)/* $(1)/lib/firmware/; \ + else \ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/mt7981/rebb/WIFI_RAM_CODE_MT7981.bin \ $(PKG_BUILD_DIR)/bin/mt7981/rebb/7981_WACPU_RAM_CODE_release.bin \ $(PKG_BUILD_DIR)/bin/mt7981/rebb/mt7981_patch_e1_hdr.bin \ diff --git a/package/mtk/drivers/mt_wifi/config.in b/package/mtk/drivers/mt_wifi/config.in index e8c2d0e6f5..a59fc3acc9 100644 --- a/package/mtk/drivers/mt_wifi/config.in +++ b/package/mtk/drivers/mt_wifi/config.in @@ -188,6 +188,21 @@ choice bool "7.6.7.2" endchoice +choice + prompt "MT7916 custom WACPU firmware" + depends on MTK_CHIP_MT7916 + default MTK_MT_WIFI_MT7916_20240823 + + config MTK_MT_WIFI_MT7916_DEFAULT_FIRMWARE + bool "default firmware" + + config MTK_MT_WIFI_MT7916_20221208 + bool "mt7916-fw-20221208" + + config MTK_MT_WIFI_MT7916_20240823 + bool "mt7916-fw-20240823" +endchoice + choice prompt "MT7981 custom WACPU firmware" depends on MTK_CHIP_MT7981 @@ -239,7 +254,12 @@ choice bool "mt7986-fw-20240823" endchoice -config MTK_MT_WIFI_FIRMWARE_PATH +config MTK_MT_WIFI_FIRMWARE_PATH_MT7916 + string + default mt7916-fw-20221208 if MTK_MT_WIFI_MT7916_20221208 + default mt7916-fw-20240823 if MTK_MT_WIFI_MT7916_20240823 + +config MTK_MT_WIFI_FIRMWARE_PATH_MT7981 string default mt7981-fw-20230306 if MTK_MT_WIFI_MT7981_20230306 default mt7981-fw-20230330 if MTK_MT_WIFI_MT7981_20230330 @@ -247,6 +267,9 @@ config MTK_MT_WIFI_FIRMWARE_PATH default mt7981-fw-20230717 if MTK_MT_WIFI_MT7981_20230717 default mt7981-fw-20231024 if MTK_MT_WIFI_MT7981_20231024 default mt7981-fw-20240823 if MTK_MT_WIFI_MT7981_20240823 + +config MTK_MT_WIFI_FIRMWARE_PATH_MT7986 + string default mt7986-fw-20221208 if MTK_MT_WIFI_MT7986_20221208 default mt7986-fw-20230421 if MTK_MT_WIFI_MT7986_20230421 default mt7986-fw-20230808 if MTK_MT_WIFI_MT7986_20230808 diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_5G_2T2R+1R.bin b/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_5G_2T2R+1R.bin deleted file mode 100644 index 35b287c35e..0000000000 Binary files a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_5G_2T2R+1R.bin and /dev/null differ diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_5G_3T3R.bin b/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_5G_3T3R.bin deleted file mode 100644 index ef406c71b8..0000000000 Binary files a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_5G_3T3R.bin and /dev/null differ diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_6G_2T2R+1R.bin b/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_6G_2T2R+1R.bin deleted file mode 100644 index 4d3570e118..0000000000 Binary files a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_6G_2T2R+1R.bin and /dev/null differ diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_6G_3T3R.bin b/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_6G_3T3R.bin deleted file mode 100644 index a14c74edc5..0000000000 Binary files a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_EEPROM_AX3000_ePAeLNA_2G_6G_3T3R.bin and /dev/null differ diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_ePAeLNA_EEPROM.bin b/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_ePAeLNA_EEPROM.bin deleted file mode 100644 index 35b287c35e..0000000000 Binary files a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_ePAeLNA_EEPROM.bin and /dev/null differ diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_ePAiLNA_EEPROM.bin b/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_ePAiLNA_EEPROM.bin deleted file mode 100644 index 4921567ce8..0000000000 Binary files a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_ePAiLNA_EEPROM.bin and /dev/null differ diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_iPAeLNA_EEPROM.bin b/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_iPAeLNA_EEPROM.bin deleted file mode 100644 index 4921567ce8..0000000000 Binary files a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_iPAeLNA_EEPROM.bin and /dev/null differ diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_iPAiLNA_EEPROM.bin b/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_iPAiLNA_EEPROM.bin deleted file mode 100644 index 3d936217be..0000000000 Binary files a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/MT7916_iPAiLNA_EEPROM.bin and /dev/null differ diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7981/rebb/MT7981_ePAeLNA_EEPROM.bin b/package/mtk/drivers/mt_wifi/files-7661/bin/mt7981/rebb/MT7981_ePAeLNA_EEPROM.bin deleted file mode 100644 index 109fe88369..0000000000 Binary files a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7981/rebb/MT7981_ePAeLNA_EEPROM.bin and /dev/null differ diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7981/rebb/MT7981_iPAiLNA_EEPROM.bin b/package/mtk/drivers/mt_wifi/files-7661/bin/mt7981/rebb/MT7981_iPAiLNA_EEPROM.bin deleted file mode 100644 index 3bf6467735..0000000000 Binary files a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7981/rebb/MT7981_iPAiLNA_EEPROM.bin and /dev/null differ diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/7916_WACPU_RAM_CODE_release.bin b/package/mtk/drivers/mt_wifi/files/mt7916-fw-20221208/7916_WACPU_RAM_CODE_release.bin similarity index 100% rename from package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/7916_WACPU_RAM_CODE_release.bin rename to package/mtk/drivers/mt_wifi/files/mt7916-fw-20221208/7916_WACPU_RAM_CODE_release.bin diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/WIFI_RAM_CODE_MT7916.bin b/package/mtk/drivers/mt_wifi/files/mt7916-fw-20221208/WIFI_RAM_CODE_MT7916.bin similarity index 100% rename from package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/WIFI_RAM_CODE_MT7916.bin rename to package/mtk/drivers/mt_wifi/files/mt7916-fw-20221208/WIFI_RAM_CODE_MT7916.bin diff --git a/package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/mt7916_patch_e1_hdr.bin b/package/mtk/drivers/mt_wifi/files/mt7916-fw-20221208/mt7916_patch_e1_hdr.bin similarity index 100% rename from package/mtk/drivers/mt_wifi/files-7661/bin/mt7916/rebb/mt7916_patch_e1_hdr.bin rename to package/mtk/drivers/mt_wifi/files/mt7916-fw-20221208/mt7916_patch_e1_hdr.bin diff --git a/package/mtk/drivers/mt_wifi/files/mt7916-fw-20240823/7916_WACPU_RAM_CODE_release.bin b/package/mtk/drivers/mt_wifi/files/mt7916-fw-20240823/7916_WACPU_RAM_CODE_release.bin new file mode 100644 index 0000000000..4ff7c6b9dc Binary files /dev/null and b/package/mtk/drivers/mt_wifi/files/mt7916-fw-20240823/7916_WACPU_RAM_CODE_release.bin differ diff --git a/package/mtk/drivers/mt_wifi/files/mt7916-fw-20240823/WIFI_RAM_CODE_MT7916.bin b/package/mtk/drivers/mt_wifi/files/mt7916-fw-20240823/WIFI_RAM_CODE_MT7916.bin new file mode 100644 index 0000000000..8a4a8b15cf Binary files /dev/null and b/package/mtk/drivers/mt_wifi/files/mt7916-fw-20240823/WIFI_RAM_CODE_MT7916.bin differ diff --git a/package/mtk/drivers/mt_wifi/files/mt7916-fw-20240823/mt7916_patch_e1_hdr.bin b/package/mtk/drivers/mt_wifi/files/mt7916-fw-20240823/mt7916_patch_e1_hdr.bin new file mode 100644 index 0000000000..2d0b38b6bb Binary files /dev/null and b/package/mtk/drivers/mt_wifi/files/mt7916-fw-20240823/mt7916_patch_e1_hdr.bin differ