From cc5caac70550319b72a8e8c30f224777f4032183 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Fri, 17 Mar 2023 14:17:53 +0800
Subject: [PATCH 01/12] update

---
 .github/workflows/Openwrt-AutoBuild.yml  |  4 ++--
 devices/common/.config                   | 11 +++--------
 devices/common/diy.sh                    |  6 +++++-
 devices/common/kernel_5.15.sh            |  4 ++--
 devices/rockchip_armv8/patches/r6s.patch | 20 ++++++++++----------
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml
index b58a7239739e..df824808f8bf 100644
--- a/.github/workflows/Openwrt-AutoBuild.yml
+++ b/.github/workflows/Openwrt-AutoBuild.yml
@@ -233,7 +233,7 @@ jobs:
     - name: Cache
       uses: stupidloud/cachewrtbuild@main
       with:
-        ccache: 'true'
+        ccache: 'false'
         clean: ${{ contains(github.event.action, 'nocache') }}
         prefix: ${{ github.workspace }}/openwrt
     
@@ -253,7 +253,7 @@ jobs:
         shopt -s extglob
         cd openwrt
         echo -e "$(($(nproc)+1)) thread compile"
-        make -j$(($(nproc)+1)) V=s 2>&1 | tee build.log | grep -i "Error 2" && tail -20 build.log && (curl -k --data chat_id="${{ env.TELEGRAM_CHAT_ID }}" --data "text=❌ OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译失败 😂" "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage";exit 1)
+        make -j$(($(nproc)+1)) || make V=s &>build.log || (tail -50 build.log; curl -k --data chat_id="${{ env.TELEGRAM_CHAT_ID }}" --data "text=❌ OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译失败 😂" "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage";exit 1)
         sed -i "s/# CONFIG_IB is not set/CONFIG_IB=y/" .config
         rm -rf staging_dir/toolchain-*/bin/*openwrt-linux-musl-lto-dump
         rm -rf staging_dir/toolchain-*/initial
diff --git a/devices/common/.config b/devices/common/.config
index 51d06516c694..040aaf1c9c0a 100644
--- a/devices/common/.config
+++ b/devices/common/.config
@@ -46,7 +46,7 @@ CONFIG_LUCI_LANG_zh_Hans=y
 CONFIG_LUCI_LANG_en=y
 CONFIG_PACKAGE_coremark=y
 CONFIG_DEVEL=y
-CONFIG_CCACHE=y
+CONFIG_CCACHE=n
 CONFIG_TOOLCHAINOPTS=y
 CONFIG_COREMARK_OPTIMIZE_O3=y
 CONFIG_COREMARK_ENABLE_MULTITHREADING=y
@@ -81,17 +81,12 @@ CONFIG_PACKAGE_ca-bundle=y
 
 CONFIG_PACKAGE_dockerd=m
 
-CONFIG_PACKAGE_kmod-hermes-pci=n
-CONFIG_PACKAGE_kmod-hermes-pcmcia=n
-CONFIG_PACKAGE_kmod-hermes-plx=n
-CONFIG_PACKAGE_kmod-ipw2100=n
-CONFIG_PACKAGE_kmod-ipw2200=n
-CONFIG_PACKAGE_kmod-libipw=n
-CONFIG_PACKAGE_kmod-rtl8189es=n
 CONFIG_PACKAGE_kmod-drm-nouveau=n
 CONFIG_PACKAGE_kmod-rtl8821cu=n
 CONFIG_PACKAGE_kmod-rtl88x2bu=n
 
+CONFIG_PACKAGE_kmod-sprd_pcie=n
+
 
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
diff --git a/devices/common/diy.sh b/devices/common/diy.sh
index a69d97b0e79c..507d76e4b8c4 100644
--- a/devices/common/diy.sh
+++ b/devices/common/diy.sh
@@ -14,6 +14,8 @@ sed -i '/	refresh_config();/d' scripts/feeds
 ./scripts/feeds install -a -p kiddin9 -f
 ./scripts/feeds install -a
 
