未验证 提交 8724adea 编写于 作者: A AmadeusGhost 提交者: GitHub

Revert "mtwifi: enable autoload by default" (#6070)

This reverts commit 653b7e43 due to
the combination of the mtwifi driver for mt603 and mt7615 will cause
some modules to fail to load normally.
上级 f8035eb8
...@@ -38,7 +38,6 @@ define KernelPackage/mt7603e ...@@ -38,7 +38,6 @@ define KernelPackage/mt7603e
TITLE:=MTK wifi AP driver TITLE:=MTK wifi AP driver
DEPENDS:=@TARGET_ramips DEPENDS:=@TARGET_ramips
FILES:=$(PKG_BUILD_DIR)/mt7603_wifi_ap/mt7603e.ko FILES:=$(PKG_BUILD_DIR)/mt7603_wifi_ap/mt7603e.ko
AUTOLOAD:=$(call AutoLoad,91,mt7603e)
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
MENU:=1 MENU:=1
endef endef
......
...@@ -26,7 +26,6 @@ define KernelPackage/mt76x2e ...@@ -26,7 +26,6 @@ define KernelPackage/mt76x2e
TITLE:=MTK MT76x2e wifi AP driver TITLE:=MTK MT76x2e wifi AP driver
DEPENDS:=@TARGET_ramips DEPENDS:=@TARGET_ramips
FILES:=$(PKG_BUILD_DIR)/mt76x2_ap/mt76x2_ap.ko FILES:=$(PKG_BUILD_DIR)/mt76x2_ap/mt76x2_ap.ko
AUTOLOAD:=$(call AutoLoad,90,mt76x2_ap)
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
MENU:=1 MENU:=1
endef endef
......
...@@ -188,7 +188,7 @@ ifneq ($(CONFIG_MTK_WHNAT_SUPPORT), ) ...@@ -188,7 +188,7 @@ ifneq ($(CONFIG_MTK_WHNAT_SUPPORT), )
AUTOLOAD:=$(call AutoProbe,mt_wifi mt_whnat) AUTOLOAD:=$(call AutoProbe,mt_wifi mt_whnat)
else else
FILES:=$(PKG_BUILD_DIR)/mt_wifi_ap/mt_wifi.ko FILES:=$(PKG_BUILD_DIR)/mt_wifi_ap/mt_wifi.ko
AUTOLOAD:=$(call AutoLoad,90,mt_wifi) AUTOLOAD:=$(call AutoProbe,mt_wifi)
endif endif
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
MENU:=1 MENU:=1
......
...@@ -42,6 +42,7 @@ define Package/mt_wifi/install ...@@ -42,6 +42,7 @@ define Package/mt_wifi/install
$(INSTALL_DIR) $(1)/lib/wifi/ $(INSTALL_DIR) $(1)/lib/wifi/
$(INSTALL_DIR) $(1)/etc/wireless/mt7615/ $(INSTALL_DIR) $(1)/etc/wireless/mt7615/
$(INSTALL_DIR) $(1)/etc_ro/Wireless/RT2860AP/ $(INSTALL_DIR) $(1)/etc_ro/Wireless/RT2860AP/
$(INSTALL_DIR) $(1)/lib/preinit/
ifeq ($(CONFIG_MTK_CHIP_MT7603E_MT7612E),y) ifeq ($(CONFIG_MTK_CHIP_MT7603E_MT7612E),y)
$(INSTALL_BIN) ./files/7603_7612-l1profile.dat $(1)/etc/wireless/l1profile.dat $(INSTALL_BIN) ./files/7603_7612-l1profile.dat $(1)/etc/wireless/l1profile.dat
$(INSTALL_BIN) ./files/mt7603.dat $(1)/etc/wireless/mt7615/mt7615.1.dat $(INSTALL_BIN) ./files/mt7603.dat $(1)/etc/wireless/mt7615/mt7615.1.dat
...@@ -65,6 +66,7 @@ endif ...@@ -65,6 +66,7 @@ endif
$(INSTALL_BIN) ./files/SingleSKU_BF.dat $(1)/etc_ro/Wireless/RT2860AP/ $(INSTALL_BIN) ./files/SingleSKU_BF.dat $(1)/etc_ro/Wireless/RT2860AP/
$(INSTALL_BIN) ./files/mt7615.lua $(1)/lib/wifi $(INSTALL_BIN) ./files/mt7615.lua $(1)/lib/wifi
$(INSTALL_BIN) ./files/firmware.sh $(1)/etc/init.d/ $(INSTALL_BIN) ./files/firmware.sh $(1)/etc/init.d/
$(INSTALL_BIN) ./files/91_load_wifi.sh $(1)/lib/preinit/
endef endef
$(eval $(call BuildPackage,mt_wifi)) $(eval $(call BuildPackage,mt_wifi))
. /lib/functions.sh
load_wifi() {
local kernel_version=$(uname -r)
[ -e "/lib/modules/$kernel_version/mt7603e.ko" ] && modprobe mt7603e
[ -e "/lib/modules/$kernel_version/mt76x2_ap.ko" ] && modprobe mt76x2_ap
}
boot_hook_add preinit_main load_wifi
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册