From 091b9567660aca35000649e61731d83bb949693c Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Mon, 3 Apr 2023 08:34:09 +0200
Subject: [PATCH] Update package mt7601u-ap-openipc (#703)

Co-authored-by: Viktor <viktorxda@users.noreply.github.com>
---
 .../kernel/hi3516ev300.generic.config         |  2 +-
 .../configs/hi3516ev300_ultimate_defconfig    |  5 ++++
 .../0001-optimization.patch                   | 20 --------------
 general/package/mt7601u-ap-openipc/Config.in  |  2 --
 .../mt7601u-ap-openipc/mt7601u-ap-openipc.mk  | 27 ++-----------------
 5 files changed, 8 insertions(+), 48 deletions(-)
 delete mode 100644 general/package/mt7601u-ap-openipc/0001-optimization.patch

diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev300.generic.config b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev300.generic.config
index 33cf89f5..5d7e7255 100644
--- a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev300.generic.config
+++ b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3516ev300.generic.config
@@ -733,7 +733,7 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=n
+CONFIG_CFG80211_WEXT=y
 # CONFIG_LIB80211 is not set
 CONFIG_MAC80211=m
 CONFIG_MAC80211_HAS_RC=y
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig
index 8434af02..3c1f18af 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig
@@ -104,6 +104,11 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL8188EU=y
 # BR2_PACKAGE_RTL8188EU is not set
 BR2_PACKAGE_RTL8188FU_OPENIPC=y
 
+# WiFi AP
+# BR2_PACKAGE_WIRELESS_CONFIGURATION is not set
+# BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT is not set
+# BR2_PACKAGE_MT7601U_AP_OPENIPC is not set
+
 # WIREGUARD
 BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_WIREGUARD_TOOLS=y
diff --git a/general/package/mt7601u-ap-openipc/0001-optimization.patch b/general/package/mt7601u-ap-openipc/0001-optimization.patch
deleted file mode 100644
index 29fb578b..00000000
--- a/general/package/mt7601u-ap-openipc/0001-optimization.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/etc/Wireless/RT2870AP/RT2870AP.dat	2018-03-24 12:12:30.000000000 +0300
-+++ b/etc/Wireless/RT2870AP/RT2870AP.dat	2021-12-16 00:57:15.692019329 +0300
-@@ -4,7 +4,7 @@
- CountryRegionABand=7
- CountryCode=TW
- BssidNum=1
--SSID=HD_MESH_1
-+SSID=OpenIPC
- WirelessMode=9
- TxRate=0
- Channel=11
-@@ -60,7 +60,7 @@
- RekeyInterval=0
- RekeyMethod=DISABLE
- PMKCachePeriod=10
--WPAPSK=1234567890
-+WPAPSK=openipc2021
- DefaultKeyID=1
- Key1Type=0
- Key1Str=
diff --git a/general/package/mt7601u-ap-openipc/Config.in b/general/package/mt7601u-ap-openipc/Config.in
index 94f04c90..acfb26fd 100644
--- a/general/package/mt7601u-ap-openipc/Config.in
+++ b/general/package/mt7601u-ap-openipc/Config.in
@@ -4,7 +4,5 @@ config BR2_PACKAGE_MT7601U_AP_OPENIPC
 	help
 	  Wireless driver mt7601u with AP mode.
 
-	  https://github.com/muratdemirtas/MT7601u
-
 comment "MT7601U_AP_OPENIPC needs a Linux kernel to be built"
 	depends on !BR2_LINUX_KERNEL
diff --git a/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk b/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk
index a3c1ee61..c8e633e1 100644
--- a/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk
+++ b/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk
@@ -4,35 +4,12 @@
 #
 ################################################################################
 
-MT7601U_AP_OPENIPC_VERSION = fd4a47e55af879f8a1affb89cfc1e91b8aa45306
-MT7601U_AP_OPENIPC_SITE = $(call github,muratdemirtas,MT7601u,$(MT7601U_AP_OPENIPC_VERSION))
-
-# MT7601U_AP_OPENIPC_VERSION = 188146b4147e1d86c916ffc33451bafda211cebb
-# MT7601U_AP_OPENIPC_SITE = $(call github,terence-deng,mt7601u,$(MT7601U_AP_OPENIPC_VERSION))
-
-# MT7601U_AP_OPENIPC_VERSION = cb1b0f3324b6dbf8f6a10276f5cb12382dc098e8
-# MT7601U_AP_OPENIPC_SITE = $(call github,eywalink,mt7601u,$(MT7601U_AP_OPENIPC_VERSION))
-
-# MT7601U_AP_OPENIPC_VERSION = f43c4893264f11065534e26d20d62d956e93c115
-# MT7601U_AP_OPENIPC_SITE = $(call github,THLIVSQAZ,MT7601U,$(MT7601U_AP_OPENIPC_VERSION))
-
-# MT7601U_AP_OPENIPC_VERSION = 4b57b1d6075634966eb55324ed53aa2b1c4f4912
-# MT7601U_AP_OPENIPC_SITE = $(call github,PolyVection,mt7601u-ap,$(MT7601U_AP_OPENIPC_VERSION))
-
-# MT7601U_AP_OPENIPC_VERSION = 624307427149e53b75937ccbe7cb235ec3ef2f58
-# MT7601U_AP_OPENIPC_SITE = $(call github,Anthony96922,mt7601u-ap,$(MT7601U_AP_OPENIPC_VERSION))
-
+MT7601U_AP_OPENIPC_VERSION = 1e3e907a87c8c79f567b7349c058327744424dce
+MT7601U_AP_OPENIPC_SITE = $(call github,openipc,mt7601u,$(MT7601U_AP_OPENIPC_VERSION))
 MT7601U_AP_OPENIPC_LICENSE = GPL-2.0
 
 MT7601U_AP_OPENIPC_MODULE_MAKE_OPTS = \
-	KVER=$(LINUX_VERSION_PROBED) \
 	KSRC=$(LINUX_DIR)
 
-define MT7601U_AP_OPENIPC_INSTALL_FIRMWARE
-	$(INSTALL) -D -m 644 $(@D)/etc/Wireless/RT2870AP/RT2870AP.dat \
-		$(TARGET_DIR)/etc/Wireless/RT2870AP/RT2870AP.dat
-endef
-MT7601U_AP_OPENIPC_POST_INSTALL_TARGET_HOOKS += MT7601U_AP_OPENIPC_INSTALL_FIRMWARE
-
 $(eval $(kernel-module))
 $(eval $(generic-package))