From 9dee751d73b50bbcacfdcf258cea234c37ae5b76 Mon Sep 17 00:00:00 2001 From: kiddin9 <48883331+kiddin9@users.noreply.github.com> Date: Sun, 2 Apr 2023 03:42:23 +0800 Subject: [PATCH] update --- .github/workflows/Openwrt-AutoBuild.yml | 12 +- .../diy/target/linux/armvirt/image/Makefile | 133 ++---------------- devices/ath79_nand/.config | 2 + devices/common/.config | 11 +- devices/common/diy.sh | 9 +- devices/common/kernel_5.15.sh | 9 +- devices/ramips_mt7620/.config | 1 + devices/ramips_mt7621/.config | 1 + devices/rockchip_armv8/patches/r6s.patch | 82 +++++------ 9 files changed, 71 insertions(+), 189 deletions(-) diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml index b58a7239739e..a8bb3fc3837e 100644 --- a/.github/workflows/Openwrt-AutoBuild.yml +++ b/.github/workflows/Openwrt-AutoBuild.yml @@ -234,13 +234,17 @@ jobs: uses: stupidloud/cachewrtbuild@main with: ccache: 'true' + mixkey: ${{ env.MTARGET }} 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 + rm -rf staging_dir/!(*${{ env.MTARGET }}*|host|hostpkg) build_dir/!(*${{ env.MTARGET }}*|host|hostpkg) + fi df -hT - name: SSH connection to Actions @@ -253,7 +257,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 @@ -292,8 +296,8 @@ jobs: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} ARGS: "-avzr" SOURCE: openwrt/bin/targets - REMOTE_HOST: op.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/" 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)) diff --git a/devices/ath79_nand/.config b/devices/ath79_nand/.config index 9d3a9ed3cd26..152f5b8dd832 100644 --- a/devices/ath79_nand/.config +++ b/devices/ath79_nand/.config @@ -13,7 +13,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服务 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..4fc374027bdd 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,11 +27,14 @@ 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 + mv -f feeds/kiddin9/r81* tmp/ sed -i "s/192.168.1/10.0.0/" package/feeds/kiddin9/base-files/files/bin/config_generate @@ -51,6 +56,8 @@ sed -i 's/max_requests 3/max_requests 20/g' package/network/services/uhttpd/file #rm -rf ./feeds/packages/lang/{golang,node} sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/inittab +curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/libs/mbedtls/patches/200-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch -o package/libs/mbedtls/patches/200-Implements-AES-and-GCM-with-ARMv8-Crypto-Extensions.patch + date=`date +%m.%d.%Y` sed -i -e "/\(# \)\?REVISION:=/c\REVISION:=$date" -e '/VERSION_CODE:=/c\VERSION_CODE:=$(REVISION)' include/version.mk diff --git a/devices/common/kernel_5.15.sh b/devices/common/kernel_5.15.sh index 4df22dd12f94..b696e1933afc 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,11 +9,13 @@ 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 +svn co https://github.com/openwrt/openwrt/trunk/package/network/services/hostapd package/feeds/kiddin9/hostapd + sed -i "s/^.*vermagic$/\techo '1' > \$(LINUX_DIR)\/.vermagic/" include/kernel-defaults.mk curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/master/include/image-commands.mk -o include/image-commands.mk @@ -24,7 +26,8 @@ svn export --force https://github.com/openwrt/packages/trunk/net/xtables-addons svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/backport-5.15 target/linux/generic/backport-5.15 find target/linux/generic/backport-5.15 -name "[0-9][0-9][0-9]-[a-z][a-z]*" -exec rm -f {} \; -rm -rf target/linux/generic/backport-5.15/{802-v6.1-nvmem*,803-v5.19-nvmem*} +rm -rf target/linux/generic/backport-5.15/{802-v6.1-nvmem*,803-v5.19-nvmem*,733-v6.2-02-net-mediatek-sgmii-ensure*,733-v6.2-03-net-mediatek*,733-v6.2-04-mtk_sgmii-enable*} +curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/inittab 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 9125c96ebbce..cab3e767b178 100644 --- a/devices/rockchip_armv8/patches/r6s.patch +++ b/devices/rockchip_armv8/patches/r6s.patch @@ -3,14 +3,14 @@ @@ -52,4 +52,22 @@ TARGET_DEVICES += friendlyarm_nanopi-r2s -+define Device/friendlyarm_nanopi-r5c ++define Device/friendlyarm_nanopi-r6c + DEVICE_VENDOR := FriendlyARM -+ DEVICE_MODEL := NanoPi R5C ++ DEVICE_MODEL := NanoPi R6C + SOC := rk3328 -+ DEVICE_PACKAGES := -luci-app-gpsysupgrade rtl8822ce-firmware ++ DEVICE_PACKAGES := -luci-app-gpsysupgrade + DEVICE_DTS = rockchip/rk3328-nanopi-r2s +endef -+TARGET_DEVICES += friendlyarm_nanopi-r5c ++TARGET_DEVICES += friendlyarm_nanopi-r6c + +define Device/friendlyarm_nanopi-r6s + DEVICE_VENDOR := FriendlyARM @@ -26,25 +26,23 @@ --- 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() - friendlyarm,nanopi-r2s|\ - friendlyarm,nanopi-r4s|\ - friendlyarm,nanopi-r4se|\ -+ friendlyarm,nanopi-r5c|\ +@@ -19,9 +19,14 @@ rockchip_setup_interfaces() + 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" +- xunlong,orangepi-r1-plus-lts) ++ xunlong,orangepi-r1-plus-lts|\ ++ friendlyarm,nanopi-r6c) + ucidef_set_interfaces_lan_wan 'eth1' 'eth0' ;; + friendlyarm,nanopi-r6s) + ucidef_set_interfaces_lan_wan "eth1 eth0" "eth2" + ;; - *) - ucidef_set_interface_lan 'eth0' - ;; -@@ -46,10 +50,10 @@ generate_mac_from_mmc_cid() ++ *) + hinlink,opc-h68k|\ + hinlink,opc-h69k) + ucidef_set_interfaces_lan_wan 'eth1 eth2 eth3' 'eth0' +@@ -51,10 +56,10 @@ generate_mac_from_mmc_cid() echo "$(macaddr_unsetbit_mc "$(macaddr_setbit_la "${mac_base}")")" } @@ -57,7 +55,7 @@ local address if [ -f "$eeprom_path" ]; then -@@ -90,8 +94,12 @@ rockchip_setup_macs() +@@ -100,8 +105,12 @@ rockchip_setup_macs() ;; friendlyarm,nanopi-r4s|\ friendlyarm,nanopi-r4se) @@ -66,7 +64,7 @@ + wan_mac=$(nanopi_get_mac wan 2-0051) + lan_mac=$(nanopi_get_mac lan 2-0051) + ;; -+ friendlyarm,nanopi-r6s) ++ friendlyarm,nanopi-r6s|friendlyarm,nanopi-r6c) + wan_mac=$(nanopi_get_mac wan 6-0053) + lan_mac=$(nanopi_get_mac lan 6-0053) ;; @@ -75,19 +73,18 @@ --- 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,15 @@ 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" + ucidef_set_led_netdev "lan2" "LAN2" "lan2_led" "eth0" "link" ++ ;; ++friendlyarm,nanopi-r6c) ++ ucidef_set_led_netdev "wan" "WAN" "wan_led" "eth0" "link" ++ ucidef_set_led_netdev "lan1" "LAN1" "lan1_led" "eth1" "link" + ;; esac @@ -95,20 +92,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) +@@ -52,5 +52,25 @@ 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,17 +107,25 @@ + set_interface_core 80 "eth2-16" + set_interface_core 80 "eth2-18" + echo fe > /sys/class/net/eth2/queues/rx-0/rps_cpus ++ ;; ++friendlyarm,nanopi-r6c) ++ set_interface_core 40 "eth0" ++ echo fe > /sys/class/net/eth0/queues/rx-0/rps_cpus ++ set_interface_core 10 "eth1-0" ++ set_interface_core 20 "eth1-16" ++ set_interface_core 20 "eth1-18" ++ echo fe > /sys/class/net/eth1/queues/rx-0/rps_cpus + ;; esac - --- a/target/linux/rockchip/image/Makefile +++ b/target/linux/rockchip/image/Makefile -@@ -80,3 +80,25 @@ +@@ -79,4 +79,17 @@ endif + include $(SUBTARGET).mk +define Image/Build -+ if [ $(PROFILE_SANITIZED) == "friendlyarm_nanopi-r6s" ]; then \ ++ if [[ "$(PROFILE_SANITIZED)" == "friendlyarm_nanopi-r6s" || "$(PROFILE_SANITIZED)" == "friendlyarm_nanopi-r6c" ]]; then \ + export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \ + export BIN_DIR=$(BIN_DIR); \ + export TOPDIR=$(TOPDIR); \ @@ -139,15 +134,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 +