+svn co https://github.com/openwrt/openwrt/trunk/package/kernel/mt76 package/feeds/kiddin9/mt76
+
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
 sed -i 's/$(TARGET_DIR)) install/$(TARGET_DIR)) install --force-overwrite --force-depends/' package/Makefile
@@ -25,7 +27,9 @@ sed -i "s/procd-ujail//" include/target.mk
 sed -i "s/^.*vermagic$/\techo '1' > \$(LINUX_DIR)\/.vermagic/" include/kernel-defaults.mk
 
 status=$(curl -H "Authorization: token $REPO_TOKEN" -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')
-while [ "$status" == "in_progress" ];do
+echo "$status"
+while [[ "$status" == "in_progress" || "$status" == "queued" ]];do
+	echo "wait 5s"
 	sleep 5
 	status=$(curl -H "Authorization: token $REPO_TOKEN" -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')
 done
diff --git a/devices/common/kernel_5.15.sh b/devices/common/kernel_5.15.sh
index 4df22dd12f94..eb98658de52b 100644
--- a/devices/common/kernel_5.15.sh
+++ b/devices/common/kernel_5.15.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-rm -rf tools target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk}
+rm -rf target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk}
 latest="$(curl -sfL https://github.com/openwrt/openwrt/commits/master/include | grep -o 'href=".*>kernel: bump 5.15' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
 latest=""
 mkdir new; cp -rf .git new/.git
@@ -9,7 +9,7 @@ cd new
 
 [ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $latest
 
-cp -rf --parents tools target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} ../
+cp -rf --parents target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} ../
 cd -
 
 sed -i "s/9 -Xe/extreme/" include/image.mk
diff --git a/devices/rockchip_armv8/patches/r6s.patch b/devices/rockchip_armv8/patches/r6s.patch
index 9125c96ebbce..701b117d4f28 100644
--- a/devices/rockchip_armv8/patches/r6s.patch
+++ b/devices/rockchip_armv8/patches/r6s.patch
@@ -26,25 +26,24 @@
 
 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
 +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
-@@ -14,6 +14,7 @@ rockchip_setup_interfaces()
+@@ -15,12 +15,16 @@ rockchip_setup_interfaces()
  	friendlyarm,nanopi-r2s|\
  	friendlyarm,nanopi-r4s|\
  	friendlyarm,nanopi-r4se|\
 +	friendlyarm,nanopi-r5c|\
+ 	rocktech,mpc1903|\
  	sharevdi,guangmiao-g4c|\
  	xunlong,orangepi-r1-plus|\
  	xunlong,orangepi-r1-plus-lts)
-@@ -33,6 +34,9 @@ rockchip_setup_interfaces()
- 	friendlyarm,nanopi-r5s)
- 		ucidef_set_interfaces_lan_wan "eth1 eth2" "eth0"
+ 		ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
  		;;
 +	friendlyarm,nanopi-r6s)
 +		ucidef_set_interfaces_lan_wan "eth1 eth0" "eth2"
 +		;;
- 	*)
- 		ucidef_set_interface_lan 'eth0'
+ 	hinlink,opc-h68k)
+ 		ucidef_set_interfaces_lan_wan 'eth1 eth2 eth3' 'eth0'
  		;;
-@@ -46,10 +50,10 @@ generate_mac_from_mmc_cid()
+@@ -48,10 +52,10 @@ generate_mac_from_mmc_cid()
  	echo "$(macaddr_unsetbit_mc "$(macaddr_setbit_la "${mac_base}")")"
  }
  
@@ -57,7 +56,7 @@
  	local address
  
  	if [ -f "$eeprom_path" ]; then
-@@ -90,8 +94,12 @@ rockchip_setup_macs()
+@@ -94,9 +98,13 @@ rockchip_setup_macs()
  		;;
  	friendlyarm,nanopi-r4s|\
  	friendlyarm,nanopi-r4se)
@@ -65,13 +64,14 @@
 -		lan_mac=$(nanopi_r4s_get_mac lan)
 +		wan_mac=$(nanopi_get_mac wan 2-0051)
 +		lan_mac=$(nanopi_get_mac lan 2-0051)
