From 7bb0843d796e4c2b9886c5080e73e01e3c618060 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sun, 20 Dec 2020 23:30:06 +0800
Subject: [PATCH] ramips: GL-MT1300: switch to mtwifi driver

---
 package/lean/mt-drivers/mt7615d/config.in | 4 ++++
 package/lean/mt-drivers/mt_wifi/config.in | 1 +
 target/linux/ramips/image/mt7621.mk       | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/lean/mt-drivers/mt7615d/config.in b/package/lean/mt-drivers/mt7615d/config.in
index 0c71a2da15..736d713fc0 100644
--- a/package/lean/mt-drivers/mt7615d/config.in
+++ b/package/lean/mt-drivers/mt7615d/config.in
@@ -48,6 +48,7 @@ endchoice
 choice
 	prompt "Choose Second WiFi Interface"
 	default MTK_SECOND_IF_NONE if PACKAGE_kmod-mt7603e
+	default MTK_SECOND_IF_NONE if TARGET_ramips_mt7621_DEVICE_glinet_gl-mt1300
 	default MTK_SECOND_IF_NONE if TARGET_ramips_mt7621_DEVICE_jcg_y2
 	default MTK_SECOND_IF_NONE if TARGET_ramips_mt7621_DEVICE_phicomm_k2p
 	default MTK_SECOND_IF_MT7615E
@@ -275,6 +276,7 @@ config MTK_DBDC_MODE
 	depends on MTK_CHIP_MT7615E || MTK_CHIP_MT7626
 	select MULTI_PROFILE_SUPPORT
 	select DEFAULT_5G_PROFILE
+	default y if TARGET_ramips_mt7621_DEVICE_glinet_gl-mt1300
 	default y if TARGET_ramips_mt7621_DEVICE_jcg_y2
 	default y if TARGET_ramips_mt7621_DEVICE_phicomm_k2p
 	default n
@@ -282,6 +284,7 @@ config MTK_DBDC_MODE
 config MTK_MULTI_PROFILE_SUPPORT
 	bool "Multi Profile Support"
 	depends on MTK_DBDC_MODE
+	default y if TARGET_ramips_mt7621_DEVICE_glinet_gl-mt1300
 	default y if TARGET_ramips_mt7621_DEVICE_jcg_y2
 	default y if TARGET_ramips_mt7621_DEVICE_phicomm_k2p
 	default n
@@ -290,6 +293,7 @@ config MTK_DEFAULT_5G_PROFILE
 	bool "5G default profile for DBDC"
 	depends on MTK_DBDC_MODE
 #	depends on MTK_MULTI_PROFILE_SUPPORT
+	default y if TARGET_ramips_mt7621_DEVICE_glinet_gl-mt1300
 	default y if TARGET_ramips_mt7621_DEVICE_jcg_y2
 	default y if TARGET_ramips_mt7621_DEVICE_phicomm_k2p
 	default n
diff --git a/package/lean/mt-drivers/mt_wifi/config.in b/package/lean/mt-drivers/mt_wifi/config.in
index b66a6440b7..99978d5848 100644
--- a/package/lean/mt-drivers/mt_wifi/config.in
+++ b/package/lean/mt-drivers/mt_wifi/config.in
@@ -19,6 +19,7 @@ config MTK_CHIP_MT7615E
 config MTK_CHIP_MT7615E_DBDC
 	bool "MTK_CHIP_MT7615E_DBDC"
 	depends on MTK_CHIP_MT7615E
+	default y if TARGET_ramips_mt7621_DEVICE_glinet_gl-mt1300
 	default y if TARGET_ramips_mt7621_DEVICE_jcg_y2
 	default y if TARGET_ramips_mt7621_DEVICE_phicomm_k2p
 	default n
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 9d32345541..0b4576818e 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -446,7 +446,7 @@ define Device/glinet_gl-mt1300
   IMAGE_SIZE := 32448k
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-MT1300
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3
+  DEVICE_PACKAGES := kmod-mt7615d kmod-usb3 luci-app-mtwifi -wpad-openssl
 endef
 TARGET_DEVICES += glinet_gl-mt1300
 
@@ -596,7 +596,7 @@ define Device/jcg_y2
   JCG_MAXSIZE := 16064k
   DEVICE_VENDOR := JCG
   DEVICE_MODEL := Y2
-  DEVICE_PACKAGES := kmod-mt7615d kmod-usb3 luci-app-mtwifi
+  DEVICE_PACKAGES := kmod-mt7615d kmod-usb3 luci-app-mtwifi -wpad-openssl
 endef
 TARGET_DEVICES += jcg_y2