From 7dbd43f75f6ed88ec636285f8de5d755da45ba77 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sun, 5 Jul 2020 17:11:28 +0800
Subject: [PATCH] mtwifi: mt7615: fix install (#4979)

---
 package/lean/mt/drivers/mt7615d/Makefile          | 10 ----------
 package/lean/mt/drivers/mt_wifi/Makefile          | 15 +++++++++++++--
 package/lean/mt/drivers/mt_wifi/config.in         |  6 ++++++
 .../files/7615.l1profile.dat}                     |  0
 .../{mt7615d => mt_wifi}/files/dbdc.l1profile.dat |  0
 .../{mt7615d => mt_wifi}/files/mt7615.1.2G.dat    |  0
 .../{mt7615d => mt_wifi}/files/mt7615.1.5G.dat    |  0
 .../mt7615.1.dat => mt_wifi/files/mt7615.2G.dat}  |  0
 .../mt7615.2.dat => mt_wifi/files/mt7615.5G.dat}  |  0
 9 files changed, 19 insertions(+), 12 deletions(-)
 rename package/lean/mt/drivers/{mt7615d/files/l1profile.dat => mt_wifi/files/7615.l1profile.dat} (100%)
 rename package/lean/mt/drivers/{mt7615d => mt_wifi}/files/dbdc.l1profile.dat (100%)
 rename package/lean/mt/drivers/{mt7615d => mt_wifi}/files/mt7615.1.2G.dat (100%)
 rename package/lean/mt/drivers/{mt7615d => mt_wifi}/files/mt7615.1.5G.dat (100%)
 rename package/lean/mt/drivers/{mt7615d/files/mt7615.1.dat => mt_wifi/files/mt7615.2G.dat} (100%)
 rename package/lean/mt/drivers/{mt7615d/files/mt7615.2.dat => mt_wifi/files/mt7615.5G.dat} (100%)

diff --git a/package/lean/mt/drivers/mt7615d/Makefile b/package/lean/mt/drivers/mt7615d/Makefile
index 77af5924a..931932d06 100644
--- a/package/lean/mt/drivers/mt7615d/Makefile
+++ b/package/lean/mt/drivers/mt7615d/Makefile
@@ -205,17 +205,7 @@ define Build/Compile
 endef
 
 define KernelPackage/mt7615d/install
-	$(INSTALL_DIR) $(1)/etc/wireless/
 	$(INSTALL_DIR) $(1)/etc/wireless/mt7615/
-ifneq ($(CONFIG_MTK_DBDC_MODE), )
-	$(INSTALL_BIN) ./files/dbdc.l1profile.dat $(1)/etc/wireless/l1profile.dat
-	$(INSTALL_BIN) ./files/mt7615.1.2G.dat $(1)/etc/wireless/mt7615/
-	$(INSTALL_BIN) ./files/mt7615.1.5G.dat $(1)/etc/wireless/mt7615/
-else
-	$(INSTALL_BIN) ./files/l1profile.dat $(1)/etc/wireless/
-	$(INSTALL_BIN) ./files/mt7615.1.dat $(1)/etc/wireless/mt7615/
-	$(INSTALL_BIN) ./files/mt7615.2.dat $(1)/etc/wireless/mt7615/
-endif
 endef
 
 $(eval $(call KernelPackage,mt7615d))
diff --git a/package/lean/mt/drivers/mt_wifi/Makefile b/package/lean/mt/drivers/mt_wifi/Makefile
index fe6051f44..91d2461cc 100644
--- a/package/lean/mt/drivers/mt_wifi/Makefile
+++ b/package/lean/mt/drivers/mt_wifi/Makefile
@@ -12,7 +12,8 @@ PKG_RELEASE:=1
 PKG_CONFIG_DEPENDS := \
 	CONFIG_MTK_CHIP_MT7603E_MT7612E \
 	CONFIG_MTK_CHIP_MT7603E_MT7615E \
-	CONFIG_MTK_CHIP_MT7615E
+	CONFIG_MTK_CHIP_MT7615E \
+	CONFIG_MTK_CHIP_MT7615E_DBDC
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -52,7 +53,17 @@ else ifeq ($(CONFIG_MTK_CHIP_MT7603E_MT7615E),y)
 	$(INSTALL_BIN) ./files/mt7615.dat $(1)/etc/wireless/mt7615/mt7615.2.dat
 	$(INSTALL_BIN) ./files/82_load_wifi.sh $(1)/lib/preinit/
 else
