update

kiddin9 · Dec 1, 2024 · 375a5d0 · 375a5d0
1 parent cbc8a3b
commit 375a5d0
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 57 deletions.
diff --git a/devices/common/diy.sh b/devices/common/diy.sh
@@ -49,8 +49,9 @@ git_clone_path master https://github.com/coolsnowwolf/lede mv target/linux/gener
 rm -rf target/linux/generic/hack-6.6/929-Revert-genetlink*
 wget -N https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.6/613-netfilter_optional_tcp_window_check.patch -P target/linux/generic/pending-6.6/
 
+wget -N https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/16414.patch -P devices/common/patches/
+
 sed -i "/mediaurlbase/d" package/feeds/*/luci-theme*/root/etc/uci-defaults/*
-sed -i 's/=bbr/=cubic/' package/kernel/linux/files/sysctl-tcp-bbr.conf
 
 # find target/linux/x86 -name "config*" -exec bash -c 'cat kernel.conf >> "{}"' \;
 sed -i 's/max_requests 3/max_requests 20/g' package/network/services/uhttpd/files/uhttpd.config

diff --git a/devices/common/patches/imagebuilder.patch b/devices/common/patches/imagebuilder.patch
@@ -138,7 +138,7 @@
 +      $(OPKG) install "$$ipk" && rm -f "$$ipk" || true; \
 +	done; \
 +	)
-+	$(OPKG) install --force-maintainer --force-reinstall my-default-settings
++	$(OPKG) install --force-maintainer --force-reinstall my-default-settings 2>/dev/null
  else
  	$(APK) add --no-scripts $(firstword $(wildcard $(LINUX_DIR)/libc-*.apk $(PACKAGE_DIR)/libc-*.apk))
  	$(APK) add --no-scripts $(firstword $(wildcard $(LINUX_DIR)/kernel-*.apk $(PACKAGE_DIR)/kernel-*.apk))

diff --git a/devices/common/patches/kernel_version.patch b/devices/common/patches/kernel_version.patch
diff --git a/devices/common/patches/usb-audio.patch b/devices/common/patches/usb-audio.patch
diff --git a/devices/mediatek_filogic/diy.sh b/devices/mediatek_filogic/diy.sh
@@ -10,7 +10,6 @@ sed -i '/bootargs-.* = " root=\/dev\/fit0 rootwait";/d' target/linux/mediatek/dt
 sed -i "s/-stock//g" package/boot/uboot-envtools/files/mediatek_filogic
 sed -i "s/-stock//g" target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
 sed -i "s/-stock//g" target/linux/mediatek/filogic/base-files/etc/board.d/02_network
-sed -i "s/-stock//g" target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
 sed -i "s/-stock//g" target/linux/mediatek/base-files/lib/preinit/05_set_preinit_iface
 
 sed -i "s/openwrt-mediatek-filogic/kwrt-mediatek-filogic/g" target/linux/mediatek/image/filogic.mk

diff --git a/...ediatek_filogic/diy/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-ax3000t-an8855.dts b/...ediatek_filogic/diy/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-ax3000t-an8855.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+/dts-v1/;
+#include "mt7981b-xiaomi-mi-router-ax3000t.dts"
+
+/ { 
+	model = "Xiaomi Mi Router AX3000T with AN8855";
+	compatible = "xiaomi,mi-router-ax3000t-an8855", "mediatek,mt7981";
+
+	gsw_an8855: gsw@1 {
+	compatible = "airoha,an8855";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+	};
+};
+
+
diff --git a/devices/mediatek_filogic/patches/08-cmcc_rax3000m.patch b/devices/mediatek_filogic/patches/08-cmcc_rax3000m.patch
@@ -107,18 +107,18 @@
 
 --- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
-@@ -114,6 +114,8 @@ platform_do_upgrade() {
- 	yuncore,ax835)
- 		default_do_upgrade "$1"
- 		;;
-+  	cmcc,rax3000m-emmc|\
+@@ -95,6 +95,8 @@ platform_do_upgrade() {
+ 	acer,predator-w6d|\
+ 	acer,vero-w6m|\
+ 	arcadyan,mozart|\
++	cmcc,rax3000m-emmc|\
 +	cmcc,xr30-emmc|\
  	glinet,gl-mt2500|\
  	glinet,gl-mt6000|\
  	glinet,gl-x3000|\
-@@ -204,6 +206,8 @@ platform_copy_config() {
- 		;;
- 	acer,predator-w6|\
+@@ -206,6 +208,8 @@ platform_copy_config() {
+ 	acer,predator-w6d|\
+ 	acer,vero-w6m|\
  	arcadyan,mozart|\
 +	cmcc,rax3000m-emmc|\
 +	cmcc,xr30-emmc|\

diff --git a/devices/mediatek_filogic/patches/25-platform.patch b/devices/mediatek_filogic/patches/25-platform.patch
@@ -1,6 +1,6 @@
 --- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
-@@ -64,28 +64,17 @@ platform_do_upgrade() {
+@@ -64,27 +64,15 @@ platform_do_upgrade() {
  	local board=$(board_name)
 
  	case "$board" in
@@ -10,6 +10,7 @@
  	bananapi,bpi-r4|\
  	bananapi,bpi-r4-poe|\
 -	cmcc,rax3000m|\
+ 	gatonetworks,gdsp|\
 -	h3c,magic-nx30-pro|\
 -	jcg,q30-pro|\
 -	jdcloud,re-cp-03|\
@@ -19,13 +20,19 @@
  	openwrt,one|\
 -	netcore,n60|\
 -	qihoo,360t7|\
- 	tplink,tl-xdr4288|\
- 	tplink,tl-xdr6086|\
- 	tplink,tl-xdr6088|\
- 	tplink,tl-xtr8488|\
--	xiaomi,mi-router-ax3000t-ubootmod|\
--	xiaomi,redmi-router-ax6000-ubootmod|\
--	xiaomi,mi-router-wr30u-ubootmod|\
- 	zyxel,ex5601-t0-ubootmod)
- 		fit_do_upgrade "$1"
+ 	routerich,ax3000-ubootmod|\
+-	tplink,tl-xdr4288|\
+-	tplink,tl-xdr6086|\
+-	tplink,tl-xdr6088|\
+-	tplink,tl-xtr8488|\
+ 	xiaomi,mi-router-ax3000t-ubootmod|\
+ 	xiaomi,redmi-router-ax6000-ubootmod|\
+ 	xiaomi,mi-router-wr30u-ubootmod|\
+@@ -149,7 +137,6 @@ platform_do_upgrade() {
+ 			;;
+ 		esac
  		;;
+-	xiaomi,mi-router-ax3000t|\
+ 	xiaomi,mi-router-wr30u-stock|\
+ 	xiaomi,redmi-router-ax6000-stock)
+ 		CI_KERN_UBIPART=ubi_kernel
diff --git a/devices/mediatek_filogic/patches/27-tplink-tl-xdr.patch b/devices/mediatek_filogic/patches/27-tplink-tl-xdr.patch
@@ -76,4 +76,4 @@
 -  ARTIFACT/bl31-uboot.fip := mt7986-bl31-uboot tplink_tl-xdr6088
    $(call Device/tplink_tl-xdr-common)
  endef
- TARGET_DEVICES += tplink_tl-xdr6088
+ TARGET_DEVICES += tplink_tl-xdr6088
diff --git a/devices/mediatek_filogic/patches/35-ax3000t-an8855.patch b/devices/mediatek_filogic/patches/35-ax3000t-an8855.patch
@@ -0,0 +1,38 @@
+--- a/target/linux/mediatek/image/filogic.mk
++++ b/target/linux/mediatek/image/filogic.mk
+@@ -433,6 +433,22 @@ define Device/xiaomi_mi-router-ax3000t
+ endef
+ TARGET_DEVICES += xiaomi_mi-router-ax3000t
+
++define Device/xiaomi_mi-router-ax3000t-an8855
++  DEVICE_VENDOR := Xiaomi
++  DEVICE_MODEL := Mi Router AX3000T with AN8855
++  DEVICE_DTS := mt7981b-xiaomi-mi-router-ax3000t-an8855
++  DEVICE_DTS_DIR := ../dts
++  UBINIZE_OPTS := -E 5
++  BLOCKSIZE := 128k
++  PAGESIZE := 2048
++  IMAGE_SIZE := 114688k
++  KERNEL_IN_UBI := 1
++  IMAGES += factory.bin
++  IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
++  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
++endef
++TARGET_DEVICES += xiaomi_mi-router-ax3000t-an8855
++
+ define Device/glinet_gl-mt3000
+   DEVICE_VENDOR := GL.iNet
+   DEVICE_MODEL := GL-MT3000
+
+--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
++++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+@@ -131,6 +131,9 @@
+ 	xiaomi,redmi-router-ax6000-ubootmod)
+ 		ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" wan
+ 		;;
++	xiaomi,mi-router-ax3000t-an8855)
++	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
++		;;
+ 	*)
+ 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan
+ 		;;
diff --git a/devices/rockchip_armv8/.config b/devices/rockchip_armv8/.config
@@ -4,8 +4,12 @@ CONFIG_TARGET_rockchip_armv8=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_ALL_PROFILES=y
 
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_mmbox_anas3035=n
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_armsom_sige5=n
+
 CONFIG_TARGET_KERNEL_PARTSIZE=32
 
 CONFIG_PACKAGE_kmod-pcie_mhi=m
 CONFIG_PACKAGE_kmod-ath12k=n
 
+
diff --git a/devices/rockchip_armv8/diy.sh b/devices/rockchip_armv8/diy.sh
@@ -7,7 +7,15 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 rm -rf package/boot target/linux/rockchip linux/generic
 
-git_clone_path master https://github.com/coolsnowwolf/lede package/boot target/linux/rockchip linux/generic
+git_clone_path master https://github.com/coolsnowwolf/lede target/linux/rockchip linux/generic
+
+git_clone_path c74ed3282cf0aabd550203f0e500c0f4dcd2a872 https://github.com/coolsnowwolf/lede package/boot
+
+rm -rf  package/boot/uboot-rk35xx
+
+git_clone_path master https://github.com/coolsnowwolf/lede package/boot/uboot-rk35xx
+
+rm -rf package/boot/uboot-rk35xx/patches/001-cmd-fix_source.patch
 
 wget -N https://github.com/istoreos/istoreos/raw/istoreos-22.03/target/linux/rockchip/patches-5.10/305-r2s-pwm-fan.patch -P target/linux/rockchip/patches-6.6/
 wget -N https://github.com/openwrt/openwrt/raw/refs/heads/openwrt-24.10/target/linux/rockchip/Makefile -P target/linux/rockchip/
@@ -16,8 +24,6 @@ wget -N https://github.com/coolsnowwolf/lede/raw/master/include/kernel-6.6 -P in
 
 sed -i "/KernelPackage,ptp/d" package/kernel/linux/modules/other.mk
 
-rm -rf package/boot/uboot-rk35xx/patches/001-cmd-fix_source.patch
-
 #sed -i -e "s/configs\/dilusense-\(.*-.*_defconfig\)/configs\/\1/" \
 #	   -e "s/configs\/sharevdi-\(.*-.*_defconfig\)/configs\/\1/" \
 #	   -e "s/configs\/rongpin-\(.*-.*_defconfig\)/configs\/\1/" \

diff --git a/devices/rockchip_armv8/patches/fix.patch b/devices/rockchip_armv8/patches/fix.patch
@@ -3,9 +3,9 @@
 @@ -14,8 +14,8 @@ PKG_SOURCE_PROTO:=git
  PKG_SOURCE_URL:=https://github.com/radxa/u-boot
 
- PKG_SOURCE_DATE:=2024-10-29
--PKG_SOURCE_VERSION:=27398f1e19628407fabb279034653d23c9369f12
--PKG_MIRROR_HASH:=d0469f6c1f0d561d1495844fff2b50bc42af16fa4e33f5f42f092770a2bb4967
+ PKG_SOURCE_DATE:=2024-03-01
+-PKG_SOURCE_VERSION:=3b2035860d51a75fc70941acf9ae934140991b21
+-PKG_MIRROR_HASH:=4cba13e74fff830f946ee52d55c6a94e2de691d45db6cf69c481f91a8063e23f
 +PKG_SOURCE_VERSION:=00ac933690e0bf6b2adc2ab507e50bff05327729
 +PKG_MIRROR_HASH:=