[][MAC80211][misc][mt76 Makefile]
[Description]
Fix release build fail due to incorrect mt76's Makefile
Add missing kernel config
[Release-log]
N/A
Change-Id: I2aef4d10d5f91660a81f098f7efc2a3626a09a01
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7686363
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mt76/Makefile b/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mt76/Makefile
index 04db7fe..b46f164 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mt76/Makefile
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211/package/kernel/mt76/Makefile
@@ -233,7 +233,7 @@
define KernelPackage/mt7915e
$(KernelPackage/mt76-default)
- TITLE:=MediaTek MT7915e wireless driver
+ TITLE:=MediaTek MT7915e/MT7986/MT7916 wireless driver
DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
FILES:= $(PKG_BUILD_DIR)/mt7915/mt7915e.ko
AUTOLOAD:=$(call AutoProbe,mt7915e)
@@ -253,10 +253,18 @@
define KernelPackage/mt7986-firmware
$(KernelPackage/mt76-default)
- DEPENDS:=@TARGET_mediatek_filogic
+ DEPENDS:=+@TARGET_mediatek_mt7986
TITLE:=MediaTek MT7986 firmware
endef
+define KernelPackage/mt7996e
+ $(KernelPackage/mt76-default)
+ TITLE:=MediaTek MT7996/MT7995/MT7919 wireless driver
+ DEPENDS+=@PCI_SUPPORT +kmod-mt76-core +kmod-mt76-connac +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@DRIVER_11BE_SUPPORT
+ FILES:= $(PKG_BUILD_DIR)/mt7996/mt7996e.ko
+ AUTOLOAD:=$(call AutoProbe,mt7996e)
+endef
+
define KernelPackage/mt7921-firmware
$(KernelPackage/mt76-default)
TITLE:=MediaTek MT7921 firmware
@@ -317,6 +325,11 @@
NOSTDINC_FLAGS += -DCONFIG_MAC80211_MESH
endif
+ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
+ NOSTDINC_FLAGS += -DCONFIG_MAC80211_DEBUGFS
+ PKG_MAKE_FLAGS += CONFIG_MAC80211_DEBUGFS=y
+endif
+
ifdef CONFIG_PACKAGE_CFG80211_TESTMODE
NOSTDINC_FLAGS += -DCONFIG_NL80211_TESTMODE
PKG_MAKE_FLAGS += CONFIG_NL80211_TESTMODE=y
@@ -379,11 +392,14 @@
endif
ifdef CONFIG_PACKAGE_kmod-mt7915e
PKG_MAKE_FLAGS += CONFIG_MT7915E=m
- ifdef CONFIG_TARGET_mediatek_filogic
+ ifdef CONFIG_TARGET_mediatek_mt7986
PKG_MAKE_FLAGS += CONFIG_MT798X_WMAC=y
NOSTDINC_FLAGS += -DCONFIG_MT798X_WMAC
endif
endif
+ifdef CONFIG_PACKAGE_kmod-mt7996e
+ PKG_MAKE_FLAGS += CONFIG_MT7996E=m
+endif
ifdef CONFIG_PACKAGE_kmod-mt7921-common
PKG_MAKE_FLAGS += CONFIG_MT7921_COMMON=m
endif
@@ -398,7 +414,8 @@
endif
define Build/Compile
- +$(KERNEL_MAKE) $(PKG_JOBS) \
+ +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
+ $(KERNEL_MAKE_FLAGS) \
$(PKG_MAKE_FLAGS) \
M="$(PKG_BUILD_DIR)" \
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
@@ -491,6 +508,8 @@
$(PKG_BUILD_DIR)/firmware/mt7915_wa.bin \
$(PKG_BUILD_DIR)/firmware/mt7915_wm.bin \
$(PKG_BUILD_DIR)/firmware/mt7915_rom_patch.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7915_eeprom.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7915_eeprom_dbdc.bin \
$(1)/lib/firmware/mediatek
endef
@@ -500,6 +519,7 @@
$(PKG_BUILD_DIR)/firmware/mt7916_wa.bin \
$(PKG_BUILD_DIR)/firmware/mt7916_wm.bin \
$(PKG_BUILD_DIR)/firmware/mt7916_rom_patch.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7916_eeprom.bin \
$(1)/lib/firmware/mediatek
endef
@@ -522,9 +542,33 @@
$(PKG_BUILD_DIR)/firmware/mt7986_rom_patch.bin \
$(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7975_dual.bin \
$(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7976_dual.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7975.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7976.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7976_dbdc.bin \
$(1)/lib/firmware/mediatek
+ifdef CONFIG_NET_MEDIATEK_SOC_WED
+ cp \
+ $(PKG_BUILD_DIR)/firmware/mt7986_wo_0.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7986_wo_1.bin \
+ $(1)/lib/firmware/mediatek
+endif
endef
+ifdef CONFIG_PACKAGE_kmod-mt7996e
+define KernelPackage/mt7996e/install
+ $(INSTALL_DIR) $(1)/lib/firmware/mediatek/mt7996
+ cp \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wa.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm_tm.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_rom_patch.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_dsp.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_eeprom.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_eeprom_tm.bin \
+ $(1)/lib/firmware/mediatek/mt7996
+endef
+endif
+
define KernelPackage/mt7921-firmware/install
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
cp \
@@ -570,5 +614,6 @@
$(eval $(call KernelPackage,mt7921u))
$(eval $(call KernelPackage,mt7921s))
$(eval $(call KernelPackage,mt7921e))
+$(eval $(call KernelPackage,mt7996e))
$(eval $(call KernelPackage,mt76))
$(eval $(call BuildPackage,mt76-test))
diff --git a/target/linux/mediatek/mt7988/config-5.4 b/target/linux/mediatek/mt7988/config-5.4
index cb07304..d661a18 100644
--- a/target/linux/mediatek/mt7988/config-5.4
+++ b/target/linux/mediatek/mt7988/config-5.4
@@ -514,3 +514,6 @@
CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DMA32=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set