update

.github/workflows/Openwrt-AutoBuild.yml

@@ -70,6 +70,8 @@ jobs:
             echo "MTARGET=aarch64_cortex-a53" >> $GITHUB_ENV
         elif [[ ${{matrix.target}} == "ramips_mt7621" ]]; then
             echo "MTARGET=mipsel_24kc" >> $GITHUB_ENV
+        elif [[ ${{matrix.target}} == "ipq40xx_generic" ]]; then
+            echo "MTARGET=arm_cortex-a7_neon-vfpv4" >> $GITHUB_ENV
         else
           echo "ARCH=linux/arm64" >> $GITHUB_ENV
           if [[ ${{matrix.target}} == "bcm27xx_bcm2711" ]]; then

.github/workflows/repo-dispatcher.yml

@@ -79,4 +79,9 @@ jobs:
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
           -d '{"event_type": "ipq807x ${{ github.event.inputs.version }}", "client_payload": {"target": "ipq807x"}}'
+          curl \
+          -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
+          -d '{"event_type": "ipq40xx_generic ${{ github.event.inputs.version }}", "client_payload": {"target": "ipq40xx_generic"}}'
 

README.md

@@ -1,4 +1,4 @@
-#### OpenWrt with NGINX for X86/64, NanoPi R2S, NanoPi R4S, NanoPi R2C, Phicomm N1, NanoPi NEO3, 树莓派 4B, DoorNet1, DoorNet2, 香橙派 Orange Pi R1 Plus, 香橙派 Orange Pi R1 Plus LTS, 红米AX6, 小米AX3600, 小米AX9000, 红米AX6S/小米AX3200, 红米AC2100, 小米AC2100, 小米CR6606/TR606(联通版), CR6608/TR608(移动版), CR6609/TR609(电信版), 小米4, 小米 R3G, 小米R3P, 小娱C5, newifi-d2, H1 Box, 贝壳云 P1 , 我家云 lL Pro, x96 Max, 微加云 V-Plus, 章鱼星球 ZYXQ, GT-King, Odroid N2, MXQ Pro+
+#### OpenWrt with NGINX for X86/64, NanoPi R2S, NanoPi R4S, NanoPi R5S, NanoPi R2C, Phicomm N1, NanoPi NEO3, 树莓派 4B, DoorNet1, DoorNet2, 香橙派 Orange Pi R1 Plus, 香橙派 Orange Pi R1 Plus LTS, 红米AX6, 小米AX3600, 小米AX9000, 红米AX6S/小米AX3200, 红米AC2100, 小米AC2100, 小米CR6606/TR606(联通版), CR6608/TR608(移动版), CR6609/TR609(电信版), 小米4, 小米 R3G, 小米R3P, 小娱C5, newifi-d2, H1 Box, 贝壳云 P1 , 我家云 lL Pro, x96 Max, 微加云 V-Plus, 章鱼星球 ZYXQ, GT-King, Odroid N2, MXQ Pro+
 [1]: https://img.shields.io/badge/license-GPLV2-brightgreen.svg
 [2]: /LICENSE
 [3]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg
@@ -19,7 +19,7 @@
 [![Issue Welcome][5]][6]
 [![AutoBuild][12]][13]
 
-<a href="https://t.me/opwrts" target="_blank">Telegram</a>
+<a href="https://t.me/opwrt" target="_blank">TG通知频道</a>
 ## 1. **特色**
 
 + Cutting edge,openwrt官方openwrt-22.03分支版本, Kernel 5.15, 与官方最新源码同步.

devices/common/diy.sh

@@ -8,7 +8,7 @@ sed -i "s?targets/%S/packages?targets/%S/$kernel_v?" include/feeds.mk
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
 sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advanced luci-app-firewall luci-app-gpsysupgrade luci-app-opkg luci-app-upnp luci-app-autoreboot \
