Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2023-10-02 20:44:55 +08:00
parent 29eb193847 954142f477
commit 1870c73f29
5 changed files with 12 additions and 20 deletions
--- a/package/kernel/rtl8812au-ct/Makefile
+++ b/package/kernel/rtl8812au-ct/Makefile
@@ -7,7 +7,7 @@ PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=

 PKG_SOURCE_URL:=https://github.com/greearb/rtl8812AU_8821AU_linux.git
-PKG_MIRROR_HASH:=7ae5ebcba382de97942b13f8edbcb2ebff1a93eb25ae1d3de98317386fafb830
+PKG_MIRROR_HASH:=748f5c58aa3f391222c0c43db35b9ff4c30c9c987ca052a5a3cdf36193e5821b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2022-10-26
 PKG_SOURCE_VERSION:=9b2b203a217e1320602a0eb07c338a1bfca0f5a6
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=uci
 PKG_RELEASE:=1

-PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git
+PKG_SOURCE_URL:=$(PROJECT_GIT)/project/uci.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE=2023-08-10
+PKG_SOURCE_DATE:=2023-08-10
 PKG_SOURCE_VERSION:=5781664d5087ccc4b5ab58505883231212dbedbc
 PKG_MIRROR_HASH:=2d60a8543fa00cfc75df6417354b004abf58f672c91bf0a3bffe3ea1dbf84a4b

--- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/firmware/11-mt76-caldata
+++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/firmware/11-mt76-caldata
@@ -29,6 +29,14 @@ case "$FIRMWARE" in
 		;;
 	esac
 	;;
+"mediatek/mt7986_eeprom_mt7975_dual.bin")
+	case "$board" in
+	mercusys,mr90x-v1)
+		ln -sf /tmp/tp_data/MT7986_EEPROM.bin \
+			/lib/firmware/$FIRMWARE
+		;;
+	esac
+	;;
 "mediatek/mt7986_eeprom_mt7976.bin")
 	case "$board" in
 	acer,predator-w6)
--- a/target/linux/mediatek/filogic/base-files/lib/preinit/81_fix_eeprom
+++ b/target/linux/mediatek/filogic/base-files/lib/preinit/81_fix_eeprom
@@ -1,16 +0,0 @@
-. /lib/functions/system.sh
-
-preinit_fix_eeprom() {
-	case $(board_name) in
-	mercusys,mr90x-v1)
-		eeprom="/lib/firmware/mediatek/mt7986_eeprom_mt7975_dual.bin"
-		oem="/tmp/tp_data/MT7986_EEPROM.bin"
-		[ ! -L $eeprom -a -e $oem ] && \
-			mv -f $eeprom $eeprom.bak && ln -s $oem $eeprom
-		;;
-	*)
-		;;
-	esac
-}
-
-boot_hook_add preinit_main preinit_fix_eeprom
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -347,7 +347,7 @@ TARGET_DEVICES += glinet_gl-mt6000

 define Device/h3c_magic-nx30-pro
  DEVICE_VENDOR := H3C
-  DEVICE_MODEL := Magic NX30 Pro
+  DEVICE_MODEL := Magic NX30 Pro (OpenWrt U-Boot layout)
  DEVICE_DTS := mt7981b-h3c-magic-nx30-pro
  DEVICE_DTS_DIR := ../dts
  UBINIZE_OPTS := -E 5