update

.github/workflows/Openwrt-AutoBuild.yml

@@ -264,28 +264,6 @@ jobs:
         REMOTE_HOST: op.supes.top
         REMOTE_USER: root
         TARGET: "/www/wwwroot/op.supes.top/releases/tmp/"
-        
-    - name: Deploy some packages to server
-      uses: easingthemes/ssh-deploy@main
-      if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser')
-      with:
-        SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-        ARGS: "-avzr"
-        SOURCE: openwrt/bin/packages/*/base/*-firmware*
-        REMOTE_HOST: op.supes.top
-        REMOTE_USER: root
-        TARGET: "/www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/"
-
-    - name: remote ssh command
-      uses: appleboy/ssh-action@master
-      if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser')
-      with:
-        host: op.supes.top
-        username: root
-        key: ${{ env.SSH_PRIVATE_KEY }}
-        script: |
-          cd /www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/
-          opkg &
 
     - name: Upload firmware for artifact
       uses: actions/upload-artifact@main

devices/at91_sama5/.config

@@ -2,7 +2,9 @@
 CONFIG_TARGET_at91=y
 CONFIG_TARGET_at91_sama5=y
 CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_at91_sama5_DEVICE_microchip_sama5d3-xplained=y
+CONFIG_TARGET_DEVICE_at91_sama5_DEVICE_wankeyun=y
+
+CONFIG_TARGET_ROOTFS_EXT4FS=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 

devices/at91_sama5/patches/wankeyun.patch

@@ -0,0 +1,19 @@
+--- a/target/linux/at91/image/sama5.mk
++++ b/target/linux/at91/image/sama5.mk
+@@ -120,6 +120,16 @@ define Device/microchip_sama5d3-xplained
+ endef
+ TARGET_DEVICES += microchip_sama5d3-xplained
+ 
++define Device/wankeyun
++  $(Device/evaluation-dtb)
++  DEVICE_VENDOR := 玩客云
++  DEVICE_MODEL := WanKeYun
++  DEVICE_DTS := at91-sama5d3_xplained
++  KERNEL_SIZE := 6144k
++  $(Device/evaluation-sdimage)
++endef
++TARGET_DEVICES += wankeyun
++
+ ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"")
+  ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"")
+   define Device/laird_wb50n

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/qca package/qat target/linux/generic
 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
@@ -13,11 +13,15 @@ svn export --force https://github.com/Boos4721/openwrt/trunk/package/qca package
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/qat package/qat
 svn export --force https://github.com/Boos4721/openwrt/trunk/package/kernel/mac80211 package/kernel/mac80211
 
-svn co https://github.com/Boos4721/openwrt/trunk/target/linux/generic/pending-5.15 target/linux/generic/pending-5.15
-rm -rf target/linux/ipq807x/!(patches-5.15)
+svn co https://github.com/Boos4721/openwrt/trunk/target/linux/generic target/linux/generic
 svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x target/linux/ipq807x
-rm -rf target/linux/ipq807x/{.svn,patches-5.15/.svn}
-svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x/patches-5.15 target/linux/ipq807x/patches-5.15
+
+curl -sfL https://raw.githubusercontent.com/Boos4721/openwrt/master/package/kernel/linux/modules/netsupport.mk -o package/kernel/linux/modules/netsupport.mk
+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
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-turboacc/' target/linux/ipq807x/Makefile
 
@@ -44,5 +48,6 @@ 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_QCOM_SPMI_ADC_TM5 is not set
+# CONFIG_CHARGER_QCOM_SMBB is not set
 ' >> ./target/linux/ipq807x/config-5.15

devices/ipq807x/patches/modules.patch

@@ -1,73 +1,3 @@
---- a/package/kernel/linux/modules/netsupport.mk
-+++ b/package/kernel/linux/modules/netsupport.mk
-@@ -1347,3 +1347,66 @@ define KernelPackage/wireguard/description
- endef
- 
- $(eval $(call KernelPackage,wireguard))
-+
-+define KernelPackage/qrtr
-+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
-+  TITLE:=Qualcomm IPC Router support
-+  HIDDEN:=1
-+  DEPENDS:=@LINUX_5_15
-+  KCONFIG:=CONFIG_QRTR
-+  FILES:= \
-+  $(LINUX_DIR)/net/qrtr/qrtr.ko \
-+  $(LINUX_DIR)/net/qrtr/ns.ko
-+  AUTOLOAD:=$(call AutoProbe,qrtr)
-+endef
-+
-+define KernelPackage/qrtr/description
-+ Qualcomm IPC Router support
-+endef
-+
-+$(eval $(call KernelPackage,qrtr))
-+
-+define KernelPackage/qrtr-tun
-+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
-+  TITLE:=TUN device for Qualcomm IPC Router
-+  DEPENDS:=+kmod-qrtr
-+  KCONFIG:=CONFIG_QRTR_TUN
-+  FILES:= $(LINUX_DIR)/net/qrtr/qrtr-tun.ko
-+  AUTOLOAD:=$(call AutoProbe,qrtr-tun)
-+endef
-+
-+define KernelPackage/qrtr-tun/description
-+ TUN device for Qualcomm IPC Router
-+endef
-+
-+$(eval $(call KernelPackage,qrtr-tun))
-+
-+define KernelPackage/qrtr-smd
-+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
-+  TITLE:=SMD IPC Router channels
-+  DEPENDS:=+kmod-qrtr @TARGET_ipq807x
-+  KCONFIG:=CONFIG_QRTR_SMD
-+  FILES:= $(LINUX_DIR)/net/qrtr/qrtr-smd.ko
-+  AUTOLOAD:=$(call AutoProbe,qrtr-smd)
-+endef
-+
-+define KernelPackage/qrtr-smd/description
-+ SMD IPC Router channels
-+endef
-+
-+$(eval $(call KernelPackage,qrtr-smd))
-+
-+define KernelPackage/qrtr-mhi
-+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
-+  TITLE:=MHI IPC Router channels
-+  DEPENDS:=+kmod-mhi-bus +kmod-qrtr
-+  KCONFIG:=CONFIG_QRTR_MHI
-+  FILES:= $(LINUX_DIR)/net/qrtr/qrtr-mhi.ko
-+  AUTOLOAD:=$(call AutoProbe,qrtr-mhi)
-+endef
-+
-+define KernelPackage/qrtr-mhi/description
-+ MHI IPC Router channels
-+endef
-+
-+$(eval $(call KernelPackage,qrtr-mhi))
-
 --- a/package/kernel/linux/modules/other.mk
 +++ b/package/kernel/linux/modules/other.mk
 @@ -1322,3 +1322,17 @@ define KernelPackage/mhi-pci-generic/description