-+		;;
+ 		;;
 +	friendlyarm,nanopi-r6s)
 +		wan_mac=$(nanopi_get_mac wan 6-0053)
 +		lan_mac=$(nanopi_get_mac lan 6-0053)
- 		;;
++ 		;;
  	xunlong,orangepi-r1-plus|\
  	xunlong,orangepi-r1-plus-lts)
+ 		lan_mac=$(cat /sys/class/net/eth1/address)
 
 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
 +++ a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds

From f4db81f5b7a91e21458997a5db3bf6c927710128 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Fri, 17 Mar 2023 15:02:04 +0800
Subject: [PATCH 02/12] update

---
 .github/workflows/Openwrt-AutoBuild.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml
index df824808f8bf..1a9945d1dee9 100644
--- a/.github/workflows/Openwrt-AutoBuild.yml
+++ b/.github/workflows/Openwrt-AutoBuild.yml
@@ -233,14 +233,19 @@ jobs:
     - name: Cache
       uses: stupidloud/cachewrtbuild@main
       with:
-        ccache: 'false'
+        ccache: 'true'
         clean: ${{ contains(github.event.action, 'nocache') }}
         prefix: ${{ github.workspace }}/openwrt
     
     - name: Check space usage
       run: |
         shopt -s extglob
-        rm -rf openwrt/staging_dir/!(*${{ env.MTARGET }}*|host|hostpkg) openwrt/build_dir/!(*${{ env.MTARGET }}*|host|hostpkg)
+        cd openwrt
+        if [[ ! -f staging_dir/*${{ env.MTARGET }}*/bin ]]; then
+           make dirclean
+        else
+            rm -rf staging_dir/!(*${{ env.MTARGET }}*|host|hostpkg) build_dir/!(*${{ env.MTARGET }}*|host|hostpkg)
+        fi
         df -hT
 
     - name: SSH connection to Actions

From 0a7647a20704ef5b808b0418f70651b68707011f Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Fri, 17 Mar 2023 15:06:57 +0800
Subject: [PATCH 03/12] update

---
 .../diy/target/linux/armvirt/image/Makefile   | 133 ++----------------
 1 file changed, 8 insertions(+), 125 deletions(-)

diff --git a/devices/armvirt_64/diy/target/linux/armvirt/image/Makefile b/devices/armvirt_64/diy/target/linux/armvirt/image/Makefile
index 45efa4a6ccd7..3512460e2408 100644
--- a/devices/armvirt_64/diy/target/linux/armvirt/image/Makefile
+++ b/devices/armvirt_64/diy/target/linux/armvirt/image/Makefile
@@ -15,136 +15,19 @@ define Device/Default
   KERNEL := kernel-bin
 endef
 
-define Device/n1
-  DEVICE_VENDOR := Phicomm
-  DEVICE_MODEL := N1
-  SOC := s905d
+define Device/box
+  DEVICE_VENDOR := 
+  DEVICE_MODEL := 电视盒子全系列 / N1
   DEVICE_PACKAGES :=
 endef
