From 546e593192a182e9e295608887d60a58627ccab7 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Thu, 10 Dec 2020 11:20:53 +0800
Subject: [PATCH] mtwifi: enable autoload by default

---
 package/lean/mt-drivers/mt7603e/Makefile              |  1 +
 package/lean/mt-drivers/mt7612e/Makefile              |  1 +
 package/lean/mt-drivers/mt7615d/Makefile              |  2 ++
 package/lean/mt-drivers/mt_wifi/Makefile              |  2 --
 package/lean/mt-drivers/mt_wifi/files/82_load_wifi.sh | 10 ----------
 5 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 package/lean/mt-drivers/mt_wifi/files/82_load_wifi.sh

diff --git a/package/lean/mt-drivers/mt7603e/Makefile b/package/lean/mt-drivers/mt7603e/Makefile
index e3cdd58272..17c0e3da09 100644
--- a/package/lean/mt-drivers/mt7603e/Makefile
+++ b/package/lean/mt-drivers/mt7603e/Makefile
@@ -39,6 +39,7 @@ define KernelPackage/mt7603e
   DEPENDS:=@TARGET_ramips
   FILES:=$(PKG_BUILD_DIR)/mt7603_wifi_ap/mt7603e.ko
   SUBMENU:=Wireless Drivers
+  AUTOLOAD:=$(call AutoLoad,91,mt7603e)
   MENU:=1
 endef
 
diff --git a/package/lean/mt-drivers/mt7612e/Makefile b/package/lean/mt-drivers/mt7612e/Makefile
index 546ae28db1..843cf19930 100644
--- a/package/lean/mt-drivers/mt7612e/Makefile
+++ b/package/lean/mt-drivers/mt7612e/Makefile
@@ -27,6 +27,7 @@ define KernelPackage/mt76x2e
   DEPENDS:=@TARGET_ramips
   FILES:=$(PKG_BUILD_DIR)/mt76x2_ap/mt76x2_ap.ko
   SUBMENU:=Wireless Drivers
+  AUTOLOAD:=$(call AutoLoad,90,mt76x2_ap)
   MENU:=1
 endef
 
diff --git a/package/lean/mt-drivers/mt7615d/Makefile b/package/lean/mt-drivers/mt7615d/Makefile
index 931932d06d..a1af373014 100644
--- a/package/lean/mt-drivers/mt7615d/Makefile
+++ b/package/lean/mt-drivers/mt7615d/Makefile
@@ -184,8 +184,10 @@ define KernelPackage/mt7615d
 ifneq ($(CONFIG_MTK_WHNAT_SUPPORT), )
   FILES:=$(PKG_BUILD_DIR)/mt_wifi_ap/mt_wifi.ko \
 	$(PKG_BUILD_DIR)/mt_wifi/embedded/tools/plug_in/whnat/mt_whnat.ko
+  AUTOLOAD:=$(call AutoProbe,mt_wifi mt_whnat)
 else
   FILES:=$(PKG_BUILD_DIR)/mt_wifi_ap/mt_wifi.ko
+  AUTOLOAD:=$(call AutoLoad,90,mt_wifi)
 endif
   SUBMENU:=Wireless Drivers
   MENU:=1
diff --git a/package/lean/mt-drivers/mt_wifi/Makefile b/package/lean/mt-drivers/mt_wifi/Makefile
index 6b60be3888..d22a359eae 100644
--- a/package/lean/mt-drivers/mt_wifi/Makefile
+++ b/package/lean/mt-drivers/mt_wifi/Makefile
@@ -41,7 +41,6 @@ define Package/mt_wifi/install
 	$(INSTALL_DIR) $(1)/lib/wifi/
 	$(INSTALL_DIR) $(1)/etc/wireless/mt7615/
 	$(INSTALL_DIR) $(1)/etc_ro/Wireless/RT2860AP/
-	$(INSTALL_DIR) $(1)/lib/preinit/
 ifeq ($(CONFIG_MTK_CHIP_MT7603E_MT7612E),y)
 	$(INSTALL_BIN) ./files/7603_7612-l1profile.dat $(1)/etc/wireless/l1profile.dat
 	$(INSTALL_BIN) ./files/mt7603.dat $(1)/etc/wireless/mt7615/mt7615.1.dat
@@ -65,7 +64,6 @@ endif
 	$(INSTALL_BIN) ./files/SingleSKU_BF.dat $(1)/etc_ro/Wireless/RT2860AP/
 	$(INSTALL_BIN) ./files/mt7615.lua $(1)/lib/wifi
 	$(INSTALL_BIN) ./files/firmware.sh $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/82_load_wifi.sh $(1)/lib/preinit/
 endef
 
 $(eval $(call BuildPackage,mt_wifi))
diff --git a/package/lean/mt-drivers/mt_wifi/files/82_load_wifi.sh b/package/lean/mt-drivers/mt_wifi/files/82_load_wifi.sh
deleted file mode 100644
index ddbc7e7832..0000000000
--- a/package/lean/mt-drivers/mt_wifi/files/82_load_wifi.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-. /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
-	[ -e "/lib/modules/$kernel_version/mt_wifi.ko" ] && modprobe mt_wifi
-}
-
-boot_hook_add preinit_main load_wifi