kiddin9 3 ani în urmă
părinte
comite
a4d12b5000

+ 7 - 12
.github/workflows/Openwrt-AutoBuild.yml

@@ -66,11 +66,11 @@ jobs:
         if [ ${{matrix.target}} == "x86_64" ]; then
             echo "ARCH=linux/amd64" >> $GITHUB_ENV
             echo "MTARGET=x86_64" >> $GITHUB_ENV
-        elif [[ ${{matrix.target}} =~ (armvirt_64|ipq807x|mediatek_mt7622|bcm27xx_bcm2710|ipq60xx_generic|ipq60xx_generic|bcm4908_generic) ]]; then
+        elif [[ ${{matrix.target}} =~ (armvirt_64|ipq807x|mediatek_mt7622|bcm27xx_bcm2710|ipq60xx_generic|bcm4908_generic|sunxi_cortexa53) ]]; then
             echo "MTARGET=aarch64_cortex-a53" >> $GITHUB_ENV
         elif [[ ${{matrix.target}} =~ (ramips_mt7621|ramips_mt7620|ramips_mt76x8) ]]; then
             echo "MTARGET=mipsel_24kc" >> $GITHUB_ENV
-        elif [[ ${{matrix.target}} =~ (ipq40xx_generic|bcm27xx_bcm2709) ]]; then
+        elif [[ ${{matrix.target}} =~ (ipq40xx_generic|bcm27xx_bcm2709|sunxi_cortexa7) ]]; then
             echo "MTARGET=arm_cortex-a7_neon-vfpv4" >> $GITHUB_ENV
         elif [[ ${{matrix.target}} == "at91_sama5" ]]; then
             echo "MTARGET=arm_cortex-a5_vfpv4" >> $GITHUB_ENV
