From c354c069b32d7be34955c69e7124cfc469ffb83c Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Sun, 1 Oct 2023 13:07:31 +0300 Subject: [PATCH 1/3] uci: fix Makefile formatting Fix wrong declaration for PKG_SROUCE_URL and PKG_VERSION variables and add missing colon Signed-off-by: Oskari Rauta --- package/system/uci/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index ffbbce577c..86bfdfb978 100644 --- 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 From 85b0d7592c454f2e4e02be043a1e433c67df4e41 Mon Sep 17 00:00:00 2001 From: Mikhail Zhilkin Date: Sat, 30 Sep 2023 14:07:15 +0000 Subject: [PATCH 2/3] mediatek: fix eeprom loading (Mercusys MR90X v1) Commit mt76: drop default eeprom file for mt7986-firmware (e3aa645b267ca4f08773b5366583e9b0020fc3e9) breaks eeprom loading for Mercusys MR90X v1. As a result WiFi is not working at all. This commit adds Mercusus MR90x to the caldata script (it works after the commit mentioned above). And we can safely drop "81_fix_eeprom" script as it's no longer required. Fixes: e3aa645b267ca4f08773b5366583e9b0020fc3e9 Signed-off-by: Mikhail Zhilkin --- .../etc/hotplug.d/firmware/11-mt76-caldata | 8 ++++++++ .../filogic/base-files/lib/preinit/81_fix_eeprom | 16 ---------------- 2 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 target/linux/mediatek/filogic/base-files/lib/preinit/81_fix_eeprom diff --git 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 index e4d33879c6..bc1dcb0008 100644 --- 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 @@ -21,6 +21,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) diff --git a/target/linux/mediatek/filogic/base-files/lib/preinit/81_fix_eeprom b/target/linux/mediatek/filogic/base-files/lib/preinit/81_fix_eeprom deleted file mode 100644 index 0a842facca..0000000000 --- a/target/linux/mediatek/filogic/base-files/lib/preinit/81_fix_eeprom +++ /dev/null @@ -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 From 954142f4774aa6c0dca0a44179b3b0d119782f38 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 2 Oct 2023 12:59:18 +0200 Subject: [PATCH 3/3] rtl8812au-ct: Fix PKG_MIRROR_HASH The PKG_MIRROR_HASH is wrong, fix it. Found and fixed using this command: make package download check FIXUP=1 Fixes: c123e4f0533e ("rtl8812au-ct: bump to fix kernel 6.1 compile") Signed-off-by: Hauke Mehrtens --- package/kernel/rtl8812au-ct/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kernel/rtl8812au-ct/Makefile b/package/kernel/rtl8812au-ct/Makefile index e3b71f75aa..b0440a6858 100644 --- 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