-	$(INSTALL_BIN) ./files/82_load_wifi.sh $(1)/lib/preinit/
+	ifeq ($(CONFIG_MTK_CHIP_MT7615E_DBDC),y)
+		$(INSTALL_BIN) ./files/dbdc.l1profile.dat $(1)/etc/wireless/l1profile.dat
+		$(INSTALL_BIN) ./files/mt7615.1.2G.dat $(1)/etc/wireless/mt7615/
+		$(INSTALL_BIN) ./files/mt7615.1.5G.dat $(1)/etc/wireless/mt7615/
+		$(INSTALL_BIN) ./files/82_load_wifi.sh $(1)/lib/preinit/
+	else
+		$(INSTALL_BIN) ./files/7615.l1profile.dat $(1)/etc/wireless/l1profile.dat
+		$(INSTALL_BIN) ./files/mt7615.2G.dat $(1)/etc/wireless/mt7615/mt7615.1.dat
+		$(INSTALL_BIN) ./files/mt7615.5G.dat $(1)/etc/wireless/mt7615/mt7615.2.dat
+		$(INSTALL_BIN) ./files/82_load_wifi.sh $(1)/lib/preinit/
+	endif
 endif
 	$(INSTALL_BIN) ./files/SingleSKU.dat $(1)/etc_ro/Wireless/RT2860AP/
 	$(INSTALL_BIN) ./files/SingleSKU_BF.dat $(1)/etc_ro/Wireless/RT2860AP/
diff --git a/package/lean/mt/drivers/mt_wifi/config.in b/package/lean/mt/drivers/mt_wifi/config.in
index 9b3e9ebdc..c78b793ac 100644
--- a/package/lean/mt/drivers/mt_wifi/config.in
+++ b/package/lean/mt/drivers/mt_wifi/config.in
@@ -16,4 +16,10 @@ config MTK_CHIP_MT7615E
 	default y if PACKAGE_kmod-mt7615d && !PACKAGE_kmod-mt7603e
 	default n
 
+config MTK_CHIP_MT7615E_DBDC
+	bool "MTK_CHIP_MT7615E_DBDC"
+	depends on MTK_CHIP_MT7615E
+	default y if TARGET_ramips_mt7621_DEVICE_phicomm_k2p
+	default n
+
 endmenu
diff --git a/package/lean/mt/drivers/mt7615d/files/l1profile.dat b/package/lean/mt/drivers/mt_wifi/files/7615.l1profile.dat
similarity index 100%
rename from package/lean/mt/drivers/mt7615d/files/l1profile.dat
rename to package/lean/mt/drivers/mt_wifi/files/7615.l1profile.dat
diff --git a/package/lean/mt/drivers/mt7615d/files/dbdc.l1profile.dat b/package/lean/mt/drivers/mt_wifi/files/dbdc.l1profile.dat
similarity index 100%
rename from package/lean/mt/drivers/mt7615d/files/dbdc.l1profile.dat
rename to package/lean/mt/drivers/mt_wifi/files/dbdc.l1profile.dat
diff --git a/package/lean/mt/drivers/mt7615d/files/mt7615.1.2G.dat b/package/lean/mt/drivers/mt_wifi/files/mt7615.1.2G.dat
similarity index 100%
rename from package/lean/mt/drivers/mt7615d/files/mt7615.1.2G.dat
rename to package/lean/mt/drivers/mt_wifi/files/mt7615.1.2G.dat
diff --git a/package/lean/mt/drivers/mt7615d/files/mt7615.1.5G.dat b/package/lean/mt/drivers/mt_wifi/files/mt7615.1.5G.dat
similarity index 100%
rename from package/lean/mt/drivers/mt7615d/files/mt7615.1.5G.dat
rename to package/lean/mt/drivers/mt_wifi/files/mt7615.1.5G.dat
diff --git a/package/lean/mt/drivers/mt7615d/files/mt7615.1.dat b/package/lean/mt/drivers/mt_wifi/files/mt7615.2G.dat
similarity index 100%
rename from package/lean/mt/drivers/mt7615d/files/mt7615.1.dat
rename to package/lean/mt/drivers/mt_wifi/files/mt7615.2G.dat
diff --git a/package/lean/mt/drivers/mt7615d/files/mt7615.2.dat b/package/lean/mt/drivers/mt_wifi/files/mt7615.5G.dat
similarity index 100%
rename from package/lean/mt/drivers/mt7615d/files/mt7615.2.dat
rename to package/lean/mt/drivers/mt_wifi/files/mt7615.5G.dat