-TARGET_DEVICES += n1
-
-define Device/beikeyun
-  DEVICE_VENDOR := 贝壳云
-  DEVICE_MODEL :=P1
-  SOC := rk3328
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += beikeyun
-
-define Device/vplus
-  DEVICE_VENDOR := 微加云
-  DEVICE_MODEL := V-Plus
-  SOC := h6
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += vplus
-
-define Device/l1pro
-  DEVICE_VENDOR := 我家云
-  DEVICE_MODEL := lL Pro
-  SOC := rk3328
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += l1pro
-
-define Device/mxqpro
-  DEVICE_VENDOR := MXQ
-  DEVICE_MODEL := Pro+
-  SOC := s905
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += mxqpro
-
-define Device/x96max
-  DEVICE_VENDOR := x96 Max
-  DEVICE_MODEL := s905x2
-  SOC := s905x2
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += x96max
-
-define Device/hk1
-  DEVICE_VENDOR := HK1
-  DEVICE_MODEL := Box
-  SOC := s905x3
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += hk1
-
-define Device/zyxq
-  DEVICE_VENDOR := 章鱼星球
-  DEVICE_MODEL := ZYXQ
-  SOC := s912
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += zyxq
-
-define Device/gtking
-  DEVICE_VENDOR := Beelink
-  DEVICE_MODEL := GT-King
-  SOC := s922x
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += gtking
-
-define Device/odroid-n2
-  DEVICE_VENDOR := Hardkernel
-  DEVICE_MODEL := Odroid-N2
-  SOC := s922x
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += odroid-n2
-
-define Device/rock5b
-  DEVICE_VENDOR := Radxa
-  DEVICE_MODEL := ROCK 5B
-  SOC := RK3588
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += rock5b
-
-define Device/h88k
-  DEVICE_VENDOR := HinLink
-  DEVICE_MODEL := H88K
-  SOC := RK3588
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += h88k
+TARGET_DEVICES += box
 
 define Image/Build
-	export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
 	export BIN_DIR=$(BIN_DIR); \
-	export PARTSIZE=$(CONFIG_TARGET_ROOTFS_PARTSIZE); \
-	cd /www/wwwroot/op.supes.top/bcache/armvirt/64/openwrt_packit; \
-	. ../modify_packit.sh; \
-	if [ $(PROFILE_SANITIZED) == "n1" ]; then \
-		./mk_s905d_n1.sh; \
-	elif [ $(PROFILE_SANITIZED) == "beikeyun" ]; then \
-		./mk_rk3328_beikeyun.sh; \
-	elif [ $(PROFILE_SANITIZED) == "l1pro" ]; then \
-		./mk_rk3328_l1pro.sh; \
-	elif [ $(PROFILE_SANITIZED) == "mxqpro" ]; then \
-		./mk_s905_mxqpro+.sh; \
-	elif [ $(PROFILE_SANITIZED) == "x96max" ]; then \
-		./mk_s905x2_x96max.sh; \
-	elif [ $(PROFILE_SANITIZED) == "zyxq" ]; then \
-		./mk_s912_zyxq.sh; \
-	elif [ $(PROFILE_SANITIZED) == "gtking" ]; then \
-		./mk_s922x_gtking.sh; \
-	elif [ $(PROFILE_SANITIZED) == "odroid-n2" ]; then \
-		./mk_s922x_odroid-n2.sh; \
-	elif [ $(PROFILE_SANITIZED) == "vplus" ]; then \
-		./mk_h6_vplus.sh; \
-	elif [ $(PROFILE_SANITIZED) == "fastrhino_r68s" ]; then \
-		./mk_rk3568_r68s.sh; \
-	elif [ $(PROFILE_SANITIZED) == "hk1" ]; then \
-		./mk_s905x3_multi.sh; \
-	elif [ $(PROFILE_SANITIZED) == "rock5b" ]; then \
-		./mk_rk3588_rock5b.sh; \
-	elif [ $(PROFILE_SANITIZED) == "h88k" ]; then \
-		./mk_rk3588_h88k.sh; \
-	fi; \
-	gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).img || true
+	export DATE=$(DATE); \
+	cd /www/wwwroot/op.supes.top/bcache/armvirt/64/amlogic-s9xxx-openwrt; \
+	. ../modify_amlogic.sh; \
+	./make -k 5.15.100 -b $(MORE) -s $(CONFIG_TARGET_ROOTFS_PARTSIZE)
 endef
 
 $(eval $(call BuildImage))

From b7f3b1298254b0e7369a362a04af7c7ca8315633 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Mon, 20 Mar 2023 05:08:54 +0800
Subject: [PATCH 04/12] update

---
 devices/ath79_nand/.config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/devices/ath79_nand/.config b/devices/ath79_nand/.config
