update

kiddin9 · Jul 9, 2024 · 21ea07c · 21ea07c
1 parent 8203f1f
commit 21ea07c
Show file tree

Hide file tree

Showing 45 changed files with 4,530 additions and 1,983 deletions.
diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml
@@ -69,15 +69,13 @@ jobs:
         elif [ ${{matrix.target}} == "x86_generic" ]; then
             echo "ARCH=linux/amd32" >> $GITHUB_ENV
             echo "MTARGET=x86_generic" >> $GITHUB_ENV
-        elif [[ ${{matrix.target}} =~ (armsr_armv8|qualcommax_ipq807x|mediatek_mt7622|mediatek_mt7981|mediatek_filogic|bcm27xx_bcm2710|qualcommax_ipq60xx|bcm4908_generic|sunxi_cortexa53) ]]; then
+        elif [[ ${{matrix.target}} =~ (armsr_armv8|ipq807x_generic|mediatek_mt7622|mediatek_mt7981|mediatek_filogic|bcm27xx_bcm2710|qualcommax_ipq60xx|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}} == "ath79_nand" ]]; then
             echo "MTARGET=mips_24kc" >> $GITHUB_ENV
-        elif [[ ${{matrix.target}} == "ipq50xx_arm" ]]; then
-            echo "MTARGET=arm_cortex-a7" >> $GITHUB_ENV
-        elif [[ ${{matrix.target}} =~ (ipq40xx_generic|bcm27xx_bcm2709|sunxi_cortexa7) ]]; then
+        elif [[ ${{matrix.target}} =~ (ipq40xx_generic|bcm27xx_bcm2709|sunxi_cortexa7|ipq50xx_arm) ]]; then
             echo "MTARGET=arm_cortex-a7_neon-vfpv4" >> $GITHUB_ENV
         elif [[ ${{matrix.target}} == "amlogic_meson8b" ]]; then
             echo "MTARGET=arm_cortex-a5_vfpv4" >> $GITHUB_ENV
@@ -117,7 +115,7 @@ jobs:
         sudo -E apt-get -qq install build-essential clang llvm flex g++ gawk gcc-multilib gettext \
         git libncurses5-dev libssl-dev python3-distutils python3-pyelftools python3-setuptools \
         libpython3-dev rsync unzip zlib1g-dev swig aria2 jq subversion qemu-utils ccache rename \
-        libelf-dev device-tree-compiler libgnutls28-dev coccinelle libgmp3-dev libmpc-dev libfuse-dev
+        libelf-dev device-tree-compiler libgnutls28-dev coccinelle libgmp3-dev libmpc-dev libfuse-dev gcc-multilib
         sudo -E apt-get -qq purge azure-cli ghc* zulu* 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