-luci-app-wizard luci-app-attendedsysupgrade luci-base luci-compat luci-lib-ipkg \
+luci-app-wizard luci-app-attendedsysupgrade luci-base luci-compat luci-lib-ipkg luci-lib-fs \
 coremark wget-ssl curl htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server /" include/target.mk
 sed -i "s/procd-ujail//" include/target.mk
 

devices/common/patches/imagebuilder.patch

@@ -118,6 +118,16 @@
    endef
  endif
  
+@@ -567,7 +591,7 @@ define Device/Build/kernel
+ endef
+ 
+ define Device/Build/image
+-  GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
++  GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $($(CONFIG_TARGET_IMAGES_GZIP)),.gz))
+   $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
+ 	  $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \
+ 	  $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX))
+
 --- a/scripts/json_overview_image_info.py
 +++ b/scripts/json_overview_image_info.py
 @@ -47,7 +47,7 @@ def get_initial_output(image_info):

devices/ipq40xx_generic/.config

@@ -0,0 +1,11 @@
+
+CONFIG_TARGET_ipq40xx=y
+CONFIG_TARGET_ipq40xx_generic=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_asus_rt-ac42u=y
+CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_asus_rt-ac58u=y
+
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
+
+
+

devices/ipq40xx_generic/diy.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+shopt -s extglob
+
+
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq luci-app-turboacc/' target/linux/mediatek/Makefile
+

devices/ramips_mt7621/diy.sh

@@ -7,3 +7,5 @@ curl -sfL https://raw.githubusercontent.com/x-wrt/x-wrt/22.03/target/linux/ramip
 svn export --force https://github.com/x-wrt/x-wrt/trunk/target/linux/ramips/files/drivers/net/ethernet/ralink target/linux/ramips/files/drivers/net/ethernet/ralink
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-natflow-users natflow-boot/' target/linux/ramips/Makefile
+
+rm -rf target/linux/generic/pending-5.10/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch

devices/rockchip_armv8/.config

@@ -5,6 +5,7 @@ CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y
 CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y
 CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2c=y
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r5s=y
 CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-neo3=y
 CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_embedfire_doornet1=y
 CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_embedfire_doornet2=y

devices/rockchip_armv8/diy.sh

@@ -10,6 +10,9 @@ svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/rockchip target/l
 rm -rf target/linux/rockchip/{.svn,patches-5.10/.svn}
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/rockchip/patches-5.10 target/linux/rockchip/patches-5.10
 rm -rf target/linux/rockchip/patches-5.10/{002-net-usb*,003-dt-bindings*,006-rockchip-rk3399*}
+svn export --force https://github.com/friendlyarm/friendlywrt/trunk/target/linux/rockchip/armv8/base-files/etc/modules.d target/linux/rockchip/armv8/base-files/etc/modules.d
+
+mv -f tmp/r8125 feeds/kiddin9/
 
 sed -i -e 's,kmod-r8168,kmod-r8169,g' target/linux/rockchip/image/armv8.mk
 

devices/rockchip_armv8/patches/add_extra_CPU_FLAGS.patch