index 9d3a9ed3cd26..c7a5ab4385f1 100644
--- a/devices/ath79_nand/.config
+++ b/devices/ath79_nand/.config
@@ -6,6 +6,7 @@ CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-ar300m-nand=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-ar750s-nor-nand=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-e750=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-xe300=y
+CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-x1200-nor-nand=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_r6100=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr3700-v4=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr4300=y
@@ -13,7 +14,9 @@ CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr4300-v2=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr4300sw=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr4300tn=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr4500-v3=y
+CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_linksys_ea4500-v3=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_zte_mf286=y
+CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_zte_mf281=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 

From cf64020bb4a900dfeca633a266b01d6e02b18ec3 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Mon, 20 Mar 2023 05:26:13 +0800
Subject: [PATCH 05/12] update

---
 devices/ath79_nand/.config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/devices/ath79_nand/.config b/devices/ath79_nand/.config
index c7a5ab4385f1..152f5b8dd832 100644
--- a/devices/ath79_nand/.config
+++ b/devices/ath79_nand/.config
@@ -6,7 +6,6 @@ CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-ar300m-nand=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-ar750s-nor-nand=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-e750=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-xe300=y
-CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_glinet_gl-x1200-nor-nand=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_r6100=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr3700-v4=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_netgear_wndr4300=y

From 47b970620f0090decd4e600d58923a42557a7b77 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Thu, 23 Mar 2023 04:35:48 +0800
Subject: [PATCH 06/12] update

---
 .github/workflows/Openwrt-AutoBuild.yml | 2 +-
 devices/common/diy.sh                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml
index 1a9945d1dee9..91c85b80e1a8 100644
--- a/.github/workflows/Openwrt-AutoBuild.yml
+++ b/.github/workflows/Openwrt-AutoBuild.yml
@@ -297,7 +297,7 @@ jobs:
         SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
         ARGS: "-avzr"
         SOURCE: openwrt/bin/targets
-        REMOTE_HOST: op.supes.top
+        REMOTE_HOST: xyt.supes.top
         REMOTE_PORT: '223'
         REMOTE_USER: root
         TARGET: "/www/wwwroot/op.supes.top/releases/tmp/"
diff --git a/devices/common/diy.sh b/devices/common/diy.sh
index 507d76e4b8c4..02dd015adafa 100644
--- a/devices/common/diy.sh
+++ b/devices/common/diy.sh
@@ -15,6 +15,7 @@ sed -i '/	refresh_config();/d' scripts/feeds
 ./scripts/feeds install -a
 
 svn co https://github.com/openwrt/openwrt/trunk/package/kernel/mt76 package/feeds/kiddin9/mt76
+svn co https://github.com/openwrt/openwrt/trunk/package/network/services/hostapd  package/feeds/kiddin9/hostapd
 
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile

From 60490de045059b3b10a88c0bd6b00967640aee45 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Sat, 25 Mar 2023 01:09:10 +0800
Subject: [PATCH 07/12] Update Openwrt-AutoBuild.yml

---
 .github/workflows/Openwrt-AutoBuild.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml
index 91c85b80e1a8..b5bcf4a80935 100644
--- a/.github/workflows/Openwrt-AutoBuild.yml
+++ b/.github/workflows/Openwrt-AutoBuild.yml
@@ -297,8 +297,8 @@ jobs:
         SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
         ARGS: "-avzr"
         SOURCE: openwrt/bin/targets
-        REMOTE_HOST: xyt.supes.top
-        REMOTE_PORT: '223'
+        REMOTE_HOST: ${{ secrets.SERVER_HOST }}
+        REMOTE_PORT: ${{ secrets.SERVER_PORT }}
         REMOTE_USER: root
         TARGET: "/www/wwwroot/op.supes.top/releases/tmp/"
 

From 4f250f11fa72f291b6c48c2426bc8e680bc229fe Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Sun, 26 Mar 2023 03:55:19 +0800
Subject: [PATCH 08/12] update

---
 devices/rockchip_armv8/patches/r6s.patch | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/devices/rockchip_armv8/patches/r6s.patch b/devices/rockchip_armv8/patches/r6s.patch