@@ -203,8 +201,8 @@ jobs:
           if [ -n "$(ls -A devices/${{matrix.target}}/*.bin.patch 2>/dev/null)" ]; then
             git apply devices/${{matrix.target}}/patches/*.bin.patch
           fi
-          find "devices/${{matrix.target}}/patches" -maxdepth 1 -type f -name '*.revert.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -R -B --merge -p1 -E --forward"
-          find "devices/${{matrix.target}}/patches" -maxdepth 1 -type f -name '*.patch' ! -name '*.revert.patch' ! -name '*.bin.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -B --merge -p1 -E --forward"
+          find "devices/${{matrix.target}}/patches" -maxdepth 1 -type f -name '*.revert.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -R -B --merge -p1 --forward"
+          find "devices/${{matrix.target}}/patches" -maxdepth 1 -type f -name '*.patch' ! -name '*.revert.patch' ! -name '*.bin.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -B --merge -p1 --forward"
         sed -i '$a  \
         CONFIG_CPU_FREQ_GOV_POWERSAVE=y \
         CONFIG_CPU_FREQ_GOV_USERSPACE=y \

diff --git a/.github/workflows/repo-dispatcher.yml b/.github/workflows/repo-dispatcher.yml
@@ -142,7 +142,7 @@ jobs:
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.TOKEN_KIDDIN9 }}" \
-          -d '{"event_type": "qualcommax_ipq807x ${{ github.event.inputs.param }}", "client_payload": {"target": "qualcommax_ipq807x"}}'
+          -d '{"event_type": "ipq807x_generic ${{ github.event.inputs.param }}", "client_payload": {"target": "ipq807x_generic"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \

diff --git a/devices/bcm27xx_bcm2712/diy.sh b/devices/bcm27xx_bcm2712/diy.sh
@@ -2,6 +2,8 @@
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-bash $SHELL_FOLDER/../common/kernel_6.1.sh
+bash $SHELL_FOLDER/../common/kernel_6.6.sh
+
+rm -rf package/devel/kselftests-bpf
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' target/linux/bcm27xx/Makefile
diff --git a/devices/common/.config b/devices/common/.config
@@ -66,12 +66,6 @@ CONFIG_PACKAGE_kmod-lib-lz4=y
 CONFIG_PACKAGE_kmod-lib-zstd=y
 CONFIG_NODEJS_14=y
 
-CONFIG_OPENSSL_OPTIMIZE_SPEED=y
-CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
-CONFIG_OPENSSL_ENGINE_BUILTIN=y
-CONFIG_OPENSSL_ENGINE_BUILTIN_AFALG=y
-CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO=y
-
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_SPECIAL_TIMES=y
@@ -92,6 +86,7 @@ CONFIG_KERNEL_EXT4_FS_POSIX_ACL=y
 CONFIG_KERNEL_EXT4_FS_SECURITY=y
 CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y
 
+
 CONFIG_PACKAGE_kmod-sprd_pcie=n
 CONFIG_PACKAGE_kmod-drm-nouveau=n
 
@@ -106,4 +101,5 @@ CONFIG_VERSION_MANUFACTURER="Kiddin'"
 CONFIG_VERSION_FILENAMES=n
 CONFIG_VERSION_CODE_FILENAMES=n
 
-
+CONFIG_BPF_TOOLCHAIN_HOST=y
+CONFIG_BPF_TOOLCHAIN_NONE=n
diff --git a/devices/common/diy.sh b/devices/common/diy.sh
@@ -15,10 +15,9 @@ sed -i '/	refresh_config();/d' scripts/feeds
 
 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
 sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advancedplus luci-app-firewall luci-app-opkg luci-app-upnp luci-app-autoreboot \
 luci-app-wizard luci-base luci-compat luci-lib-ipkg luci-lib-fs \
-coremark wget-ssl curl autocore htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server block-mount resolveip ds-lite swconfig luci-app-fan luci-app-filebrowser /" include/target.mk
+coremark wget-ssl curl autocore htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server block-mount resolveip ds-lite swconfig luci-app-fan luci-app-fileassistant /" include/target.mk
 sed -i "s/procd-ujail//" include/target.mk
 
 sed -i "s/^.*vermagic$/\techo '1' > \$(LINUX_DIR)\/.vermagic/" include/kernel-defaults.mk
@@ -31,6 +30,7 @@ while [[ "$status" == "in_progress" || "$status" == "queued" ]];do
 	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
 
+rm -rf package/feeds/packages/v4l2loopback
 
 mv -f feeds/kiddin9/r81* tmp/
 
@@ -53,18 +53,11 @@ mkdir package/kernel/mt76/patches
 curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch -o package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch
 }
 
-cd feeds/packages
-rm -rf libs/libpfring
-git_clone_path master https://github.com/openwrt/packages libs/libpfring
-cd ../../
-
-rm -rf package/network/utils/xdp-tools package/feeds/kiddin9/fibocom_MHI package/feeds/packages/v4l2loopback
-
 grep -q 'PKG_RELEASE:=9' package/libs/openssl/Makefile && {
 sh -c "curl -sfL https://github.com/openwrt/openwrt/commit/a48d0bdb77eb93f7fba6e055dace125c72755b6a.patch | patch -d './' -p1 --forward"
 }
 
-sed -i "/wireless.\${name}.disabled/d" package/kernel/mac80211/files/lib/wifi/mac80211.sh || sed -i "/wireless.\${name}.disabled/d" package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh
+sed -i "/wireless.\${name}.disabled/d" package/kernel/mac80211/files/lib/wifi/mac80211.sh
 
 sed -i 's/Os/O2/g' include/target.mk
 sed -i "/mediaurlbase/d" package/feeds/*/luci-theme*/root/etc/uci-defaults/*

diff --git a/devices/common/kernel_6.1.sh b/devices/common/kernel_6.1.sh
@@ -2,21 +2,22 @@
 
 shopt -s extglob
 
-rm -rf target/linux package/kernel package/boot package/firmware package/network/config/wifi-scripts
+rm -rf target/linux package/kernel package/boot package/firmware
 
 mkdir new; cp -rf .git new/.git
 cd new
 git reset --hard origin/master
 
-cp -rf --parents target/linux package/kernel package/boot package/firmware include/kernel* package/network/config/wifi-scripts config/Config-images.in include/image*.mk include/trusted-firmware-a.mk scripts/ubinize-image.sh package/utils/bcm27xx-utils package/devel/perf ../
+cp -rf --parents target/linux package/kernel package/boot package/firmware include/kernel* config/Config-images.in config/Config-kernel.in include/image*.mk include/trusted-firmware-a.mk scripts/ubinize-image.sh package/utils/bcm27xx-utils package/devel/perf ../
 cd -
 
 sed -i "s/^.*vermagic$/\techo '1' > \$(LINUX_DIR)\/.vermagic/" include/kernel-defaults.mk
 
 #sed -i "s/\$(PKG_VERSION)-\$(PKG_RELEASE)/\$(PKG_VERSION)-r\$(PKG_RELEASE)/" include/package-defaults.mk
 
-cp -rf devices/common/patches/rootfstargz.patch.b devices/common/patches/rootfstargz.patch
-cp -rf devices/common/patches/kernel6.1.patch.b devices/common/patches/kernel6.1.patch
+cp -rf devices/common/patches/rootfstargz.patch.main devices/common/patches/rootfstargz.patch
+cp -rf devices/common/patches/qca-ssdk.patch.main devices/common/patches/qca-ssdk.patch
+cp -rf devices/common/patches/ebpf.patch.main devices/common/patches/ebpf.patch
 
 git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-6.1
 
@@ -32,11 +33,13 @@ mkdir package/kernel/mt76/patches
 curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch -o package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch
 
 cd feeds/packages
-rm -rf libs/!(pcre) net/coova-chilli net/xtables-addons net/jool kernel
-git_clone_path master https://github.com/openwrt/packages libs net/coova-chilli net/xtables-addons net/jool kernel
+rm -rf kernel libs/libpfring libs/xr_usb_serial_common
+git_clone_path master https://github.com/openwrt/packages kernel libs/libpfring libs/xr_usb_serial_common
 cd ../../
 
-rm -rf package/feeds/kiddin9/quectel_Gobinet package/feeds/kiddin9/fibocom_MHI package/feeds/packages/libpfring
+curl -sfL https://raw.githubusercontent.com/openwrt/packages/master/net/xtables-addons/patches/201-fix-lua-packetscript.patch -o package/feeds/packages/xtables-addons/patches/201-fix-lua-packetscript.patch
+
+curl -sfL https://raw.githubusercontent.com/openwrt/packages/master/net/coova-chilli/patches/011-kernel517.patch -o package/feeds/packages/coova-chilli/patches/011-kernel517.patch
 
 sed -i 's/=bbr/=cubic/' package/kernel/linux/files/sysctl-tcp-bbr.conf
 

diff --git a/devices/common/kernel_6.6.sh b/devices/common/kernel_6.6.sh
@@ -9,4 +9,10 @@ git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/
 
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.6/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-6.6/613-netfilter_optional_tcp_window_check.patch
 
+curl -sfL https://raw.githubusercontent.com/openwrt/packages/master/libs/dmx_usb_module/patches/101-fix-kernel-6.6-builds.patch -o package/feeds/packages/dmx_usb_module/patches/101-fix-kernel-6.6-builds.patch
+
+curl -sfL https://raw.githubusercontent.com/openwrt/packages/master/libs/libpfring/patches/102-remove-sendpage.patch -o package/feeds/packages/libpfring/patches/102-remove-sendpage.patch
+
+curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/main/package/devel/kselftests-bpf/Makefile -o package/devel/kselftests-bpf/Makefile
+
 rm -rf target/linux/generic/hack-6.6/{410-block-fit-partition-parser.patch,724-net-phy-aquantia*,720-net-phy-add-aqr-phys.patch}
diff --git a/devices/common/patches/ebpf.patch b/devices/common/patches/ebpf.patch
@@ -0,0 +1,69 @@
+--- a/config/Config-kernel.in
++++ b/config/Config-kernel.in
+@@ -364,6 +364,7 @@ config KERNEL_DEBUG_INFO
+ config KERNEL_DEBUG_INFO_BTF
+
+ 	bool "Enable additional BTF type information"
++	default y if (TARGET_armsr || TARGET_bcm27xx || TARGET_ipq806x_chromium || TARGET_ipq807x || TARGET_mediatek_filogic || TARGET_mvebu_cortexa53 || TARGET_mvebu_cortexa72 || TARGET_rockchip || TARGET_sunxi || TARGET_x86_64)
+ 	depends on !HOST_OS_MACOS
+ 	depends on KERNEL_DEBUG_INFO && !KERNEL_DEBUG_INFO_REDUCED
+ 	select DWARVES
+@@ -374,9 +375,20 @@ config KERNEL_DEBUG_INFO_BTF
+
+ 	  Required to run BPF CO-RE applications.
+
++config KERNEL_MODULE_ALLOW_BTF_MISMATCH
++	bool "Allow loading modules with non-matching BTF type info"
++	depends on KERNEL_DEBUG_INFO_BTF
++	default y
++	help
++	  For modules whose split BTF does not match vmlinux, load without
++	  BTF rather than refusing to load. The default behavior with
++	  module BTF enabled is to reject modules with such mismatches;
++	  this option will still load module BTF where possible but ignore
++	  it when a mismatch is found.
++
+ config KERNEL_DEBUG_INFO_REDUCED
+ 	bool "Reduce debugging information"
+-	default y
++	default y if !(TARGET_armsr || TARGET_bcm27xx || TARGET_ipq806x_chromium || TARGET_ipq807x || TARGET_mediatek_filogic || TARGET_mvebu_cortexa53 || TARGET_mvebu_cortexa72 || TARGET_rockchip || TARGET_sunxi || TARGET_x86_64)
+ 	depends on KERNEL_DEBUG_INFO
+ 	help
+ 	  If you say Y here gcc is instructed to generate less debugging
+@@ -464,17 +476,28 @@ config KERNEL_KPROBE_EVENTS
+ config KERNEL_BPF_EVENTS
+ 	bool "Compile the kernel with BPF event support"
+ 	select KERNEL_KPROBES
++	default y if KERNEL_DEBUG_INFO_BTF
+ 	help
+ 	  Allows to attach BPF programs to kprobe, uprobe and tracepoint events.
+ 	  This is required to use BPF maps of type BPF_MAP_TYPE_PERF_EVENT_ARRAY
+ 	  for sending data from BPF programs to user-space for post-processing
+ 	  or logging.
+
++config KERNEL_PROBE_EVENTS_BTF_ARGS
++	bool
++	depends on KERNEL_KPROBE_EVENTS && KERNEL_DEBUG_INFO_BTF
++	default n
++
+ config KERNEL_BPF_KPROBE_OVERRIDE
+ 	bool
+ 	depends on KERNEL_KPROBES
+ 	default n
+
++config KERNEL_BPF_STREAM_PARSER
++	bool "Allow a TCP stream parser to be used with BPF_MAP_TYPE_SOCKMAP"
++	depends on KERNEL_CGROUP_BPF
++	default y if KERNEL_DEBUG_INFO_BTF
++
+ config KERNEL_AIO
+ 	bool "Compile the kernel with asynchronous IO support"
+ 	default y if !SMALL_FLASH
+@@ -1100,6 +1123,7 @@ config KERNEL_NET_L3_MASTER_DEV
+
+ config KERNEL_XDP_SOCKETS
+ 	bool "XDP sockets support"
++	default y if KERNEL_DEBUG_INFO_BTF
+ 	help
+ 	  XDP sockets allows a channel between XDP programs and
+ 	  userspace applications.
diff --git a/devices/common/patches/ebpf.patch.main b/devices/common/patches/ebpf.patch.main
@@ -0,0 +1,64 @@
+--- a/config/Config-kernel.in
++++ b/config/Config-kernel.in
+@@ -426,6 +426,7 @@ config KERNEL_DEBUG_INFO
+
+ config KERNEL_DEBUG_INFO_BTF
+ 	bool "Enable additional BTF type information"
++	default y if (TARGET_armsr || TARGET_bcm27xx || TARGET_ipq806x_chromium || TARGET_mediatek_filogic || TARGET_mvebu_cortexa53 || TARGET_mvebu_cortexa72 || TARGET_rockchip || TARGET_sunxi || TARGET_x86_64)
+ 	depends on !HOST_OS_MACOS
+ 	depends on KERNEL_DEBUG_INFO && !KERNEL_DEBUG_INFO_REDUCED
+ 	select DWARVES
+@@ -443,6 +444,7 @@ config KERNEL_DEBUG_INFO_BTF_MODULES
+ config KERNEL_MODULE_ALLOW_BTF_MISMATCH
+ 	bool "Allow loading modules with non-matching BTF type info"
+ 	depends on KERNEL_DEBUG_INFO_BTF_MODULES
++	default y
+ 	help
+ 	  For modules whose split BTF does not match vmlinux, load without
+ 	  BTF rather than refusing to load. The default behavior with
+@@ -452,7 +454,7 @@ config KERNEL_MODULE_ALLOW_BTF_MISMATCH
+
+ config KERNEL_DEBUG_INFO_REDUCED
+ 	bool "Reduce debugging information"
+-	default y
++	default y if !(TARGET_armsr || TARGET_bcm27xx || TARGET_ipq806x_chromium || TARGET_mediatek_filogic || TARGET_mvebu_cortexa53 || TARGET_mvebu_cortexa72 || TARGET_rockchip || TARGET_sunxi || TARGET_x86_64)
+ 	depends on KERNEL_DEBUG_INFO
+ 	help
+ 	  If you say Y here gcc is instructed to generate less debugging
+@@ -540,17 +542,28 @@ config KERNEL_KPROBE_EVENTS
+ config KERNEL_BPF_EVENTS
+ 	bool "Compile the kernel with BPF event support"
+ 	select KERNEL_KPROBES
++	default y if KERNEL_DEBUG_INFO_BTF
+ 	help
+ 	  Allows to attach BPF programs to kprobe, uprobe and tracepoint events.
+ 	  This is required to use BPF maps of type BPF_MAP_TYPE_PERF_EVENT_ARRAY
+ 	  for sending data from BPF programs to user-space for post-processing
+ 	  or logging.
+
++config KERNEL_PROBE_EVENTS_BTF_ARGS
++	bool
++	depends on KERNEL_KPROBE_EVENTS && KERNEL_DEBUG_INFO_BTF
++	default n
++
+ config KERNEL_BPF_KPROBE_OVERRIDE
+ 	bool
+ 	depends on KERNEL_KPROBES
+ 	default n
+
++config KERNEL_BPF_STREAM_PARSER
++	bool "Allow a TCP stream parser to be used with BPF_MAP_TYPE_SOCKMAP"
++	depends on KERNEL_CGROUP_BPF
++	default y if KERNEL_DEBUG_INFO_BTF
++
+ config KERNEL_AIO
+ 	bool "Compile the kernel with asynchronous IO support"
+ 	default y if !SMALL_FLASH
+@@ -1189,6 +1202,7 @@ config KERNEL_NET_L3_MASTER_DEV
+
+ config KERNEL_XDP_SOCKETS
+ 	bool "XDP sockets support"
++	default y if KERNEL_DEBUG_INFO_BTF
+ 	help
+ 	  XDP sockets allows a channel between XDP programs and
+ 	  userspace applications.
diff --git a/devices/common/patches/openssl.patch b/devices/common/patches/openssl.patch
@@ -0,0 +1,32 @@
+--- a/package/libs/openssl/Config.in
++++ b/package/libs/openssl/Config.in
+@@ -4,7 +4,7 @@ comment "Build Options"
+
+ config OPENSSL_OPTIMIZE_SPEED
+ 	bool
+-	default y if x86_64 || i386
++	default y
+ 	prompt "Enable optimization for speed instead of size"
+ 	select OPENSSL_WITH_ASM
+ 	help
+@@ -38,9 +38,9 @@ config OPENSSL_WITH_ASM
+
+ config OPENSSL_WITH_SSE2
+ 	bool
+-	default y if !TARGET_x86_legacy && !TARGET_x86_geode
++	default y if x86_64 || i386 && !TARGET_x86_legacy
+ 	prompt "Enable use of x86 SSE2 instructions"
+-	depends on OPENSSL_WITH_ASM && i386
++	depends on OPENSSL_WITH_ASM && x86_64 || i386
+ 	help
+ 		Use of SSE2 instructions greatly increase performance with a
+ 		minimum increase in package size, but it will bring no benefit
+@@ -133,7 +133,7 @@ config OPENSSL_WITH_CHACHA_POLY1305
+
+ config OPENSSL_PREFER_CHACHA_OVER_GCM
+ 	bool
+-	default y if !x86_64 && !aarch64
++	default y if !x86_64
+ 	prompt "Prefer ChaCha20-Poly1305 over AES-GCM by default"
+ 	depends on OPENSSL_WITH_CHACHA_POLY1305
+ 	help
diff --git a/devices/common/patches/kernel6.1.patch.b → devices/common/patches/qca-ssdk.patch.main b/devices/common/patches/kernel6.1.patch.b → devices/common/patches/qca-ssdk.patch.main
@@ -18,4 +18,4 @@
 +	TOOL_PATH=$(TOOLCHAIN_BIN_PATH) \
  	SYS_PATH=$(LINUX_DIR) \
  	TOOLPREFIX=$(TARGET_CROSS) \
- 	KVER=$(LINUX_VERSION) \
+ 	KVER=$(LINUX_VERSION) \
diff --git a/devices/common/patches/rootfstargz.patch.b → ...ces/common/patches/rootfstargz.patch.main b/devices/common/patches/rootfstargz.patch.b → ...ces/common/patches/rootfstargz.patch.main
diff --git a/devices/ipq50xx_arm/.config b/devices/ipq50xx_arm/.config
@@ -1,8 +1,6 @@
-
 CONFIG_TARGET_ipq50xx=y
 CONFIG_TARGET_ipq50xx_arm=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_ALL_PROFILES=y
 
-CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
-
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
diff --git a/devices/ipq50xx_arm/diy.sh b/devices/ipq50xx_arm/diy.sh
@@ -4,6 +4,8 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2099-12-06/" package/network/config/netifd/Makefile
+rm -rf package/kernel/qca- package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k-firmware package/kernel/mac80211
 
-rm -rf package/kernel/mt76 devices/common/patches/mt7922.patch
+git_clone_path ipq50xx-mainline-kernel-5.15-openwrt-23.05 https://github.com/hzyitc/openwrt-redmi-ax3000 target/linux/ipq50xx package/firmware/ipq-wifi package/firmware/ath11k-firmware package/kernel/mac80211 package/boot/uboot-envtools package/kernel/qca-nss-dp package/kernel/qca-ssdk
+
+sed -i "s/wpad-basic-wolfssl/wpad-basic-mbedtls/" target/linux/ipq50xx/Makefile