@@ -106,7 +106,7 @@ jobs:
         DEBIAN_FRONTEND: noninteractive
       run: |
         ( sudo -E apt-get -qq update
-        sudo -E apt-get -qq install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev patch python3 python2.7 unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint device-tree-compiler ccache xsltproc rename antlr3 gperf wget curl swig rsync
+        sudo -E apt-get -qq install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev patch python3 python2.7 unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint device-tree-compiler ccache xsltproc rename antlr3 gperf wget curl swig rsync libpython3-dev
         sudo -E apt-get -qq purge azure-cli ghc* zulu* hhvm llvm* firefox powershell openjdk* dotnet* google* mysql* php* android*
         sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
         sudo -E apt-get -qq autoremove --purge
@@ -129,11 +129,7 @@ jobs:
         REPO_BRANCH="$((curl -gs -H 'Content-Type: application/json' \
            -H "Authorization: Bearer ${{ secrets.REPO_TOKEN }}" \
            -X POST -d '{ "query": "query {repository(owner: \"openwrt\", name: \"openwrt\") {refs(refPrefix: \"refs/tags/\", last: 4, orderBy: {field: TAG_COMMIT_DATE, direction: ASC}) {edges {node {name}}}}}"}' https://api.github.com/graphql) | jq -r '.data.repository.refs.edges[].node.name' | grep v22 | tail -n 1)"
-        if [ ${{matrix.target}} == "ipq60xx_generic" ]; then
-            git clone https://github.com/kiddin9/openwrt-ax1800 openwrt --depth 1
-        else
-            git clone $REPO_URL -b $REPO_BRANCH openwrt
-        fi
+        git clone $REPO_URL -b $REPO_BRANCH openwrt
         if [ "${{ env.REPO_BRANCH }}" ]; then
           cd openwrt
           git checkout ${{ env.REPO_BRANCH }}
@@ -166,9 +162,9 @@ jobs:
     - name: Apply patches
       run: |
         cd openwrt
-        find "devices/common/patches" -type f ! -name 'china_mirrors.patch' -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 -E --forward"
+        find "devices/common/patches" -type f ! -name 'china_mirrors.patch' -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' --no-backup-if-mismatch --merge -p1 -E --forward"
         if [ -n "$(ls -A "devices/${{matrix.target}}/patches" 2>/dev/null)" ]; then
-          find "devices/${{matrix.target}}/patches" -type f -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 -E --forward"
+          find "devices/${{matrix.target}}/patches" -type f -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' --no-backup-if-mismatch --merge -p1 -E --forward"
         fi
         
     - name: Default PPPOE Setting
@@ -197,7 +193,6 @@ jobs:
 
     - name: Cache
       uses: klever1988/cachewrtbuild@main
-      if: github.event.client_payload.target != 'ipq60xx_generic'
       with:
         ccache: 'true'
         clean: ${{ contains(github.event.action, 'nocache') }}
@@ -211,7 +206,7 @@ jobs:
         rm -rf staging_dir/!(*${{ env.MTARGET }}*|host)
         df -hT
         echo -e "$(($(nproc)+1)) thread compile"
-        make -j$(($(nproc)+1)) || (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" ; make -j1 V=s)
+        make -j$(($(nproc)+1)) || make -j1 V=s || (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

+ 12 - 0
.github/workflows/repo-dispatcher.yml

@@ -111,10 +111,12 @@ jobs:
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
           -d '{"event_type": "ipq40xx_generic", "client_payload": {"target": "ipq40xx_generic"}}'
+          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": "bcm4908_generic", "client_payload": {"target": "bcm4908_generic"}}'
+          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 }}" \
@@ -139,4 +141,14 @@ jobs:
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
           -d '{"event_type": "bcm53xx", "client_payload": {"target": "bcm53xx"}}'
+          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": "sunxi_cortexa53", "client_payload": {"target": "sunxi_cortexa53"}}'
+          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": "sunxi_cortexa7", "client_payload": {"target": "sunxi_cortexa7"}}'
 

+ 1 - 17
devices/armvirt_64/diy.sh

@@ -6,25 +6,9 @@ bash $SHELL_FOLDER/../common/kernel_5.15.sh
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs autocore-arm luci-app-amlogic kmod-brcmfmac wpad-basic-wolfssl iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade fdisk lsblk kmod-usb2 kmod-usb3/' target/linux/armvirt/Makefile
 
 echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_SENSORS_PWM_FAN=y
 ' >> ./target/linux/armvirt/64/config-5.15
 

+ 1 - 1
devices/armvirt_64/diy/target/linux/armvirt/image/Makefile

@@ -101,7 +101,7 @@ define Device/fastrhino_r68s
   SOC := rk3568
   DEVICE_PACKAGES := 
 endef
-TARGET_DEVICES += fastrhino_r68s
+#TARGET_DEVICES += fastrhino_r68s
 
 
 define Image/Build

+ 6 - 0
devices/at91_sama5/diy.sh

@@ -6,3 +6,9 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq fdisk lsblk btrfs-progs block-mount blkid parted dosfstools e2fsprogs pv losetup uuidgen automount tune2fs resize2fs/' target/linux/at91/Makefile
 
+echo '
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+' >> target/linux/at91/config-5.10
+

+ 2 - 2
devices/at91_sama5/patches/wankeyun.patch

@@ -23,10 +23,10 @@
 +		export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
 +		export BIN_DIR=$(BIN_DIR); \
 +		export TARGET_ROOTFS_DIR=$(TARGET_DIR); \
-+		cd $(TOPDIR)/../packit; \
++		cd /www/wwwroot/op.supes.top/bcache/at91/sama5/packit; \
 +		./build.sh; \
 +		gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).img || true; \
 +	fi
 +endef
 +
- $(eval $(call BuildImage))
+ $(eval $(call BuildImage))

+ 1 - 18
devices/bcm27xx_bcm2709/diy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm fdisk lsblk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 kmod-usb3/' target/linux/bcm27xx/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm fdisk lsblk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 automount/' target/linux/bcm27xx/Makefile
 
 sed -i 's/factory.img.gz //' target/linux/bcm27xx/image/Makefile
 
@@ -8,23 +8,6 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
 echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

+ 1 - 18
devices/bcm27xx_bcm2710/diy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm fdisk lsblk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 kmod-usb3/' target/linux/bcm27xx/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm fdisk lsblk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 automount/' target/linux/bcm27xx/Makefile
 
 sed -i 's/factory.img.gz //' target/linux/bcm27xx/image/Makefile
 
@@ -8,23 +8,6 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
 echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

+ 0 - 17
devices/bcm27xx_bcm2711/diy.sh

@@ -8,23 +8,6 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
 echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

+ 0 - 17
devices/bcm4908_generic/diy.sh

@@ -8,23 +8,6 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/bcm4908/Makefile
 
 echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

+ 0 - 17
devices/bcm53xx/diy.sh

@@ -8,23 +8,6 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/bcm53xx/Makefile
 
 echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

+ 0 - 2
devices/common/diy.sh

@@ -43,8 +43,6 @@ 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 '$a CONFIG_ACPI=y\nCONFIG_X86_ACPI_CPUFREQ=y\nCONFIG_NR_CPUS=128\nCONFIG_FAT_DEFAULT_IOCHARSET="utf8"\nCONFIG_CRYPTO_CHACHA20_NEON=y\n \
-CONFIG_CRYPTO_CHACHA20POLY1305=y\nCONFIG_BINFMT_MISC=y' `find target/linux -path "target/linux/*/config-*"`
 sed -i 's/max_requests 3/max_requests 20/g' package/network/services/uhttpd/files/uhttpd.config
 #rm -rf ./feeds/packages/lang/{golang,node}
 sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/inittab

+ 1 - 1
devices/common/kernel_5.15.sh

@@ -2,7 +2,7 @@
 
 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=""
+# latest=""
 mkdir new; cp -rf .git new/.git
 cd new
 [ "$latest" ] && git reset --hard $latest || git reset --hard origin/master

+ 5 - 0
devices/ipq40xx_generic/.config

@@ -7,6 +7,11 @@ CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_asus_rt-ac58u=y
 CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_p2w_r619ac-128m=y
 CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_p2w_r619ac-64m=y
 CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_zte_mf286d=y
+CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_glinet_gl-b1300=y
+CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_linksys_ea6350v3=y
+CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_glinet_gl-ap1300=y
+CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_linksys_ea8300=y
+CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_linksys_mr8300=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 

+ 7 - 2
devices/ipq40xx_generic/diy.sh

@@ -3,7 +3,12 @@
 shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq luci-app-turboacc/' target/linux/mediatek/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/ipq40xx/Makefile
+
+echo '
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+' >> ./target/linux/ipq40xx/config-5.10
 

+ 1 - 1
devices/ipq60xx_generic/.config

@@ -4,7 +4,7 @@ CONFIG_TARGET_ipq60xx_generic=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_cmiot_ax18=y
 CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-ax1800=y
-CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-axt1800=y
+#CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-axt1800=y
 CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_linksys_mr7350=y
 CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_qihoo_v6=y
 CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_zn_m2=y

+ 0 - 18
devices/ipq60xx_generic/diy.sh

@@ -25,27 +25,9 @@ rm -f devices/common/patches/usb.patch
 rm -rf feeds/packages/net/openvswitch feeds/kiddin9/shortcut-fe feeds/packages/net/xtables-addons package/kernel/mt76
 
 echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_MOTORCOMM_PHY=y
-CONFIG_SENSORS_PWM_FAN=y
 CONFIG_ACPI=n
 CONFIG_PNP_DEBUG_MESSAGES=y
 CONFIG_PINCTRL_BAYTRAIL=n

+ 13 - 0
devices/ipq60xx_generic/patches/fix.patch

@@ -117,3 +117,16 @@
 +	kmod-ath11k-ahb qca-ssdk-shell wpad-basic-wolfssl \
  	ath11k-firmware-ipq6018 nss-firmware-ipq6018 \
  	kmod-qca-nss-drv-pppoe kmod-qca-nss-ecm uboot-envtools
+ 
+
+--- a/package/network/config/netifd/Makefile
++++ b/package/network/config/netifd/Makefile
+@@ -5,7 +5,7 @@ PKG_RELEASE:=1
+ 
+ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
+-PKG_SOURCE_DATE:=2021-06-04
++PKG_SOURCE_DATE:=2023-06-04
+ PKG_SOURCE_VERSION:=50381d0a2998f6c0fc4823f0c2aa4206063d549e
+ PKG_MIRROR_HASH:=2718df3d3538c93ac77accf55716fb341741df3d231aac59e04dd1f80f558889
+ PKG_MAINTAINER:=Felix Fietkau <[email protected]>

+ 5 - 0
devices/ipq806x_generic/diy.sh

@@ -6,3 +6,8 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/ipq806x/Makefile
 
+echo '
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+' >> ./target/linux/ipq806x/config-5.10

+ 8 - 22
devices/ipq807x/diy.sh

@@ -4,7 +4,7 @@ shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k* package/qca package/qat
+rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k* package/kernel/mac80211 package/qca package/qat
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/boot/uboot-envtools package/boot/uboot-envtools
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/firmware/ipq-wifi package/firmware/ipq-wifi
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/firmware/ath11k-board package/firmware/ath11k-board
@@ -17,33 +17,19 @@ svn co https://github.com/Boos4721/openwrt/trunk/target/linux/generic/pending-5.
 
 svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x target/linux/ipq807x
 
+curl -sfL https://raw.githubusercontent.com/Lstions/openwrt-boos/master/target/linux/ipq807x/patches-5.15/608-5.15-qca-nss-ssdk-delete-fdb-entry-using-netdev -o target/linux/ipq807x/patches-5.15/608-5.15-qca-nss-ssdk-delete-fdb-entry-using-netdev.patch
+
+curl -sfL https://raw.githubusercontent.com/Boos4721/openwrt/master/include/kernel-5.15.mk -o include/kernel-5.15
+kernel_v="$(cat include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
+echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
+sed -i "s?targets/%S/.*'?targets/%S/$kernel_v'?" include/feeds.mk
+
 curl -sfL https://raw.githubusercontent.com/Boos4721/openwrt/master/package/kernel/linux/modules/netsupport.mk -o package/kernel/linux/modules/netsupport.mk
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-turboacc/' target/linux/ipq807x/Makefile
 
 echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_MOTORCOMM_PHY=y
-# CONFIG_QCOM_SPMI_ADC_TM5 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 ' >> ./target/linux/ipq807x/config-5.15

+ 1 - 21
devices/mediatek_mt7622/diy.sh

@@ -10,27 +10,7 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/mediatek/Makefile
 
 echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_MOTORCOMM_PHY=y
-CONFIG_SENSORS_PWM_FAN=y
-' >> ./target/linux/mediatek/mt7622/config-5.15
+' >> ./target/linux/mediatek/mt7622/config-5.10

+ 7 - 1
devices/mvebu_cortexa9/diy.sh

@@ -4,5 +4,11 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/mediatek/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/mvebu/Makefile
+
+echo '
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+' >> ./target/linux/mvebu/config-5.10
 

+ 0 - 402
devices/ramips_mt7620/patches/cr660x.patch

@@ -1,402 +0,0 @@
-From 593d238ebf777c36c9ee819a1e20f59da5adc361 Mon Sep 17 00:00:00 2001
-From: kiddin9 <[email protected]>
-Date: Tue, 5 Jul 2022 17:54:53 +0800
-Subject: [PATCH] Update mt7621.mk
-
-Signed-off-by: kiddin9 <[email protected]>
----
- target/linux/ramips/image/mt7621.mk | 46 +++++++++--------------------
- 1 file changed, 14 insertions(+), 32 deletions(-)
-
-diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
-index bdaeac2cb16e..72fbd3930a80 100644
---- a/target/linux/ramips/image/mt7621.mk
-+++ b/target/linux/ramips/image/mt7621.mk
-@@ -223,7 +223,7 @@ define Device/asus_rt-n56u-b1
-   DEVICE_VARIANT := B1
-   IMAGE_SIZE := 16064k
-   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
--	kmod-usb-ledtrig-usbport
-+	kmod-usb-ledtrig-usbport wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
- endef
- TARGET_DEVICES += asus_rt-n56u-b1
- 
-@@ -984,7 +984,7 @@ define Device/jcg_y2
-   JCG_MAXSIZE := 16064k
-   DEVICE_VENDOR := JCG
-   DEVICE_MODEL := Y2
--  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3
-+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
- endef
- TARGET_DEVICES += jcg_y2
- 
-@@ -1000,6 +1000,16 @@ define Device/lenovo_newifi-d1
- endef
- TARGET_DEVICES += lenovo_newifi-d1
- 
-+define Device/jdcloud_re-sp-01b
-+  $(Device/dsa-migration)
-+  $(Device/uimage-lzma-loader)
-+  IMAGE_SIZE := 32448k
-+  DEVICE_VENDOR := JDCloud
-+  DEVICE_MODEL := RE-SP-01B
-+  DEVICE_PACKAGES := kmod-fs-ext4 kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware kmod-sdhci-mt7620 kmod-usb3
-+ endef
-+  TARGET_DEVICES += jdcloud_re-sp-01b
-+
- define Device/linksys_e5600
-   $(Device/dsa-migration)
-   $(Device/uimage-lzma-loader)
-@@ -1369,7 +1379,7 @@ define Device/netgear_wndr3700-v5
-   SERCOMM_SWVER := 0x1054
-   SERCOMM_PAD := 320k
-   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
--	kmod-usb-ledtrig-usbport
-+	kmod-usb-ledtrig-usbport wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
-   SUPPORTED_DEVICES += wndr3700v5
- endef
- TARGET_DEVICES += netgear_wndr3700-v5
-@@ -1400,7 +1410,7 @@ define Device/oraybox_x3a
-   IMAGE_SIZE := 15360k
-   DEVICE_VENDOR := OrayBox
-   DEVICE_MODEL := X3A
--  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware
-+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
- endef
- TARGET_DEVICES += oraybox_x3a
- 
-@@ -1412,7 +1422,7 @@ define Device/phicomm_k2p
-   DEVICE_ALT0_VENDOR := Phicomm
-   DEVICE_ALT0_MODEL := KE 2P
-   SUPPORTED_DEVICES += k2p
--  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware
-+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
- endef
- TARGET_DEVICES += phicomm_k2p
- 
-@@ -1533,7 +1543,7 @@ define Device/thunder_timecloud
-   IMAGE_SIZE := 16064k
-   DEVICE_VENDOR := Thunder
-   DEVICE_MODEL := Timecloud
--  DEVICE_PACKAGES := kmod-usb3 -wpad-basic-wolfssl
-+  DEVICE_PACKAGES := kmod-usb3 -wpad-basic-wolfssl -bash -openssh-sftp-server -coremark -htop
-   SUPPORTED_DEVICES += timecloud
- endef
- TARGET_DEVICES += thunder_timecloud
-@@ -1843,7 +1853,6 @@ define Device/xiaomi_nand_separate
-   PAGESIZE := 2048
-   KERNEL_SIZE := 4096k
-   UBINIZE_OPTS := -E 5
--  IMAGES += kernel1.bin rootfs0.bin
-   IMAGE/kernel1.bin := append-kernel
-   IMAGE/rootfs0.bin := append-ubi | check-size
-   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-@@ -1866,7 +1875,7 @@ define Device/xiaomi_mi-router-3g-v2
-   DEVICE_VENDOR := Xiaomi
-   DEVICE_MODEL := Mi Router 3G
-   DEVICE_VARIANT := v2
--  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2
-+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
-   SUPPORTED_DEVICES += xiaomi,mir3g-v2
- endef
- TARGET_DEVICES += xiaomi_mi-router-3g-v2
-@@ -1881,7 +1890,6 @@ define Device/xiaomi_mi-router-3-pro
-   IMAGE_SIZE := 255488k
-   DEVICE_VENDOR := Xiaomi
-   DEVICE_MODEL := Mi Router 3 Pro
--  IMAGES += factory.bin
-   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-   IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
- 	check-size
-@@ -1906,7 +1914,7 @@ define Device/xiaomi_mi-router-4a-gigabit
-   DEVICE_VENDOR := Xiaomi
-   DEVICE_MODEL := Mi Router 4A
-   DEVICE_VARIANT := Gigabit Edition
--  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2
-+  DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
- endef
- TARGET_DEVICES += xiaomi_mi-router-4a-gigabit
- 
-@@ -1927,30 +1935,14 @@ define Device/xiaomi_mi-router-cr660x
-   KERNEL_SIZE := 4096k
-   UBINIZE_OPTS := -E 5
-   IMAGE_SIZE := 128512k
--  IMAGES += firmware.bin
-+  IMAGES += factory.bin
-   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
--  IMAGE/firmware.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
-+  IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
- 	check-size
-   DEVICE_PACKAGES += kmod-mt7915e uboot-envtools
-+  DEVICE_MODEL := Mi Router CR6606 / CR6608 / CR6609
- endef
--
--define Device/xiaomi_mi-router-cr6606
--  $(Device/xiaomi_mi-router-cr660x)
--  DEVICE_MODEL := Mi Router CR6606
--endef
--TARGET_DEVICES += xiaomi_mi-router-cr6606
--
--define Device/xiaomi_mi-router-cr6608
--  $(Device/xiaomi_mi-router-cr660x)
--  DEVICE_MODEL := Mi Router CR6608
--endef
--TARGET_DEVICES += xiaomi_mi-router-cr6608
--
--define Device/xiaomi_mi-router-cr6609
--  $(Device/xiaomi_mi-router-cr660x)
--  DEVICE_MODEL := Mi Router CR6609
--endef
--TARGET_DEVICES += xiaomi_mi-router-cr6609
-+TARGET_DEVICES += xiaomi_mi-router-cr660x
- 
- define Device/xiaomi_redmi-router-ac2100
-   $(Device/xiaomi_nand_separate)
-@@ -1985,7 +1977,7 @@ define Device/youhua_wr1200js
-   DEVICE_VENDOR := YouHua
-   DEVICE_MODEL := WR1200JS
-   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
--	kmod-usb-ledtrig-usbport
-+	kmod-usb-ledtrig-usbport wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
- endef
- TARGET_DEVICES += youhua_wr1200js
- 
-@@ -1995,7 +1987,7 @@ define Device/youku_yk-l2
-   DEVICE_VENDOR := Youku
-   DEVICE_MODEL := YK-L2
-   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
--	kmod-usb-ledtrig-usbport
-+	kmod-usb-ledtrig-usbport wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
- endef
- TARGET_DEVICES += youku_yk-l2
- 
-
---- /dev/null
-+++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr660x.dts
-@@ -0,0 +1,8 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+
-+#include "mt7621_xiaomi_mi-router-cr660x.dtsi"
-+
-+/ {
-+	compatible = "xiaomi,mi-router-cr660x", "mediatek,mt7621-soc";
-+	model = "Xiaomi Mi Router CR6606 / CR6608 / CR6609";
-+};
-
---- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
-+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
-@@ -131,9 +131,7 @@ tplink,tl-wpa8631p-v3)
- xiaomi,mi-router-ac2100)
- 	ucidef_set_led_netdev "wan-blue" "WAN (blue)" "blue:wan" "wan"
- 	;;
--xiaomi,mi-router-cr6606|\
--xiaomi,mi-router-cr6608|\
--xiaomi,mi-router-cr6609)
-+xiaomi,mi-router-cr660x)
- 	ucidef_set_led_netdev "internet" "Internet" "blue:net" "wan"
- 	;;
- xiaomi,redmi-router-ac2100)
-
---- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
-+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
-@@ -28,9 +28,7 @@ ramips_setup_interfaces()
- 	hiwifi,hc5962|\
- 	xiaomi,mi-router-3-pro|\
- 	xiaomi,mi-router-ac2100|\
--	xiaomi,mi-router-cr6606|\
--	xiaomi,mi-router-cr6608|\
--	xiaomi,mi-router-cr6609|\
-+	xiaomi,mi-router-cr660x|\
- 	xiaomi,redmi-router-ac2100)
- 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
- 		;;
-@@ -45,6 +43,7 @@ ramips_setup_interfaces()
- 	iptime,a3002mesh|\
- 	jcg,q20|\
- 	lenovo,newifi-d1|\
-+	jdcloud,re-sp-01b|\
- 	mikrotik,routerboard-m33g|\
- 	oraybox,x3a|\
- 	renkforce,ws-wn530hp3-a|\
-
---- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
-@@ -88,9 +88,7 @@ platform_do_upgrade() {
- 	xiaomi,mi-router-3-pro|\
- 	xiaomi,mi-router-4|\
- 	xiaomi,mi-router-ac2100|\
--	xiaomi,mi-router-cr6606|\
--	xiaomi,mi-router-cr6608|\
--	xiaomi,mi-router-cr6609|\
-+	xiaomi,mi-router-cr660x|\
- 	xiaomi,redmi-router-ac2100)
- 		nand_do_upgrade "$1"
- 		;;
-
---- a/package/boot/uboot-envtools/files/ramips
-+++ b/package/boot/uboot-envtools/files/ramips
-@@ -73,9 +73,7 @@ zyxel,nr7101)
- 		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x1000" "0x80000"
- 	;;
- bolt,arion|\
--xiaomi,mi-router-cr6606|\
--xiaomi,mi-router-cr6608|\
--xiaomi,mi-router-cr6609)
-+xiaomi,mi-router-cr660x)
- 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x20000"
- 	;;
- esac
-
---- /dev/null
-+++ b/target/linux/ramips/dts/mt7621_jdcloud_re-sp-01b.dts
-@@ -0,0 +1,150 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+
-+#include "mt7621.dtsi"
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	compatible = "jdcloud,re-sp-01b", "mediatek,mt7621-soc";
-+	model = "JDCloud RE-SP-01B";
-+
-+	aliases {
-+		led-boot = &led_red;
-+		led-failsafe = &led_red;
-+		led-running = &led_green;
-+		led-upgrade = &led_blue;
-+		label-mac-device = &gmac0;
-+	};
-+
-+	chosen {
-+		bootargs = "console=ttyS0,115200";
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		reset {
-+			label = "reset";
-+			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-+			linux,code = <KEY_RESTART>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led_red: red {
-+			label = "red:sys";
-+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
-+			panic-indicator;
-+		};
-+
-+		led_green: green {
-+			label = "green:sys";
-+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_blue: blue {
-+			label = "blue:sys";
-+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&sdhci {
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	status = "okay";
-+
-+	flash@0 {
-+		compatible = "jedec,spi-nor";
-+		reg = <0>;
-+		spi-max-frequency = <50000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "u-boot";
-+				reg = <0x0 0x30000>;
-+				read-only;
-+			};
-+
-+			config: partition@30000 {
-+				label = "config";
-+				reg = <0x30000 0x10000>;
-+				read-only;
-+			};
-+
-+			factory: partition@40000 {
-+				label = "factory";
-+				reg = <0x40000 0x10000>;
-+				read-only;
-+			};
-+
-+			partition@50000 {
-+				compatible = "denx,uimage";
-+				label = "firmware";
-+				reg = <0x50000 0x1fb0000>;
-+			};
-+		};
-+	};
-+};
-+
-+&gmac0 {
-+	mtd-mac-address-ascii = <&config 0x4429>;
-+};
-+
-+&switch0 {
-+	ports {
-+		port@0 {
-+			status = "okay";
-+			label = "wan";
-+		};
-+
-+		port@1 {
-+			status = "okay";
-+			label = "lan1";
-+		};
-+
-+		port@2 {
-+			status = "okay";
-+			label = "lan2";
-+		};
-+	};
-+};
-+
-+&pcie {
-+	status = "okay";
-+};
-+
-+&pcie0 {
-+	wifi@0,0 {
-+		reg = <0x0000 0 0 0 0>;
-+		mtd-mac-address-ascii = <&config 0x4429>;
-+		mediatek,mtd-eeprom = <&factory 0x0>;
-+	};
-+};
-+
-+&pcie1 {
-+	wifi@0,0 {
-+		reg = <0x0000 0 0 0 0>;
-+		mtd-mac-address-ascii = <&config 0x4429>;
-+		mtd-mac-address-increment = <0x80>;
-+		mtd-mac-address-increment-byte = <3>;
-+		mediatek,mtd-eeprom = <&factory 0x8000>;
-+		ieee80211-freq-limit = <5000000 6000000>;
-+	};
-+};
-+
-+&state_default {
-+	gpio {
-+		groups = "uart2", "uart3", "wdt";
-+		function = "gpio";
-+	};
-+};

+ 2 - 0
devices/rockchip_armv8/.config

@@ -4,6 +4,7 @@ CONFIG_TARGET_rockchip_armv8=y
 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-r4se=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
@@ -11,6 +12,7 @@ CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_embedfire_doornet1=y
 CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_embedfire_doornet2=y
 CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_xunlong_orangepi-r1-plus=y
 CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_xunlong_orangepi-r1-plus-lts=y
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_radxa_rock-pi-4=y
 
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx

+ 0 - 19
devices/rockchip_armv8/diy.sh

@@ -19,27 +19,8 @@ sed -i -e 's,kmod-r8168,kmod-r8169,g' target/linux/rockchip/image/armv8.mk
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm fdisk lsblk luci-app-cpufreq kmod-drm-rockchip kmod-gpu-lima kmod-usb2 kmod-usb3/' target/linux/rockchip/Makefile
 
 echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_MOTORCOMM_PHY=y
 CONFIG_SENSORS_PWM_FAN=y
 ' >> ./target/linux/rockchip/armv8/config-5.10

+ 15 - 0
devices/sunxi_cortexa53/.config

@@ -0,0 +1,15 @@
+
+CONFIG_TARGET_sunxi=y
+CONFIG_TARGET_sunxi_cortexa53=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa53_DEVICE_friendlyarm_nanopi-neo-plus2=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa53_DEVICE_friendlyarm_nanopi-neo2=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa53_DEVICE_friendlyarm_nanopi-r1s-h5=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa53_DEVICE_xunlong_orangepi-one-plus=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa53_DEVICE_xunlong_orangepi-pc2=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa53_DEVICE_xunlong_orangepi-zero-plus=y
+
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
+
+
+

+ 15 - 0
devices/sunxi_cortexa53/diy.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+shopt -s extglob
+
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+bash $SHELL_FOLDER/../common/kernel_5.15.sh
+
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm fdisk lsblk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 automount/' target/linux/sunxi/Makefile
+
+echo '
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+' >> ./target/linux/sunxi/config-5.15
+

+ 21 - 0
devices/sunxi_cortexa7/.config

@@ -0,0 +1,21 @@
+
+CONFIG_TARGET_sunxi=y
+CONFIG_TARGET_sunxi_cortexa7=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_friendlyarm_nanopi-m1-plus=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_friendlyarm_nanopi-neo=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_friendlyarm_nanopi-neo-air=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_friendlyarm_nanopi-r1=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_friendlyarm_zeropi=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_xunlong_orangepi-2=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_xunlong_orangepi-one=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_xunlong_orangepi-pc=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_xunlong_orangepi-pc-plus=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_xunlong_orangepi-plus=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_xunlong_orangepi-r1=y
+CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_xunlong_orangepi-zero=y
+
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
+
+
+

+ 15 - 0
devices/sunxi_cortexa7/diy.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+shopt -s extglob
+
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+bash $SHELL_FOLDER/../common/kernel_5.15.sh
+
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm fdisk lsblk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 automount/' target/linux/sunxi/Makefile
+
+echo '
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+' >> ./target/linux/sunxi/config-5.15
+

+ 6 - 2
devices/x86_64/diy.sh

@@ -14,8 +14,12 @@ sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk
 sed -i 's/256/1024/g' target/linux/x86/image/Makefile
 
 echo '
-CONFIG_CRYPTO_CHACHA20_X86_64=y
-CONFIG_CRYPTO_POLY1305_X86_64=y
+CONFIG_ACPI=y
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_NR_CPUS=512
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 ' >> ./target/linux/x86/config-5.15
 
 sed -i "s/enabled '0'/enabled '1'/g" feeds/packages/utils/irqbalance/files/irqbalance.config