index 701b117d4f28..a93b8dfe5c07 100644
--- a/devices/rockchip_armv8/patches/r6s.patch
+++ b/devices/rockchip_armv8/patches/r6s.patch
@@ -26,23 +26,17 @@
 
 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
 +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
-@@ -15,12 +15,16 @@ rockchip_setup_interfaces()
+@@ -16,6 +16,10 @@ rockchip_setup_interfaces()
  	friendlyarm,nanopi-r2s|\
  	friendlyarm,nanopi-r4s|\
  	friendlyarm,nanopi-r4se|\
 +	friendlyarm,nanopi-r5c|\
- 	rocktech,mpc1903|\
- 	sharevdi,guangmiao-g4c|\
- 	xunlong,orangepi-r1-plus|\
- 	xunlong,orangepi-r1-plus-lts)
- 		ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
- 		;;
 +	friendlyarm,nanopi-r6s)
 +		ucidef_set_interfaces_lan_wan "eth1 eth0" "eth2"
 +		;;
- 	hinlink,opc-h68k)
- 		ucidef_set_interfaces_lan_wan 'eth1 eth2 eth3' 'eth0'
- 		;;
+ 	rocktech,mpc1903|\
+ 	sharevdi,guangmiao-g4c|\
+ 	xunlong,orangepi-r1-plus|\
 @@ -48,10 +52,10 @@ generate_mac_from_mmc_cid()
  	echo "$(macaddr_unsetbit_mc "$(macaddr_setbit_la "${mac_base}")")"
  }

From 11c25ab7294f5aeb045d1a86451c735e335d95d0 Mon Sep 17 00:00:00 2001
From: iqbal fasya <79214502+scoout@users.noreply.github.com>
Date: Mon, 27 Mar 2023 16:05:26 +0700
Subject: [PATCH 09/12] Update diy.sh

---
 devices/x86_generic/diy.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/devices/x86_generic/diy.sh b/devices/x86_generic/diy.sh
index d8fa56b66234..606f0b408752 100644
--- a/devices/x86_generic/diy.sh
+++ b/devices/x86_generic/diy.sh
@@ -31,6 +31,9 @@ CONFIG_MMC_DEBUG=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PCI=y
+CONFIG_MMC_TIFM_SD=y
+CONFIG_TIFM_CORE=y
+CONFIG_TIFM_7XX1=y
 ' >> ./target/linux/x86/config-5.15
 
 sed -i "s/DEVICE_MODEL := x86/DEVICE_MODEL := x86\/32/" target/linux/x86/image/generic.mk

From 1e4666bb2859a4f9119bdbe90f13e06bc5e22477 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Thu, 30 Mar 2023 01:58:38 +0800
Subject: [PATCH 10/12] update

---
 devices/ramips_mt7620/.config            |  1 +
 devices/ramips_mt7621/.config            |  1 +
 devices/rockchip_armv8/patches/r6s.patch | 44 +++---------------------
 3 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/devices/ramips_mt7620/.config b/devices/ramips_mt7620/.config
index f905becd9fe4..08c5d1f4198e 100644
--- a/devices/ramips_mt7620/.config
+++ b/devices/ramips_mt7620/.config
@@ -14,5 +14,6 @@ CONFIG_TARGET_DEVICE_ramips_mt7620_DEVICE_xiaomi_miwifi-mini=y
 CONFIG_TARGET_DEVICE_ramips_mt7620_DEVICE_youku_yk-l1=y
 CONFIG_TARGET_DEVICE_ramips_mt7620_DEVICE_youku_yk-l1c=y
 CONFIG_TARGET_DEVICE_ramips_mt7620_DEVICE_xiaomi_miwifi-r3=y
