mt7601u-ap: bump to latest git HEAD
Removed outdated patches. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
parent
1f1bed5f5c
commit
07f7c90b93
@ -1,9 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
#
|
||||
# Copyright (C) 2021 ImmortalWrt
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
# Copyright (C) 2021-2022 ImmortalWrt.org
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
@ -11,23 +8,23 @@ PKG_NAME:=mt7601u-ap
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_DATE:=2020-05-01
|
||||
PKG_SOURCE_URL:=https://github.com/Anthony96922/mt7601u-ap.git
|
||||
PKG_SOURCE_VERSION:=624307427149e53b75937ccbe7cb235ec3ef2f58
|
||||
PKG_MIRROR_HASH:=70e8f7e94ddca09e1f55ef1b30a47fa7c504750ec654bc0c500f1a3d491eca97
|
||||
PKG_SOURCE_DATE:=2022-12-28
|
||||
PKG_SOURCE_VERSION:=bb9bfcfd8327bd0973c68417d41cafc41ca2ed09
|
||||
PKG_MIRROR_HASH:=0b34fc401eb027d46cb07b4579dd4212e93b7eb45c93591806582166611267b3
|
||||
|
||||
PKG_LICENSE:=GPL-2.0-only
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define KernelPackage/mt7601u-ap
|
||||
SUBMENU:=Wireless Drivers
|
||||
TITLE:=AP driver for MT7601U dongles
|
||||
DEPENDS:=+kmod-usb-core +wireless-tools @USB_SUPPORT
|
||||
DEPENDS:=+kmod-usb-core +wireless-tools @USB_SUPPORT +@DRIVER_WEXT_SUPPORT
|
||||
FILES:=$(PKG_BUILD_DIR)/os/linux/mt7601Uap.ko
|
||||
AUTOLOAD:=$(call AutoProbe,mt7601Uap)
|
||||
CONFLICTS:=kmod-mt7601u
|
||||
@ -37,25 +34,19 @@ define KernelPackage/mt7601u-ap/description
|
||||
AP driver for MT7601U chipset based adapters
|
||||
endef
|
||||
|
||||
MAKE_OPTS:= \
|
||||
ARCH="$(LINUX_KARCH)" \
|
||||
CROSS_COMPILE="$(KERNEL_CROSS)" \
|
||||
LINUX_SRC="$(LINUX_DIR)" \
|
||||
RT28xx_DIR="$(PKG_BUILD_DIR)" \
|
||||
RT28xx_MODE=AP \
|
||||
CHIPSET=7601U \
|
||||
MODULE=7601U \
|
||||
OSABL=NO \
|
||||
|
||||
define Build/Prepare
|
||||
$(Build/Prepare/Default)
|
||||
$(CP) $(PKG_BUILD_DIR)/os/linux/Makefile.6 $(PKG_BUILD_DIR)/os/linux/Makefile
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) -C "$(LINUX_DIR)" \
|
||||
$(MAKE_OPTS) \
|
||||
+$(KERNEL_MAKE) $(PKG_JOBS) \
|
||||
M="$(PKG_BUILD_DIR)/os/linux" \
|
||||
RT28xx_DIR="$(PKG_BUILD_DIR)" \
|
||||
RT28xx_MODE=AP \
|
||||
CHIPSET=7601U \
|
||||
MODULE=7601U \
|
||||
OSABL=NO \
|
||||
modules
|
||||
endef
|
||||
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
--- a/mcu/rtmp_mcu.c
|
||||
+++ b/mcu/rtmp_mcu.c
|
||||
@@ -31,6 +31,7 @@
|
||||
INT MCUBurstWrite(PRTMP_ADAPTER pAd, UINT32 Offset, UINT32 *Data, UINT32 Cnt)
|
||||
{
|
||||
RTUSBMultiWrite_nBytes(pAd, Offset, Data, Cnt * 4, 64);
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
INT MCURandomWrite(PRTMP_ADAPTER pAd, RTMP_REG_PAIR *RegPair, UINT32 Num)
|
||||
@@ -39,6 +40,8 @@ INT MCURandomWrite(PRTMP_ADAPTER pAd, RTMP_REG_PAIR *RegPair, UINT32 Num)
|
||||
|
||||
for (Index = 0; Index < Num; Index++)
|
||||
RTMP_IO_WRITE32(pAd, RegPair->Register, RegPair->Value);
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
VOID ChipOpsMCUHook(PRTMP_ADAPTER pAd, enum MCU_TYPE MCUType)
|
||||
@ -1,81 +0,0 @@
|
||||
--- a/os/linux/rt_linux.c
|
||||
+++ b/os/linux/rt_linux.c
|
||||
@@ -938,6 +938,7 @@ static inline void __RtmpOSFSInfoChange(OS_FS_INFO * pOSFSInfo, BOOLEAN bSet)
|
||||
pOSFSInfo->fsuid = current_fsuid();
|
||||
pOSFSInfo->fsgid = current_fsgid();
|
||||
#endif
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
|
||||
pOSFSInfo->fs = get_fs();
|
||||
set_fs(KERNEL_DS);
|
||||
} else {
|
||||
@@ -945,6 +946,7 @@ static inline void __RtmpOSFSInfoChange(OS_FS_INFO * pOSFSInfo, BOOLEAN bSet)
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
|
||||
current->fsuid = pOSFSInfo->fsuid;
|
||||
current->fsgid = pOSFSInfo->fsgid;
|
||||
+#endif
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -1785,8 +1787,10 @@ VOID RtmpDrvAllMacPrint(
|
||||
if (!msg)
|
||||
return;
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
|
||||
orig_fs = get_fs();
|
||||
set_fs(KERNEL_DS);
|
||||
+#endif
|
||||
|
||||
/* open file */
|
||||
file_w = filp_open(fileName, O_WRONLY | O_CREAT, 0);
|
||||
@@ -1813,7 +1817,9 @@ VOID RtmpDrvAllMacPrint(
|
||||
}
|
||||
filp_close(file_w, NULL);
|
||||
}
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
|
||||
set_fs(orig_fs);
|
||||
+#endif
|
||||
os_free_mem(NULL, msg);
|
||||
}
|
||||
|
||||
@@ -1834,8 +1840,10 @@ VOID RtmpDrvAllE2PPrint(
|
||||
if (!msg)
|
||||
return;
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
|
||||
orig_fs = get_fs();
|
||||
set_fs(KERNEL_DS);
|
||||
+#endif
|
||||
|
||||
/* open file */
|
||||
file_w = filp_open(fileName, O_WRONLY | O_CREAT, 0);
|
||||
@@ -1863,7 +1871,9 @@ VOID RtmpDrvAllE2PPrint(
|
||||
}
|
||||
filp_close(file_w, NULL);
|
||||
}
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
|
||||
set_fs(orig_fs);
|
||||
+#endif
|
||||
os_free_mem(NULL, msg);
|
||||
}
|
||||
|
||||
@@ -1877,8 +1887,10 @@ VOID RtmpDrvAllRFPrint(
|
||||
PSTRING fileName = "RFDump.txt";
|
||||
mm_segment_t orig_fs;
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
|
||||
orig_fs = get_fs();
|
||||
set_fs(KERNEL_DS);
|
||||
+#endif
|
||||
|
||||
/* open file */
|
||||
file_w = filp_open(fileName, O_WRONLY | O_CREAT, 0);
|
||||
@@ -1894,7 +1906,9 @@ VOID RtmpDrvAllRFPrint(
|
||||
}
|
||||
filp_close(file_w, NULL);
|
||||
}
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
|
||||
set_fs(orig_fs);
|
||||
+#endif
|
||||
}
|
||||
#endif /* DBG */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user