@@ -0,0 +1,22 @@
+--- a/include/target.mk
++++ b/include/target.mk
+@@ -259,9 +259,18 @@ ifeq ($(DUMP),1)
+     CPU_CFLAGS_arc700 = -mcpu=arc700
+     CPU_CFLAGS_archs = -mcpu=archs
+   endif
++  ifeq ($(BOARD),rockchip)
++    CPU_CFLAGS = -O3 -pipe
++    CPU_CFLAGS_cortex-a53 = -mcpu=cortex-a53
++    CPU_CFLAGS_cortex-a55 = -march=armv8-a+crypto+crc -mcpu=cortex-a55+crypto+crc -mtune=cortex-a55
++    CPU_CFLAGS_cortex-a73 = -march=armv8-a+crypto+crc -mcpu=cortex-a73.cortex-a53+crypto+crc -mtune=cortex-a73.cortex-a53
++    ifneq ($(SOC_CFLAGS),)
++      CPU_CFLAGS_generic = $(SOC_CFLAGS)
++    endif
++  endif
+   ifneq ($(CPU_TYPE),)
+     ifndef CPU_CFLAGS_$(CPU_TYPE)
+-      $(warning CPU_TYPE "$(CPU_TYPE)" doesn't correspond to a known type)
++      $(warning CPU_TYPE "$(CPU_TYPE)" "doesn't correspond to a known type")
+     endif
+   endif
+   DEFAULT_CFLAGS=$(strip $(CPU_CFLAGS) $(CPU_CFLAGS_$(CPU_TYPE)) $(CPU_CFLAGS_$(CPU_SUBTYPE)))

devices/rockchip_armv8/patches/r2s_exchange_lan_wan.patch

@@ -1,19 +0,0 @@
---- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
-+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
-@@ -11,13 +11,15 @@ rockchip_setup_interfaces()
- 	embedfire,doornet1|\
- 	embedfire,doornet2|\
- 	friendlyarm,nanopi-r2c|\
--	friendlyarm,nanopi-r2s|\
- 	friendlyarm,nanopi-r4s|\
- 	sharevdi,guangmiao-g4c|\
- 	xunlong,orangepi-r1-plus|\
- 	xunlong,orangepi-r1-plus-lts)
- 		ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
- 		;;
-+	friendlyarm,nanopi-r2s)
-+		ucidef_set_interfaces_lan_wan 'eth0' 'eth1'
-+ 		;;
- 	*)
- 		ucidef_set_interface_lan 'eth0'
- 		;;

devices/rockchip_armv8/patches/r5s.patch

@@ -0,0 +1,74 @@
+--- a/target/linux/rockchip/image/armv8.mk
++++ b/target/linux/rockchip/image/armv8.mk
+@@ -52,4 +52,13 @@
+ TARGET_DEVICES += friendlyarm_nanopi-r2s
+ 
++define Device/friendlyarm_nanopi-r5s
++  DEVICE_VENDOR := FriendlyARM
++  DEVICE_MODEL := NanoPi R5S
++  SOC := rk3328
++  DEVICE_PACKAGES := kmod-r8125 luci-app-emmc-tools
++  DEVICE_DTS = rockchip/rk3328-nanopi-r2s
++endef
++TARGET_DEVICES += friendlyarm_nanopi-r5s
++
+ define Device/friendlyarm_nanopi-r4s
+   DEVICE_VENDOR := FriendlyARM
+
+--- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
++++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
+@@ -18,6 +18,9 @@ rockchip_setup_interfaces()
+ 	xunlong,orangepi-r1-plus-lts)
+ 		ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
+ 		;;
++	friendlyelec,nanopi-r5s)
++		ucidef_set_interfaces_lan_wan 'eth1 eth2' 'eth0'
++		;;
+ 	*)
+ 		ucidef_set_interface_lan 'eth0'
+ 		;;
+@@ -60,6 +63,10 @@ rockchip_setup_macs()
+ 		lan_mac=$(cat /sys/class/net/eth1/address)
+ 		wan_mac=$(macaddr_add "$lan_mac" -1)
+ 		;;
++	friendlyelec,nanopi-r5s)
++		wan_mac=$(nanopi_r2s_generate_mac mmcblk2)
++		lan_mac=$(macaddr_add "$wan_mac" 1)
++		;;
+ 	esac
+ 
+ 	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
+
+--- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
++++ a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
+@@ -24,4 +24,9 @@
+ 	ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1"
+ 	;;
++friendlyelec,nanopi-r5s)
++	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" "eth2" "link"
++	;;
+ esac
+ 
+
+--- 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
+@@ -43,4 +43,16 @@
+ 	set_interface_core 20 "eth1"
+ 	;;
++friendlyelec,nanopi-r5s)
++	set_interface_core 8 "eth0"
++	echo f > /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
++	set_interface_core 2 "eth2-0"
++	set_interface_core 2 "eth2-16"
++	set_interface_core 2 "eth2-18"
++	echo d > /sys/class/net/eth2/queues/rx-0/rps_cpus
++	;;
+ esac
+ 
+