+CONFIG_TARGET_DEVICE_ramips_mt7620_DEVICE_zbtlink_zbt-we826-32m=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
diff --git a/devices/ramips_mt7621/.config b/devices/ramips_mt7621/.config
index f378fba0a278..83f764011d04 100644
--- a/devices/ramips_mt7621/.config
+++ b/devices/ramips_mt7621/.config
@@ -53,5 +53,6 @@ CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_jdcloud_luban=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_h3c_tx1800-plus=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_h3c_tx1801-plus=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_h3c_tx1806=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_zbtlink_zbt-wg3526-32m=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
diff --git a/devices/rockchip_armv8/patches/r6s.patch b/devices/rockchip_armv8/patches/r6s.patch
index a93b8dfe5c07..dfcbd9720437 100644
--- a/devices/rockchip_armv8/patches/r6s.patch
+++ b/devices/rockchip_armv8/patches/r6s.patch
@@ -1,17 +1,8 @@
 --- a/target/linux/rockchip/image/armv8.mk
 +++ b/target/linux/rockchip/image/armv8.mk
-@@ -52,4 +52,22 @@
+@@ -52,4 +52,13 @@
  TARGET_DEVICES += friendlyarm_nanopi-r2s
  
-+define Device/friendlyarm_nanopi-r5c
-+  DEVICE_VENDOR := FriendlyARM
-+  DEVICE_MODEL := NanoPi R5C
-+  SOC := rk3328
-+  DEVICE_PACKAGES := -luci-app-gpsysupgrade rtl8822ce-firmware
-+  DEVICE_DTS = rockchip/rk3328-nanopi-r2s
-+endef
-+TARGET_DEVICES += friendlyarm_nanopi-r5c
-+
 +define Device/friendlyarm_nanopi-r6s
 +  DEVICE_VENDOR := FriendlyARM
 +  DEVICE_MODEL := NanoPi R6S
@@ -26,11 +17,10 @@
 
 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
 +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
-@@ -16,6 +16,10 @@ rockchip_setup_interfaces()
+@@ -16,6 +16,9 @@ rockchip_setup_interfaces()
  	friendlyarm,nanopi-r2s|\
  	friendlyarm,nanopi-r4s|\
  	friendlyarm,nanopi-r4se|\
-+	friendlyarm,nanopi-r5c|\
 +	friendlyarm,nanopi-r6s)
 +		ucidef_set_interfaces_lan_wan "eth1 eth0" "eth2"
 +		;;
@@ -69,15 +59,10 @@
 
 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
 +++ a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
-@@ -30,6 +30,16 @@ friendlyarm,nanopi-r5s)
+@@ -30,6 +30,11 @@ friendlyarm,nanopi-r5s)
  hinlink,opc-h68k)
  	ucidef_set_led_netdev "wan" "WAN" "blue:net" "eth0"
  	;;
-+friendlyarm,nanopi-r5c)
-+	ucidef_set_led_netdev "wan" "WAN" "wan_led" "eth0" "link"
-+	ucidef_set_led_netdev "lan1" "LAN1" "lan1_led" "eth1" "link"
-+	ucidef_set_led_netdev "lan2" "LAN2" "lan2_led" "wlan0" "link"
-+	;;
 +friendlyarm,nanopi-r6s)
 +	ucidef_set_led_netdev "wan" "WAN" "wan_led" "eth2" "link"
 +	ucidef_set_led_netdev "lan1" "LAN1" "lan1_led" "eth1" "link"
@@ -89,20 +74,10 @@
 
 --- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
 +++ a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
-@@ -51,5 +51,27 @@ friendlyarm,nanopi-r5s)
+@@ -51,5 +51,17 @@ friendlyarm,nanopi-r5s)
  	set_interface_core 2 "eth1"
  	set_interface_core 4 "eth2"
  	;;
-+friendlyarm,nanopi-r5c)
-+	set_interface_core 2 "eth0-0"
-+	set_interface_core 2 "eth0-16"
-+	set_interface_core 2 "eth0-18"
-+	echo d > /sys/class/net/eth0/queues/rx-0/rps_cpus
-+	set_interface_core 4 "eth1-0"
-+	set_interface_core 4 "eth1-16"
-+	set_interface_core 4 "eth1-18"
-+	echo b > /sys/class/net/eth1/queues/rx-0/rps_cpus
-+	;;
 +friendlyarm,nanopi-r6s)
 +	set_interface_core 2 "eth0"
 +	echo 3e > /sys/class/net/eth0/queues/rx-0/rps_cpus
