diff --git a/dl/mt7986-7.6.6.1-obj.tar.xz b/dl/mt7986-7.6.6.1-obj.tar.xz new file mode 100644 index 0000000000..8b4c00ebd8 Binary files /dev/null and b/dl/mt7986-7.6.6.1-obj.tar.xz differ diff --git a/dl/mt7986_conninfra-bbf588-obj.tar.xz b/dl/mt7986_conninfra-bbf588-obj.tar.xz new file mode 100644 index 0000000000..ada92e5616 Binary files /dev/null and b/dl/mt7986_conninfra-bbf588-obj.tar.xz differ diff --git a/dl/mt7986_warp-20220907-791160-obj.tar.xz b/dl/mt7986_warp-20220907-791160-obj.tar.xz new file mode 100644 index 0000000000..154c81b6c6 Binary files /dev/null and b/dl/mt7986_warp-20220907-791160-obj.tar.xz differ diff --git a/package/mtk/drivers/conninfra/Makefile b/package/mtk/drivers/conninfra/Makefile index 7973852753..8b731ae804 100644 --- a/package/mtk/drivers/conninfra/Makefile +++ b/package/mtk/drivers/conninfra/Makefile @@ -9,9 +9,16 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=conninfra -PKG_VERSION:= + +ifeq ($(CONFIG_MTK_CONNINFRA_APSOC_MT7981),y) PKG_SOURCE:=mt7981_conninfra_20220425-bbf588-obj.tar.xz -PKG_SOURCE_URL:= +else +ifeq ($(CONFIG_MTK_CONNINFRA_APSOC_MT7986),y) +PKG_SOURCE:=mt7986_conninfra-bbf588-obj.tar.xz +endif +endif + +PKG_VERSION:=bbf588 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) PKG_MAINTAINER:=Kun-Ze Syue @@ -23,6 +30,8 @@ PKG_KCONFIG:= \ FPGA_EARLY_PORTING \ CONNINFRA_AUTO_UP +PKG_CONFIG_DEPENDS:=$(foreach c, $(PKG_KCONFIG),$(if $(CONFIG_$c),CONFIG_$(c))) + include $(INCLUDE_DIR)/package.mk # Specify package information for this program. diff --git a/package/mtk/drivers/mt_wifi/Makefile b/package/mtk/drivers/mt_wifi/Makefile index 2f466a821e..556634e1c9 100644 --- a/package/mtk/drivers/mt_wifi/Makefile +++ b/package/mtk/drivers/mt_wifi/Makefile @@ -7,11 +7,20 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mt_wifi -P4REV:= -PKG_VERSION:=7.6.4.1 + +ifeq ($(CONFIG_MTK_CHIP_MT7981),y) +PKG_VERSION:=7.6.4.1-mt7981 PKG_SOURCE:=mt7981_20220425-4c770b-obj.tar.xz +else +ifeq ($(CONFIG_MTK_CHIP_MT7986),y) +PKG_VERSION:=7.6.6.1-mt7986 +PKG_SOURCE:=mt7986-7.6.6.1-obj.tar.xz +endif +endif + +PKG_BUILD_DEPENDS:=warp + PKG_BUILD_PARALLEL:=1 -PKG_SOURCE_URL:= PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) PKG_KCONFIG:= \ AP_SUPPORT \ @@ -296,10 +305,6 @@ if [ "$$(CONFIG_MTK_WIFI_FW_BIN_LOAD)" = "y" ]; then \ $(INSTALL_DIR) $(1)/lib/firmware/; \ if [ "$$(CONFIG_MTK_CHIP_MT7986)" = "y" ] ; then \ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/mt7986/rebb/WIFI_RAM_CODE_MT7986.bin \ - $(PKG_BUILD_DIR)/bin/mt7986/rebb/WIFI_RAM_CODE_MT7986_TESTMODE.bin \ - $(PKG_BUILD_DIR)/bin/mt7986/rebb/WIFI_RAM_CODE_MT7986_TESTMODE_MT7975.bin \ - $(PKG_BUILD_DIR)/bin/mt7986/rebb/mt7986_patch_e1_hdr_testmode.bin \ - $(PKG_BUILD_DIR)/bin/mt7986/rebb/mt7986_patch_e1_hdr_testmode_mt7975.bin \ $(PKG_BUILD_DIR)/bin/mt7986/rebb/WIFI_RAM_CODE_MT7986_MT7975.bin \ $(PKG_BUILD_DIR)/bin/mt7986/rebb/mt7986_patch_e1_hdr.bin \ $(PKG_BUILD_DIR)/bin/mt7986/rebb/mt7986_patch_e1_hdr_mt7975.bin \ @@ -320,8 +325,6 @@ if [ "$$(CONFIG_MTK_WIFI_FW_BIN_LOAD)" = "y" ]; then \ $(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 \ - $(PKG_BUILD_DIR)/bin/mt7981/rebb/WIFI_RAM_CODE_MT7981_TESTMODE.bin \ - $(PKG_BUILD_DIR)/bin/mt7981/rebb/mt7981_patch_e1_hdr_testmode.bin \ $(PKG_BUILD_DIR)/bin/mt7981/rebb/MT7981_iPAiLNA_EEPROM.bin \ $(PKG_BUILD_DIR)/bin/mt7981/rebb/MT7981_ePAeLNA_EEPROM.bin \ $(1)/lib/firmware/; \ diff --git a/package/mtk/drivers/mt_wifi/config.in b/package/mtk/drivers/mt_wifi/config.in index a9da602ae1..b3ae0db9cf 100644 --- a/package/mtk/drivers/mt_wifi/config.in +++ b/package/mtk/drivers/mt_wifi/config.in @@ -1056,7 +1056,7 @@ config MTK_DBDC_ONE_BAND_SUPPORT #APCLI STA config MTK_APCLI_STA_SUPPORT - bool "APCLI STA Support" + bool "APCLI Supplicant Support" depends on MTK_APCLI_SUPPORT depends on MTK_CFG80211_SUPPORT default n @@ -1311,9 +1311,9 @@ if MTK_WIFI_MT_MAC config MTK_CHIP_MT7916 bool default n - config MTK_CHIP_MT7981 - bool - default n + config MTK_CHIP_MT7981 + bool + default n endif if MTK_CHIP_MT7615E || MTK_CHIP_MT7622 || MTK_CHIP_MT7626 || MTK_CHIP_AXE || MTK_CHIP_MT7915 || MTK_CHIP_MT7986 || MTK_CHIP_MT7916 || MTK_CHIP_MT7981 diff --git a/package/mtk/drivers/warp/Makefile b/package/mtk/drivers/warp/Makefile index 8e21aacb30..353086a06d 100644 --- a/package/mtk/drivers/warp/Makefile +++ b/package/mtk/drivers/warp/Makefile @@ -7,10 +7,17 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=warp -P4REV:= -PKG_VERSION:= + +ifeq ($(CONFIG_WARP_CHIPSET),"mt7981") +PKG_VERSION:=20220425-d15d0a PKG_SOURCE:=warp_20220425-d15d0a-obj.tar.xz -PKG_SOURCE_URL:= +else +ifeq ($(CONFIG_WARP_CHIPSET),"mt7986") +PKG_VERSION:=20220907-791160 +PKG_SOURCE:=mt7986_warp-20220907-791160-obj.tar.xz +endif +endif + PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) PKG_KCONFIG:= \ WARP_VERSION \ @@ -66,9 +73,11 @@ MAKE_FLAGS += CONFIG_SUPPORT_OPENWRT=y define KernelPackage/warp/install $(INSTALL_DIR) $(1)/lib/firmware - cp $(PKG_BUILD_DIR)/bin/*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; + if [ "$$(CONFIG_WARP_CHIPSET)" = "mt7981" ]; then \ + cp $(PKG_BUILD_DIR)/bin/7981*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; \ + elif [ "$$(CONFIG_WARP_CHIPSET)" = "mt7986" ]; then \ + cp $(PKG_BUILD_DIR)/bin/7986*WOCPU*_RAM_CODE_release.bin $(1)/lib/firmware/; \ + fi endef $(eval $(call KernelPackage,warp)) - -