diff --git a/package/lean/luci-app-mtwifi/Makefile b/package/lean/luci-app-mtwifi/Makefile index df000fae40..ad994c60a3 100644 --- a/package/lean/luci-app-mtwifi/Makefile +++ b/package/lean/luci-app-mtwifi/Makefile @@ -4,7 +4,7 @@ PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Hua Shao LUCI_TITLE:=LuCI support for mt wifi driver -LUCI_DEPENDS:= +LUCI_DEPENDS:=@TARGET_ramips LUCI_PKGARCH:=all PKG_VERSION:=2 PKG_RELEASE:=1 diff --git a/package/lean/mt-drivers/mt_wifi/Makefile b/package/lean/mt-drivers/mt_wifi/Makefile index 674f4dce26..4c43f13f13 100644 --- a/package/lean/mt-drivers/mt_wifi/Makefile +++ b/package/lean/mt-drivers/mt_wifi/Makefile @@ -180,23 +180,7 @@ TAR_CMD=$(HOST_TAR) -C $(1)/ $(TAR_OPTIONS) define KernelPackage/mt_wifi CATEGORY:=Kernel modules TITLE:=MTK wifi AP driver - DEPENDS:=@TARGET_ramips -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 AutoProbe,mt_wifi) -endif - SUBMENU:=Wireless Drivers - MENU:=1 -endef - -define KernelPackage/mt_wifi_dbdc - CATEGORY:=Kernel modules - TITLE:=MTK wifi AP driver - DEPENDS:=@TARGET_ramips +wifi-l1profile + DEPENDS:=+TARGET_ramips_mt7621_DEVICE_phicomm_k2p:wifi-l1profile 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 @@ -227,22 +211,14 @@ define KernelPackage/mt_wifi/install $(INSTALL_DIR) $(1)/lib/wifi/ $(INSTALL_DIR) $(1)/etc/wireless/mt7615/ $(INSTALL_DIR) $(1)/etc_ro/Wireless/RT2860AP/ +ifneq ($(CONFIG_MTK_DBDC_MODE), ) + $(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/ - $(INSTALL_BIN) ./files/SingleSKU.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/firmware.sh $(1)/etc/init.d/ -endef - -define KernelPackage/mt_wifi_dbdc/install - $(INSTALL_DIR) $(1)/etc/init.d/ - $(INSTALL_DIR) $(1)/lib/wifi/ - $(INSTALL_DIR) $(1)/etc/wireless/mt7615/ - $(INSTALL_DIR) $(1)/etc_ro/Wireless/RT2860AP/ - $(INSTALL_BIN) ./files/mt7615.1.2G.dat $(1)/etc/wireless/mt7615/ - $(INSTALL_BIN) ./files/mt7615.1.5G.dat $(1)/etc/wireless/mt7615/ +endif $(INSTALL_BIN) ./files/SingleSKU.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 @@ -250,4 +226,3 @@ define KernelPackage/mt_wifi_dbdc/install endef $(eval $(call KernelPackage,mt_wifi)) -$(eval $(call KernelPackage,mt_wifi_dbdc)) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 0540a37de2..edb88336b7 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -705,7 +705,7 @@ define Device/phicomm_k2p DEVICE_VENDOR := Phicomm DEVICE_MODEL := K2P SUPPORTED_DEVICES += k2p - DEVICE_PACKAGES := kmod-mt_wifi_dbdc luci-app-mtwifi + DEVICE_PACKAGES := kmod-mt_wifi luci-app-mtwifi endef TARGET_DEVICES += phicomm_k2p