@@ -120,7 +95,7 @@
 
 --- a/target/linux/rockchip/image/Makefile
 +++ b/target/linux/rockchip/image/Makefile
-@@ -80,3 +80,25 @@
+@@ -80,3 +80,13 @@
  include $(SUBTARGET).mk
  
 +define Image/Build
@@ -133,15 +108,6 @@
 +		./build.sh sd-img; \
 +		[ "$(MORE)" == "eflasher" ] && ./build.sh emmc-img; \
 +		rm -rf $(BIN_DIR)/*r6s-squashfs-sysupgrade.img.gz $(BIN_DIR)/images-for-eflasher; \
-+	elif [ $(PROFILE_SANITIZED) == "friendlyarm_nanopi-r5c" ]; then \
-+		export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
-+		export BIN_DIR=$(BIN_DIR); \
-+		export TOPDIR=$(TOPDIR); \
-+		cd /www/wwwroot/op.supes.top/bcache/rockchip/armv8/friendlywrt22-rk3568; \
-+		. ../modify_packit.sh; \
-+		./build.sh sd-img; \
-+		[ "$(MORE)" == "eflasher" ] && ./build.sh emmc-img; \
-+		rm -rf $(BIN_DIR)/*r6s-squashfs-sysupgrade.img.gz $(BIN_DIR)/images-for-eflasher; \
 +	fi
 +endef
 +

From 329697837dad0884bb90c6610854378fc1457cbd Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Thu, 30 Mar 2023 03:11:31 +0800
Subject: [PATCH 11/12] Update r6s.patch

---
 devices/rockchip_armv8/patches/r6s.patch | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/devices/rockchip_armv8/patches/r6s.patch b/devices/rockchip_armv8/patches/r6s.patch
index dfcbd9720437..5455bc74b01e 100644
--- a/devices/rockchip_armv8/patches/r6s.patch
+++ b/devices/rockchip_armv8/patches/r6s.patch
@@ -74,10 +74,10 @@
 
 --- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
 +++ a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
-@@ -51,5 +51,17 @@ friendlyarm,nanopi-r5s)
- 	set_interface_core 2 "eth1"
- 	set_interface_core 4 "eth2"
- 	;;
+@@ -28,6 +28,18 @@ set_interface_core() {
+ }
+ 
+ case "$(board_name)" in
 +friendlyarm,nanopi-r6s)
 +	set_interface_core 2 "eth0"
 +	echo 3e > /sys/class/net/eth0/queues/rx-0/rps_cpus
@@ -90,8 +90,9 @@
 +	set_interface_core 80 "eth2-18"
 +	echo fe > /sys/class/net/eth2/queues/rx-0/rps_cpus
 +	;;
- esac
- 
+ fastrhino,r66s|\
+ friendlyarm,nanopi-r5c|\
+ firefly,rk3568-roc-pc)
 
 --- a/target/linux/rockchip/image/Makefile
 +++ b/target/linux/rockchip/image/Makefile

From d9ae9a3882081b4ed0c5f76af534b4405d95f443 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Thu, 30 Mar 2023 05:09:52 +0800
Subject: [PATCH 12/12] Update r6s.patch

---
 devices/rockchip_armv8/patches/r6s.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/devices/rockchip_armv8/patches/r6s.patch b/devices/rockchip_armv8/patches/r6s.patch
index 5455bc74b01e..08f053fce79a 100644
--- a/devices/rockchip_armv8/patches/r6s.patch
+++ b/devices/rockchip_armv8/patches/r6s.patch
@@ -96,7 +96,8 @@
 
 --- a/target/linux/rockchip/image/Makefile
 +++ b/target/linux/rockchip/image/Makefile
-@@ -80,3 +80,13 @@
+@@ -79,4 +79,17 @@ endif
+ 
  include $(SUBTARGET).mk
  
 +define Image/Build