update

.github/workflows/Openwrt-AutoBuild.yml

@@ -127,7 +127,7 @@ jobs:
         sudo timedatectl set-timezone "$TZ"
         git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
         git config --global user.name "github-actions[bot]"
-    
+
     - name: Get current date
       id: date
       run: |
@@ -138,11 +138,12 @@ jobs:
 
     - name: Clone source code
       run: |
-        if [[ ! "${{ env.REPO_BRANCH }}" && "$REPO_URL" == "https://github.com/openwrt/openwrt" ]]; then
-          REPO_BRANCH="$((curl -gs -H 'Content-Type: application/json' \
+        REPO_BRANCH="$((curl -gs -H 'Content-Type: application/json' \
            -H "Authorization: Bearer ${{ secrets.TOKEN_KIDDIN9 }}" \
            -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 v23 | tail -n 1)"
-           git clone $REPO_URL -b $REPO_BRANCH openwrt
+        echo "CONFIG_VERSION_REPO=\"https://dl.openwrt.ai/`echo $REPO_BRANCH  | cut -d . -f 1,2 | sed -e 's/^v//'`\"">>devices/common/.config
+        if [[ ! "${{ env.REPO_BRANCH }}" && "$REPO_URL" == "https://github.com/openwrt/openwrt" ]]; then
+            git clone $REPO_URL -b $REPO_BRANCH openwrt
         elif [[ ! "${{ env.REPO_BRANCH }}" ]]; then
             git clone $REPO_URL openwrt
         else
@@ -205,7 +206,7 @@ jobs:
       run: |
         cd openwrt
         make defconfig
-        if [[ ! "${{matrix.target}}" =~ (armsr_armv8|bcm27xx_*|rockchip_*|sunxi_*|x86_*) ]]; then
+        if [[ ! "${{matrix.target}}" =~ (armsr_armv8|bcm27xx_*|rockchip_*|sunxi_*|x86_*|meson_meson8b) ]]; then
         sed -n '/# Wireless Drivers/,/# end of Wireless Drivers/p' .config | sed -e 's/=m/=n/' >>.config
         sed -i "s/\(kmod-qca.*\)=m/\1=n/" .config
         make defconfig
@@ -275,17 +276,9 @@ jobs:
         echo "NOTICE=请分配不少于1G的存储容量" >> $GITHUB_ENV
         fi
 
-    - name: Upload firmware for artifact
-      uses: actions/upload-artifact@main
-      continue-on-error: true
-      if: env.UPLOAD_FIRMWARE_FOR_ARTIFACT == 'true'
-      with:
-        name: ${{ env.VERSION }}_${{matrix.target}}
-        path: |
-          openwrt/bin/targets/
-
     - name: Deploy imagebuilder to server
       uses: easingthemes/ssh-deploy@main
+      continue-on-error: true
       if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser')
       with:
         SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
@@ -296,6 +289,14 @@ jobs:
         REMOTE_USER: root
         TARGET: "/www/wwwroot/op.supes.top/releases/tmp/"
 
+    - name: Upload firmware for artifact
+      uses: actions/upload-artifact@main
+      if: env.UPLOAD_FIRMWARE_FOR_ARTIFACT == 'true'
+      with:
+        name: ${{ env.VERSION }}_${{matrix.target}}
+        path: |
+          openwrt/bin/targets/
+
     - name: Upload firmware to cowtransfer
       if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'
       continue-on-error: true

.github/workflows/repo-dispatcher.yml

@@ -127,6 +127,11 @@ 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": "mediatek_mt7986 ${{ github.event.inputs.param }}", "client_payload": {"target": "mediatek_mt7986"}}'
+          curl \
+          -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": "ipq50xx_arm ${{ github.event.inputs.param }}", "client_payload": {"target": "ipq50xx_arm"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
@@ -167,11 +172,6 @@ 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": "ipq807x_ipq60xx ${{ github.event.inputs.param }}", "client_payload": {"target": "ipq807x_ipq60xx"}}'
-          curl \
-          -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": "meson_meson8b ${{ github.event.inputs.param }}", "client_payload": {"target": "meson_meson8b"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \

devices/armsr_armv8/patches/rootfs.patch

@@ -36,7 +36,7 @@
      IMAGES-y += combined.img
    endif
    ifeq ($(CONFIG_VMDK_IMAGES),y)
-@@ -115,4 +113,21 @@ define Device/generic
+@@ -116,4 +114,34 @@ define Device/generic
  endef
  TARGET_DEVICES += generic
  
@@ -46,6 +46,12 @@
 +endef
 +TARGET_DEVICES += box
 +
++define Device/h28k
++  DEVICE_TITLE := Hlink H28K
++  DEVICE_PACKAGES := perlbase-base perlbase-utf8 perlbase-time perlbase-xsloader perlbase-file btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-mbedtls iw fdisk lsblk automount -luci-app-attendedsysupgrade -luci-app-gpsysupgrade
++endef
++TARGET_DEVICES += h28k
++
 +define Image/Build
 +  if [ "$(PROFILE_SANITIZED)" == "box" ]; then \
 +  	export BIN_DIR=$(BIN_DIR); \
@@ -54,6 +60,13 @@
 +	export ROOTFS_PARTSIZE=$(shell echo $$(($(ROOTFS_PARTSIZE)/1024/1024))); \
 +  	cd /data/packit/amlogic-s9xxx-openwrt; \
 +  	. ~/packit/packit_amlogic.sh; \
++  elif [ "$(PROFILE_SANITIZED)" == "h28k" ]; then \
++  	export BIN_DIR=$(BIN_DIR); \
++  	export DATE=$(DATE); \
++  	export PACKAGE_SOC=$(PROFILE_SANITIZED); \
++	export ROOTFS_MB=$(shell echo $$(($(ROOTFS_PARTSIZE)/1024/1024))); \
++  	cd /data/packit/flippy-openwrt-actions; \
++  	. ~/packit/packit_flippy.sh; \
 +  fi
 +endef
 +

devices/common/.config

@@ -110,7 +110,9 @@ CONFIG_PACKAGE_kmod-mii=n
 
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
-CONFIG_VERSION_REPO="https://op.supes.top/23.05"
+
 CONFIG_VERSION_MANUFACTURER="Kiddin'"
 CONFIG_VERSION_FILENAMES=n
 CONFIG_VERSION_CODE_FILENAMES=n
+
+

devices/common/diy.sh

@@ -39,9 +39,6 @@ sed -i "s/192.168.1/10.0.0/" package/base-files/files/bin/config_generate
 
 (
 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/{799-v6.0-net-mii*,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*,733-v6.4-21-net-mtk_eth_soc*,733-v6.4-22-net-ethernet-mtk*,775-v5.16-net-phylink*,776-v5.16-net-ethernet-*,890-v6.1-mtd-spinand-winbond*,891-v6.1-mtd-spinand-winbond*}
 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/CONFIG_WERROR=y/CONFIG_WERROR=n/" target/linux/generic/config-5.15
 ) &
@@ -72,6 +69,7 @@ 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
 
+sed -i '/echo "radio_config_id=${radio_md5sum}" >> $hostapd_conf_file/d' package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
 
 date=`date +%m.%d.%Y`
 sed -i -e "/\(# \)\?REVISION:=/c\REVISION:=$date" -e '/VERSION_CODE:=/c\VERSION_CODE:=$(REVISION)' include/version.mk

devices/common/patches/imagebuilder.patch

@@ -1,6 +1,6 @@
 --- a/target/imagebuilder/Makefile
 +++ b/target/imagebuilder/Makefile
-@@ -38,13 +38,16 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
+@@ -38,13 +38,15 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
  		./files/repositories.conf \
  		$(TMP_DIR)/.targetinfo \
  		$(TMP_DIR)/.packageinfo \
@@ -13,9 +13,8 @@
  	$(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf)
  	$(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf
 -endif
-+	$(SED) 's/^src\/gz \(.*\) https.*top\/\(.*packages.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/\2/' $(PKG_BUILD_DIR)/repositories.conf
-+	$(SED) 's/^src\/gz \(.*\) https.*top\/\(.*targets.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/\2/' $(PKG_BUILD_DIR)/repositories.conf
-+	$(SED) 's/\/kiddin9//' $(PKG_BUILD_DIR)/repositories.conf
++	$(SED) 's/^src\/gz \(.*\) https.*ai\/\(.*packages.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/\2/' $(PKG_BUILD_DIR)/repositories.conf
++	$(SED) 's/^src\/gz \(.*\) https.*ai\/\(.*targets.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/\2/' $(PKG_BUILD_DIR)/repositories.conf
 +	$(SED) '/openwrt_core/d' $(PKG_BUILD_DIR)/repositories.conf
  
  	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
@@ -41,7 +40,7 @@
  	rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
  	mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
 +	if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-4a-gigabit-v2|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban|DEVICE_zte_e8820v2) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
-+		echo "src/gz openwrt_smflash https://op.supes.top/packages/small_flash" >>$(TOPDIR)/repositories.conf; \
++		echo "src/gz openwrt_smflash https://dl.openwrt.ai/packages/small_flash" >>$(TOPDIR)/repositories.conf; \
 +	else \
 +		sed -i "/smflash/d" $(TOPDIR)/repositories.conf; \
 +	fi
@@ -80,7 +79,7 @@
  	)
  	$(call prepare_rootfs,$(TARGET_DIR),$(USER_FILES),$(DISABLED_SERVICES))
 +	if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
-+		echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(BUILD_DIR)/root-ramips/etc/opkg/distfeeds.conf; \
++		echo "src/gz openwrt_smflash https://dl.openwrt.ai/packages/mipsel_24kc/small_flash" >>$(BUILD_DIR)/root-ramips/etc/opkg/distfeeds.conf; \
 +	fi
  
  build_image: FORCE

devices/common/patches/mt7922.patch

@@ -35,4 +35,4 @@
 +$(eval $(call KernelPackage,mt7922-firmware))
  $(eval $(call KernelPackage,mt792x-common))
  $(eval $(call KernelPackage,mt792x-usb))
- $(eval $(call KernelPackage,mt7921-common))
+ $(eval $(call KernelPackage,mt7921-common))

devices/common/settings.ini

@@ -1,5 +1,5 @@
 REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="openwrt-23.05"
+REPO_BRANCH=""
 CONFIG_FILE=".config"
 DIY_SH="diy.sh"
 FREE_UP_DISK="false"

devices/ipq40xx_generic/diy.sh

@@ -6,4 +6,6 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 #sh -c "curl -sfL https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/10778.patch | git apply -p1"
 
+curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/ipq40xx/patches-5.10/999-ipq40xx-unlock-cpu-frequency.patch -o target/linux/ipq40xx/patches-5.15/999-ipq40xx-unlock-cpu-frequency.patch
+
 

devices/ipq50xx_arm/diy.sh

@@ -4,4 +4,6 @@ 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
+sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2099-12-06/" package/network/config/netifd/Makefile
+
+rm -rf feeds/kiddin9/{rtl8821cu,rtl88x2bu} package/kernel/mt76 devices/common/patches/mt7922.patch

devices/ipq806x_generic/diy.sh

@@ -4,24 +4,7 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-rm -rf target/linux/ipq806x target/linux/generic
-svn co https://github.com/APCCV/OpenWRT-23.05.0-rc2-NSS/trunk/target/linux/ipq806x target/linux/ipq806x
 
-svn co https://github.com/APCCV/OpenWRT-23.05.0-rc2-NSS/trunk/target/linux/generic target/linux/generic
-
-curl -sfL https://raw.githubusercontent.com/APCCV/OpenWRT-23.05.0-rc2-NSS/v23.05.0-rc2/include/kernel-5.15 -o include/kernel-5.15
-
-
-git clone https://github.com/ACwifidude/nss-packages package/nss-packages
-
-sed -i "s/vxlan\/vxlan.ko/vxlan.ko/" package/kernel/linux/modules/netsupport.mk
-
-rm -rf package/feeds/kiddin9/{shortcut-fe,fullconenat,fibocom_QMI_WWAN,fullconenat-nft,fast-classifier,simulated-driver} package/nss-packages/qca-nss-crypto package/nss-packages/qca-nss-cfi
-
-curl -sfL https://raw.githubusercontent.com/APCCV/OpenWRT-23.05.0-rc2-NSS/v23.05.0-rc2/nss-makefile-changes/qca-nss-clients-Makefile -o package/nss-packages/qca-nss-clients/Makefile
-curl -sfL https://raw.githubusercontent.com/APCCV/OpenWRT-23.05.0-rc2-NSS/v23.05.0-rc2/nss-makefile-changes/qca-nss-ecm-Makefile -o package/nss-packages/qca-nss-ecm/Makefile
-
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-qca-nss-drv kmod-qca-nss-ecm-standard kmod-qca-nss-gmac kmod-qca-nss-drv-qdisc kmod-nss-ifb kmod-qca-nss-drv-pppoe kmod-qca-nss-drv-l2tpv2 kmod-qca-nss-drv-tunipip6/' target/linux/ipq806x/Makefile
 
 
 

devices/ipq806x_generic/patches/mac80211-NSS.patch

@@ -1,415 +0,0 @@
-From fc0a9dd3c5f4e6a545b98239affd1d1e3f8c55ca Mon Sep 17 00:00:00 2001
-From: ACwifidude <[email protected]>
-Date: Fri, 30 Sep 2022 11:33:18 -0500
-Subject: [PATCH] ipq806x: NSS Hardware Offloading mac80211 support
-
----
- package/kernel/mac80211/Makefile              |  22 +-
- .../subsys/999-mac80211-NSS-support.patch     | 292 ++++++++++++++++++
- 2 files changed, 310 insertions(+), 4 deletions(-)
- create mode 100644 package/kernel/mac80211/patches/subsys/999-mac80211-NSS-support.patch
-
-diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
-index 248b48c3c15..d1840c91758 100644
---- a/package/kernel/mac80211/Makefile
-+++ b/package/kernel/mac80211/Makefile
-@@ -78,6 +78,7 @@ config-$(CONFIG_PACKAGE_CFG80211_TESTMODE) += NL80211_TESTMODE
- 
- config-$(call config_package,mac80211) += MAC80211
- config-$(CONFIG_PACKAGE_MAC80211_MESH) += MAC80211_MESH
-+config-$(CONFIG_PACKAGE_MAC80211_NSS_SUPPORT) += MAC80211_NSS_SUPPORT
- 
- include ath.mk
- include broadcom.mk
-@@ -121,7 +122,7 @@ define KernelPackage/mac80211
-   $(call KernelPackage/mac80211/Default)
-   TITLE:=Linux 802.11 Wireless Networking Stack
-   # +kmod-crypto-cmac is a runtime only dependency of net/mac80211/aes_cmac.c
--  DEPENDS+= +kmod-cfg80211 +kmod-crypto-cmac +kmod-crypto-ccm +kmod-crypto-gcm +hostapd-common
-+  DEPENDS+= +kmod-cfg80211 +kmod-crypto-cmac +kmod-crypto-ccm +kmod-crypto-gcm +hostapd-common +PACKAGE_kmod-qca-nss-drv:kmod-qca-nss-drv
-   KCONFIG:=\
- 	CONFIG_AVERAGE=y
-   FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko
-@@ -132,6 +133,16 @@ endef
- define KernelPackage/mac80211/config
-   if PACKAGE_kmod-mac80211
- 
-+		 if PACKAGE_kmod-qca-nss-drv
-+		config PACKAGE_MAC80211_NSS_SUPPORT
-+			bool "Enable NSS support for IPQ platform"
-+			default y
-+			help
-+			  This option enables support for NSS in boards
-+			  like Netgear R7800.
-+	endif
-+
-+
- 	config PACKAGE_MAC80211_DEBUGFS
- 		bool "Export mac80211 internals in DebugFS"
- 		select KERNEL_DEBUG_FS
-@@ -273,9 +284,12 @@ ifeq ($(BUILD_VARIANT),smallbuffers)
- 	C_DEFINES+= -DCONFIG_ATH10K_SMALLBUFFERS
- endif
- 
--MAKE_OPTS:= \
--	$(subst -C $(LINUX_DIR),-C "$(PKG_BUILD_DIR)",$(KERNEL_MAKEOPTS)) \
--	EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/include $(IREMAP_CFLAGS) $(C_DEFINES)" \
-+C_DEFINES+= -DSTANDALONE_CT
-+
-+MAKE_OPTS:= -C "$(PKG_BUILD_DIR)" \
-+	$(KERNEL_MAKE_FLAGS) \
-+	EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/include $(IREMAP_CFLAGS) $(C_DEFINES) \
-+		-I$(STAGING_DIR)/usr/include/qca-nss-drv" \
- 	KLIB_BUILD="$(LINUX_DIR)" \
- 	MODPROBE=true \
- 	KLIB=$(TARGET_MODULES_DIR) \
-diff --git a/package/kernel/mac80211/patches/subsys/999-mac80211-NSS-support.patch b/package/kernel/mac80211/patches/subsys/999-mac80211-NSS-support.patch
-new file mode 100644
-index 00000000000..a0c1720c71a
---- /dev/null
-+++ b/package/kernel/mac80211/patches/subsys/999-mac80211-NSS-support.patch
-@@ -0,0 +1,344 @@
-+--- a/net/mac80211/Kconfig
-++++ b/net/mac80211/Kconfig
-+@@ -19,6 +19,13 @@ comment "CFG80211 needs to be enabled fo
-+ 
-+ if MAC80211 != n
-+ 
-++config MAC80211_NSS_SUPPORT
-++	bool "Enable NSS support for IPQ platform"
-++	default n
-++	---help---
-++	This option enables support for NSS in boards
-++	like AP148.
-++
-+ config MAC80211_HAS_RC
-+ 	bool
-+ 
-+--- a/local-symbols
-++++ b/local-symbols
-+@@ -39,6 +39,7 @@ LIB80211_CRYPT_CCMP=
-+ LIB80211_CRYPT_TKIP=
-+ LIB80211_DEBUG=
-+ MAC80211=
-++MAC80211_NSS_SUPPORT=
-+ MAC80211_HAS_RC=
-+ MAC80211_RC_MINSTREL=
-+ MAC80211_RC_DEFAULT_MINSTREL=
-+--- a/net/mac80211/ieee80211_i.h
-++++ b/net/mac80211/ieee80211_i.h
-+@@ -36,6 +36,10 @@
-+ 
-+ extern const struct cfg80211_ops mac80211_config_ops;
-+ 
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++#include <nss_api_if.h>
-++#endif
-++
-+ struct ieee80211_local;
-+ 
-+ /* Maximum number of broadcast/multicast frames to buffer when some of the
-+@@ -1097,6 +1101,12 @@ struct ieee80211_sub_if_data {
-+ 	} debugfs;
-+ #endif
-+ 
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++	struct nss_virt_if_handle *nssctx;
-++	struct sk_buff_head rx_queue;
-++	struct work_struct rx_work;
-++#endif
-++
-+ 	/* must be last, dynamically sized area in this! */
-+ 	struct ieee80211_vif vif;
-+ };
-+--- a/net/mac80211/iface.c
-++++ b/net/mac80211/iface.c
-+@@ -15,6 +15,7 @@
-+ #include <linux/if_arp.h>
-+ #include <linux/netdevice.h>
-+ #include <linux/rtnetlink.h>
-++#include <linux/module.h>
-+ #include <linux/kcov.h>
-+ #include <net/mac80211.h>
-+ #include <net/ieee80211_radiotap.h>
-+@@ -27,6 +28,12 @@
-+ #include "wme.h"
-+ #include "rate.h"
-+ 
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++bool nss_redirect = true;
-++module_param(nss_redirect, bool, 0644);
-++MODULE_PARM_DESC(nss_redirect, "module param to enable NSS Redirect; 1-enable, 0-disable");
-++#endif
-++
-+ /**
-+  * DOC: Interface list locking
-+  *
-+@@ -439,6 +446,64 @@ static int ieee80211_open(struct net_dev
-+ 	return err;
-+ }
-+ 
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++/* This callback is registered for nss redirect to receive packet exceptioned from nss in Rx path.
-++ * When packet does not match any of the ecm rules is redirected back here.
-++ */
-++void receive_from_nss(struct net_device *dev, struct sk_buff *sk_buff, struct napi_struct *napi)
-++{
-++	struct net_device *netdev;
-++	struct sk_buff *skb;
-++	struct ieee80211_sub_if_data *sdata;
-++
-++	if (!dev) {
-++		kfree(sk_buff);
-++		return;
-++	}
-++
-++	netdev = (struct net_device *)dev;
-++	sdata = netdev_priv(netdev);
-++	if (sdata->dev != dev) {
-++		kfree(sk_buff);
-++		return;
-++	}
-++	skb = (struct sk_buff *)sk_buff;
-++	skb->dev = netdev;
-++	skb->protocol = eth_type_trans(skb, netdev);
-++	napi_gro_receive(napi, skb);
-++}
-++
-++static int ieee80211_create_nss_virtif(struct ieee80211_sub_if_data *sdata, struct net_device *dev)
-++{
-++	if (sdata->nssctx != NULL) {
-++		sdata_err(sdata, "Cannot create a NSS virtual interface. Already exists[n2h:%d, h2n:%d]!\n",
-++			  sdata->nssctx->if_num_n2h, sdata->nssctx->if_num_h2n);
-++		return 1;
-++	}
-++
-++	sdata->nssctx = NULL;
-++	if (nss_redirect) {
-++		sdata->nssctx = nss_virt_if_create_sync(dev);
-++		if (sdata->nssctx) {
-++			sdata_info(sdata, "Created a NSS virtual interface\n");
-++			nss_virt_if_register(sdata->nssctx, receive_from_nss, sdata->dev);
-++		}
-++		else
-++			sdata_err(sdata, "Failed to create a NSS virtual interface\n");
-++	}
-++
-++	return 0;
-++}
-++
-++static void ieee80211_destroy_nss_virtif(struct ieee80211_sub_if_data *sdata)
-++{
-++	if (sdata->nssctx) {
-++		nss_virt_if_destroy_sync(sdata->nssctx);
-++		sdata_info(sdata, "Destroyed NSS virtual interface\n");
-++	}
-++}
-++#endif
-++
-+ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_down)
-+ {
-+ 	struct ieee80211_local *local = sdata->local;
-+@@ -800,8 +865,24 @@ static void ieee80211_teardown_sdata(str
-+ 	ieee80211_link_stop(&sdata->deflink);
-+ }
-+ 
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++static int ieee80211_init(struct net_device *dev)
-++{
-++	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-++
-++	ieee80211_create_nss_virtif(sdata, dev);
-++
-++	return 0;
-++}
-++#endif
-++
-+ static void ieee80211_uninit(struct net_device *dev)
-+ {
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-++
-++	ieee80211_destroy_nss_virtif(sdata);
-++#endif
-+ 	ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
-+ }
-+ 
-+@@ -814,6 +895,9 @@ ieee80211_get_stats64(struct net_device
-+ static const struct net_device_ops ieee80211_dataif_ops = {
-+ 	.ndo_open		= ieee80211_open,
-+ 	.ndo_stop		= ieee80211_stop,
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++	.ndo_init		= ieee80211_init,
-++#endif
-+ 	.ndo_uninit		= ieee80211_uninit,
-+ 	.ndo_start_xmit		= ieee80211_subif_start_xmit,
-+ 	.ndo_set_rx_mode	= ieee80211_set_multicast_list,
-+--- a/net/mac80211/rx.c
-++++ b/net/mac80211/rx.c
-+@@ -33,6 +33,60 @@
-+ #include "wme.h"
-+ #include "rate.h"
-+ 
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++extern bool nss_redirect;
-++
-++#define case_rtn_string(val) case val: return #val
-++
-++static const char *nss_tx_status_str(nss_tx_status_t status)
-++{
-++	switch (status) {
-++		case_rtn_string(NSS_TX_SUCCESS);
-++		case_rtn_string(NSS_TX_FAILURE);
-++		case_rtn_string(NSS_TX_FAILURE_QUEUE);
-++		case_rtn_string(NSS_TX_FAILURE_NOT_READY);
-++		case_rtn_string(NSS_TX_FAILURE_TOO_LARGE);
-++		case_rtn_string(NSS_TX_FAILURE_TOO_SHORT);
-++		case_rtn_string(NSS_TX_FAILURE_NOT_SUPPORTED);
-++		case_rtn_string(NSS_TX_FAILURE_BAD_PARAM);
-++		case_rtn_string(NSS_TX_FAILURE_NOT_ENABLED);
-++		case_rtn_string(NSS_TX_FAILURE_SYNC_BAD_PARAM);
-++		case_rtn_string(NSS_TX_FAILURE_SYNC_TIMEOUT);
-++		case_rtn_string(NSS_TX_FAILURE_SYNC_FW_ERR);
-++	default:
-++		return "Unknown NSS TX status";
-++	}
-++}
-++
-++static void netif_rx_nss(struct ieee80211_rx_data *rx,
-++			 struct sk_buff *skb)
-++{
-++	struct ieee80211_sub_if_data *sdata = rx->sdata;
-++	int ret;
-++
-++	if (!sdata->nssctx)
-++		goto out;
-++
-++	/* NSS expects ethernet header in skb data so resetting here */
-++	skb_push(skb, ETH_HLEN);
-++	ret = nss_virt_if_tx_buf(sdata->nssctx, skb);
-++	if (ret) {
-++		if (net_ratelimit()) {
-++			sdata_err(sdata, "NSS TX failed with error: %s\n",
-++				  nss_tx_status_str(ret));
-++		}
-++		goto out;
-++	}
-++
-++	return;
-++out:
-++	if (rx->list)
-++		list_add_tail(&skb->list, rx->list);
-++	else
-++		netif_receive_skb(skb);
-++}
-++#endif
-++
-+ /*
-+  * monitor mode reception
-+  *
-+@@ -2635,10 +2689,16 @@ static void ieee80211_deliver_skb_to_loc
-+ 			ether_addr_copy(ehdr->h_dest, sdata->vif.addr);
-+ 
-+ 		/* deliver to local stack */
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++		if (likely(nss_redirect)) {
-++			netif_rx_nss(rx, skb);
-++		}
-++#else
-+ 		if (rx->list)
-+ 			list_add_tail(&skb->list, rx->list);
-+ 		else
-+ 			netif_receive_skb(skb);
-++#endif
-+ 	}
-+ }
-+ 
-+--- a/net/mac80211/tx.c
-++++ b/net/mac80211/tx.c
-+@@ -36,6 +36,11 @@
-+ #include "wme.h"
-+ #include "rate.h"
-+ 
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++#include <net/ip.h>
-++#include <net/dsfield.h>
-++#endif
-++
-+ /* misc utils */
-+ 
-+ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
-+@@ -1729,6 +1734,16 @@ static bool ieee80211_tx_frags(struct ie
-+ 					return true;
-+ 				}
-+ 			} else {
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++				if (skb_queue_len(&local->pending[q]) >= 1000) {
-++					spin_unlock_irqrestore(
-++						&local->queue_stop_reason_lock,
-++						flags);
-++					ieee80211_purge_tx_queue(&local->hw,
-++								 skbs);
-++					return false;
-++				}
-++#endif
-+ 
-+ 				/*
-+ 				 * Since queue is stopped, queue up frames for
-+@@ -4448,6 +4463,35 @@ static void ieee80211_mlo_multicast_tx(s
-+ 	kfree_skb(skb);
-+ }
-+ 
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++void ieee80211_xmit_nss_fixup(struct sk_buff *skb,
-++			      struct net_device *dev)
-++{
-++	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-++
-++	/* Packets from NSS does not have valid protocol, priority and other
-++	 * network stack values. Derive required parameters (priority
-++	 * and network_header) from payload for QoS header.
-++	 * XXX: Here the assumption is that packet are in 802.3 format.
-++	 * As of now priority is handled only for IPv4 and IPv6.
-++	 */
-++
-++	if (sdata->nssctx && likely(!skb->protocol)) {
-++		skb_set_network_header(skb, 14);
-++		switch (((struct ethhdr *)skb->data)->h_proto) {
-++		case htons(ETH_P_IP):
-++			skb->priority = (ipv4_get_dsfield(ip_hdr(skb)) &
-++					 0xfc) >> 5;
-++			break;
-++		case htons(ETH_P_IPV6):
-++			skb->priority = (ipv6_get_dsfield(ipv6_hdr(skb)) &
-++					 0xfc) >> 5;
-++			break;
-++		}
-++	}
-++}
-++#endif
-++
-+ /**
-+  * ieee80211_subif_start_xmit - netif start_xmit function for 802.3 vifs
-+  * @skb: packet to be sent
-+@@ -4461,6 +4505,10 @@ netdev_tx_t ieee80211_subif_start_xmit(s
-+ 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-+ 	const struct ethhdr *eth = (void *)skb->data;
-+ 
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++	ieee80211_xmit_nss_fixup(skb, dev);
-++#endif
-++
-+ 	if (likely(!is_multicast_ether_addr(eth->h_dest)))
-+ 		goto normal;
-+ 
-+@@ -4646,6 +4694,10 @@ netdev_tx_t ieee80211_subif_start_xmit_8
-+ 	struct ieee80211_key *key;
-+ 	struct sta_info *sta;
-+ 
-++#ifdef CPTCFG_MAC80211_NSS_SUPPORT
-++	ieee80211_xmit_nss_fixup(skb, dev);
-++#endif
-++
-+ 	if (unlikely(!ieee80211_sdata_running(sdata) || skb->len < ETH_HLEN)) {
-+ 		kfree_skb(skb);
-+ 		return NETDEV_TX_OK;

devices/ipq806x_generic/patches/xiaomi_r3d.patch

@@ -40,7 +40,7 @@ MAC addresses as verified by stock firmware:
  create mode 100644 target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r3d.dts
 
 diff --git a/package/boot/uboot-envtools/files/ipq806x b/package/boot/uboot-envtools/files/ipq806x
-index 01a86c7b19fc..c0a781c1e21b 100644
+index 01a86c7b19fca..c0a781c1e21b4 100644
 --- a/package/boot/uboot-envtools/files/ipq806x
 +++ b/package/boot/uboot-envtools/files/ipq806x
 @@ -52,6 +52,10 @@ qcom,ipq8064-ap148|\
@@ -63,7 +63,7 @@ index 01a86c7b19fc..c0a781c1e21b 100644
  
  exit 0
 diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
-index 8dd52452b173..df27cbde7c5d 100644
+index 8dd52452b1739..df27cbde7c5d8 100644
 --- a/target/linux/ipq806x/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
 @@ -89,6 +89,10 @@ nokia,ac400i |\
@@ -78,7 +78,7 @@ index 8dd52452b173..df27cbde7c5d 100644
  	hw_mac_addr=$(mtd_get_mac_ascii 0:appsblenv ethaddr)
  	ucidef_add_switch "switch0" \
 diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 4c5019cf5bd2..aa8ed06aae4b 100644
+index 4c5019cf5bd24..aa8ed06aae4b3 100644
 --- a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 @@ -56,6 +56,9 @@ case "$FIRMWARE" in
@@ -102,7 +102,7 @@ index 4c5019cf5bd2..aa8ed06aae4b 100644
  		caldata_extract "0:art" 0x5000 0x2f20
  		ath10k_patch_mac $(mtd_get_mac_ascii 0:appsblenv ethaddr)
 diff --git a/target/linux/ipq806x/base-files/etc/init.d/bootcount b/target/linux/ipq806x/base-files/etc/init.d/bootcount
-index cb32a4ed3568..9d9ab3f100fe 100755
+index cb32a4ed3568d..9d9ab3f100fe2 100755
 --- a/target/linux/ipq806x/base-files/etc/init.d/bootcount
 +++ b/target/linux/ipq806x/base-files/etc/init.d/bootcount
 @@ -16,5 +16,13 @@ boot() {
@@ -120,7 +120,7 @@ index cb32a4ed3568..9d9ab3f100fe 100755
  	esac
  }
 diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
-index 5ec4f513bd33..b142fce86a08 100644
+index 5ec4f513bd33d..b142fce86a082 100644
 --- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
 @@ -71,6 +71,9 @@ platform_do_upgrade() {
@@ -135,7 +135,7 @@ index 5ec4f513bd33..b142fce86a08 100644
  		;;
 diff --git a/target/linux/ipq806x/base-files/lib/upgrade/xiaomi.sh b/target/linux/ipq806x/base-files/lib/upgrade/xiaomi.sh
 new file mode 100644
-index 000000000000..9246e8f867e3
+index 0000000000000..9246e8f867e3f
 --- /dev/null
 +++ b/target/linux/ipq806x/base-files/lib/upgrade/xiaomi.sh
 @@ -0,0 +1,441 @@
@@ -582,7 +582,7 @@ index 000000000000..9246e8f867e3
 +}
 diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r3d.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r3d.dts
 new file mode 100644
-index 000000000000..fd952d230c5d
+index 0000000000000..fd952d230c5da
 --- /dev/null
 +++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-r3d.dts
 @@ -0,0 +1,479 @@
@@ -1066,7 +1066,7 @@ index 000000000000..fd952d230c5d
 +	};
 +};
 diff --git a/target/linux/ipq806x/image/generic.mk b/target/linux/ipq806x/image/generic.mk
-index aac0a2c8fadf..b437706cd445 100644
+index aac0a2c8fadfd..b437706cd445e 100644
 --- a/target/linux/ipq806x/image/generic.mk
 +++ b/target/linux/ipq806x/image/generic.mk
 @@ -471,6 +471,23 @@ define Device/ubnt_unifi-ac-hd

devices/mediatek_mt7981/.config

@@ -14,21 +14,7 @@ CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_cmcc_rax3000m=y
 
 
 CONFIG_VERSION_DIST="OpenWrt"
-CONFIG_PACKAGE_kmod-ax25=n
-CONFIG_PACKAGE_kmod-mpls=n
-CONFIG_PACKAGE_kmod-netem=n
-CONFIG_PACKAGE_kmod-sched=n
-CONFIG_PACKAGE_kmod-sched-act-vlan=n
-CONFIG_PACKAGE_kmod-sched-bpf=n
-CONFIG_PACKAGE_kmod-sched-cake=n
-CONFIG_PACKAGE_kmod-sched-connmark=n
-CONFIG_PACKAGE_kmod-sched-core=n
-CONFIG_PACKAGE_kmod-sched-ctinfo=n
-CONFIG_PACKAGE_kmod-sched-flower=n
-CONFIG_PACKAGE_kmod-sched-ipset=n
-CONFIG_PACKAGE_kmod-sched-mqprio=n
 
-CONFIG_PACKAGE_kmod-i40e-vendor=n
 
 CONFIG_DEVEL=y
 CONFIG_TOOLCHAINOPTS=y

devices/mediatek_mt7981/diy.sh

@@ -4,12 +4,10 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-rm -rf feeds/kiddin9/{rtl*,shortcut-fe,fullconenat-nft} package/feeds/luci/rpcd-mod-luci toolchain/musl package/feeds/packages/gptfdisk package/utils/f2fs-tools package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
+rm -rf feeds/kiddin9/{rtl*,fullconenat-nft} package/feeds/luci/rpcd-mod-luci toolchain/musl package/feeds/packages/gptfdisk package/utils/f2fs-tools package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl package/feeds/packages/libevdev
 
 rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}
 
-sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2099-12-06/" package/network/config/netifd/Makefile
-
 #sed -i "/KernelPackage,sound-soc-core/d" package/kernel/linux/modules/sound.mk
 #sed -i "/KernelPackage,multimedia-input/d" package/kernel/linux/modules/video.mk
 
@@ -19,4 +17,6 @@ svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/u
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
 #ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
 
+sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2099-12-06/" package/network/config/netifd/Makefile
+
 sed -i "s/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-mtk mii_mgr wifi-profile mtkhqos_util wireless-regdb switch regs kmod-warp kmod-mt_wifi kmod-mediatek_hnat kmod-conninfra datconf-lua/" target/linux/mediatek/Makefile

devices/mediatek_mt7981/patches/targets.patch

@@ -52,6 +52,6 @@
 -  DEVICE_PACKAGES := automount blkid luci-app-ksmbd luci-i18n-ksmbd-zh-cn ksmbd-utils \
 -			luci-app-usb-printer luci-i18n-usb-printer-zh-cn \
 +  DEVICE_PACKAGES := automount blkid \
- 			kmod-nls-cp437 kmod-nls-iso8859-1
-   SUPPORTED_DEVICES := cmcc,rax3000m
-   UBINIZE_OPTS := -E 5
+ 			kmod-nls-cp437 kmod-nls-iso8859-1 \
+ 			kmod-usb-net-rndis usbutils
+   SUPPORTED_DEVICES := cmcc,rax3000m

devices/mediatek_mt7986/.config

@@ -4,21 +4,6 @@ CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_mt7986a-ax6000-emmc-re-cp-03=y
 
 CONFIG_VERSION_DIST="OpenWrt"
-CONFIG_PACKAGE_kmod-ax25=n
-CONFIG_PACKAGE_kmod-mpls=n
-CONFIG_PACKAGE_kmod-netem=n
-CONFIG_PACKAGE_kmod-sched=n
-CONFIG_PACKAGE_kmod-sched-act-vlan=n
-CONFIG_PACKAGE_kmod-sched-bpf=n
-CONFIG_PACKAGE_kmod-sched-cake=n
-CONFIG_PACKAGE_kmod-sched-connmark=n
-CONFIG_PACKAGE_kmod-sched-core=n
-CONFIG_PACKAGE_kmod-sched-ctinfo=n
-CONFIG_PACKAGE_kmod-sched-flower=n
-CONFIG_PACKAGE_kmod-sched-ipset=n
-CONFIG_PACKAGE_kmod-sched-mqprio=n
-
-CONFIG_PACKAGE_kmod-i40e-vendor=n
 
 CONFIG_DEVEL=y
 CONFIG_TOOLCHAINOPTS=y

devices/mediatek_mt7986/diy.sh

@@ -4,7 +4,7 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-rm -rf feeds/kiddin9/{rtl*,shortcut-fe,fullconenat-nft} package/feeds/luci/rpcd-mod-luci toolchain/musl package/feeds/packages/gptfdisk package/utils/f2fs-tools package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
+rm -rf feeds/kiddin9/{rtl*,fullconenat-nft} package/feeds/luci/rpcd-mod-luci toolchain/musl package/feeds/packages/gptfdisk package/utils/f2fs-tools package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl package/feeds/packages/libevdev
 
 rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}
 

devices/meson_meson8b/diy.sh

@@ -4,10 +4,13 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-rm -rf feeds/routing/batman-adv
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-6.1 target/linux/generic/hack-6.1
 
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/meson target/linux/meson
 
-sed -i "s/KERNEL_PATCHVER:=5.10/KERNEL_PATCHVER:=5.15/" target/linux/meson/Makefile
+rm -rf package/feeds/kiddin9/quectel_Gobinet
+
+curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch
+
 
 

devices/ramips_mt7621/.config

@@ -54,5 +54,7 @@ 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_TARGET_DEVICE_ramips_mt7621_DEVICE_ht-jsh_0211=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_c-life_xg1=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务

devices/ramips_mt7621/patches/c-life_xg1.patch

@@ -0,0 +1,373 @@
+From a3b880a4e8654e86eaf1a8854a07fd90783682ce Mon Sep 17 00:00:00 2001
+From: syb999 <[email protected]>
+Date: Sun, 4 Sep 2022 18:30:18 +0800
+Subject: [PATCH] ramips: add support for C-Life XG1 [WIFI6] (#10057)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CPU: MediaTek MT7621AT
+  Flash: Micron MT29F2G08ABAGAWP 128M
+  RAM: 256 M
+  WiFi: MT7915 2.4/5 GHz 2T2R
+  Ethernet: 10/100/1000 Mbps x3
+  LED: Status (red / blue / white / green / purple / cyan)
+  USB: 2.0 x 1
+  ZigBee/BlueTooth
+  USB Audio: iec958 x 1
+  Button: Reset
+  Power: DC 12V,1.5A
+
+开启ssh方法:
+  打开网页:192.168.10.1,用户路由器底面标注的用户名密码完成登陆。
+  然后打开网页:http://192.168.10.1/cgi-bin/luci/admin/mtk/console，在命令行中输入以下命令:
+  echo -en "root\nroot\n" | passwd
+  然后打开网页:http://192.168.10.1/cgi-bin/luci/pti/ssh_open
+  即可ssh登陆192.168.10.1,用户名root,密码root
+
+刷入openwrt:
+
+开启ssh后，上传breed-mt7621-xiaomi-r3g.bin到路由器/tmp目录。
+然后使用下面命令刷入breed:
+mtd -r write /tmp/breed-mt7621-xiaomi-r3g.bin Bootloader
+等待机器重启，等1分钟断开电源。
+按住C-Life XG1机身正面的圆形IoT按钮(gpio 18),通电就能进入breed刷机.
+---
+ package/boot/uboot-envtools/files/ramips      |   1 +
+ target/linux/ramips/dts/mt7621_c-life_xg1.dts | 160 ++++++++++++++++++
+ target/linux/ramips/image/mt7621.mk           |  17 ++
+ .../mt7621/base-files/etc/board.d/02_network  |   9 +
+ .../etc/hotplug.d/ieee80211/10_fix_wifi_mac   |   6 +
+ .../mt7621/base-files/lib/upgrade/platform.sh |   1 +
+ 6 files changed, 194 insertions(+)
+ create mode 100644 target/linux/ramips/dts/mt7621_c-life_xg1.dts
+
+diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips
+index 2942fb6af807a..4323a2574c55b 100644
+--- a/package/boot/uboot-envtools/files/ramips
++++ b/package/boot/uboot-envtools/files/ramips
+@@ -70,6 +70,7 @@
+ h3c,tx1800-plus|\
+ h3c,tx1801-plus|\
+ h3c,tx1806|\
++c-life,xg1|\
+ jcg,q20|\
+ linksys,e7350|\
+ netgear,wax202|\
+
+--- a/target/linux/ramips/dts/mt7621.dtsi
++++ b/target/linux/ramips/dts/mt7621.dtsi
+@@ -437,6 +437,13 @@
+ 		clock-names = "nfi_clk";
+ 	};
+ 
++	ethsys: ethsys@1e000000 {
++		compatible = "mediatek,mt7621-ethsys",
++			     "syscon";
++		reg = <0x1e000000 0x1000>;
++		#clock-cells = <1>;
++	};
++
+ 	ethernet: ethernet@1e100000 {
+ 		compatible = "mediatek,mt7621-eth";
+ 		reg = <0x1e100000 0x10000>;
+@@ -542,6 +549,59 @@
+ 		};
+ 	};
+ 
++	hnat: hnat@1e100000 {
++		compatible = "mediatek,mtk-hnat_v1";
++		ext-devices = "ra0", "rai0", "rax0",
++			"apcli0", "apclii0","apclix0";
++		reg = <0x1e100000 0x3000>;
++
++		resets = <&ethsys 0>;
++		reset-names = "mtketh";
++
++		mtketh-wan = "wan";
++		mtketh-ppd = "lan";
++		mtketh-lan = "lan";
++		mtketh-max-gmac = <1>;
++		mtkdsa-wan-port = <4>;
++	};
++
++	gsw: gsw@1e110000 {
++		compatible = "mediatek,mt753x";
++		reg = <0x1e110000 0x8000>;
++		interrupt-parent = <&gic>;
++		interrupts = <GIC_SHARED 23 IRQ_TYPE_LEVEL_HIGH>;
++
++		mediatek,mcm;
++		mediatek,mdio = <&mdio>;
++		mt7530,direct-phy-access;
++
++		resets = <&rstctrl 2>;
++		reset-names = "mcm";
++		status = "disabled";
++
++		port@5 {
++			compatible = "mediatek,mt753x-port";
++			reg = <5>;
++			phy-mode = "rgmii";
++
++			fixed-link {
++				speed = <1000>;
++				full-duplex;
++			};
++		};
++
++		port@6 {
++			compatible = "mediatek,mt753x-port";
++			reg = <6>;
++			phy-mode = "rgmii";
++
++			fixed-link {
++				speed = <1000>;
++				full-duplex;
++			};
++		};
++	};
++
+ 	pcie: pcie@1e140000 {
+ 		compatible = "mediatek,mt7621-pci";
+ 		reg = <0x1e140000 0x100>, /* host-pci bridge registers */
+diff --git a/target/linux/ramips/dts/mt7621_c-life_xg1.dts b/target/linux/ramips/dts/mt7621_c-life_xg1.dts
+new file mode 100644
+index 0000000000000..b3744ff989c06
+--- /dev/null
++++ b/target/linux/ramips/dts/mt7621_c-life_xg1.dts
+@@ -0,0 +1,160 @@
++// 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 = "c-life,xg1", "mediatek,mt7621-soc";
++	model = "C-Life XG1";
++
++	aliases {
++		led-boot = &led_status_red;
++		led-failsafe = &led_status_red;
++		led-running = &led_status_blue;
++		led-upgrade = &led_status_blue;
++		label-mac-device = &gmac0;
++	};
++
++	chosen {
++		bootargs = "console=ttyS0,115200";
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		led_status_red: status_red {
++			label = "red:status";
++			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
++		};
++
++		led_status_blue: status_blue {
++			label = "blue:status";
++			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	keys {
++		compatible = "gpio-keys";
++
++		reset {
++			label = "reset";
++			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_RESTART>;
++		};
++
++		wps {
++			label = "wps";
++			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_WPS_BUTTON>;
++		};
++	};
++};
++
++&nand {
++	status = "okay";
++
++	partitions {
++		compatible = "fixed-partitions";
++		#address-cells = <1>;
++		#size-cells = <1>;
++
++		partition@0 {
++			label = "Bootloader";
++			reg = <0x0 0x80000>;
++		};
++
++		partition@80000 {
++			label = "Nvram";
++			reg = <0x80000 0x40000>;
++			read-only;
++		};
++
++		partition@c0000 {
++			label = "Bdata";
++			reg = <0xc0000 0x40000>;
++			read-only;
++		};
++
++		factory: partition@100000 {
++			label = "Factory";
++			reg = <0x100000 0x80000>;
++			read-only;
++		};
++
++		partition@180000 {
++			label = "crash";
++			reg = <0x180000 0x40000>;
++			read-only;
++		};
++
++		partition@1c0000 {
++			label = "crash_log";
++			reg = <0x1c0000 0x40000>;
++			read-only;
++		};
++
++		partition@200000 {
++			label = "kernel";
++			reg = <0x200000 0x400000>;
++		};
++
++		partition@600000 {
++			label = "ubi";
++			reg = <0x600000 0x7980000>;
++		};
++	};
++};
++
++&pcie {
++	status = "okay";
++};
++
++&pcie1 {
++	wifi@0,0 {
++		compatible = "mediatek,mt76";
++		reg = <0x0000 0 0 0 0>;
++		mediatek,mtd-eeprom = <&factory 0x0>;
++	};
++};
++
++&gmac0 {
++	mtd-mac-address = <&factory 0x04>;
++};
++
++&gmac1 {
++	mtd-mac-address = <&factory 0x0a>;
++	phy-mode = "rgmii";
++	status = "okay";
++
++	fixed-link {
++		speed = <1000>;
++		full-duplex;
++		pause;
++	};
++};
++
++&gsw {
++	mediatek,portmap = "llllw";
++	status = "okay";
++};
++
++&hnat {
++	mtketh-wan = "eth1";
++	mtketh-ppd = "eth0";
++	mtketh-lan = "eth0";
++	mtketh-max-gmac = <2>;
++	/delete-property/ mtkdsa-wan-port;
++};
++
++&switch0 {
++	status = "disabled";
++};
++
++&state_default {
++	gpio {
++		groups = "jtag", "wdt";
++		function = "gpio";
++	};
++};
+diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
+index e2402fc9701e2..efc1d0515b45d 100644
+--- a/target/linux/ramips/image/mt7621.mk
++++ b/target/linux/ramips/image/mt7621.mk
+@@ -582,6 +582,23 @@
+ endef
+ TARGET_DEVICES += cudy_m1800
+ 
++define Device/c-life_xg1
++  $(Device/dsa-migration)
++  BLOCKSIZE := 128k
++  PAGESIZE := 2048
++  UBINIZE_OPTS := -E 5
++  KERNEL_SIZE := 4096k
++  IMAGE_SIZE := 91136k
++  IMAGES += factory.bin
++  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
++  IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
++	check-size
++  DEVICE_VENDOR := C-Life
++  DEVICE_MODEL := XG1
++  DEVICE_PACKAGES := kmod-mt7915-firmware uboot-envtools kmod-usb3
++endef
++TARGET_DEVICES += c-life_xg1
++
+ define Device/cudy_wr1300-v1
+   $(Device/dsa-migration)
+   IMAGE_SIZE := 15872k
+diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+index 250210a473211..83623652e99a9 100644
+--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
++++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+@@ -198,6 +198,11 @@ ramips_setup_macs()
+ 		lan_mac=$wan_mac
+ 		label_mac=$wan_mac
+ 		;;
++	c-life,xg1)
++		base_mac=$(cat /sys/class/net/eth0/address)
++		lan_mac=$(macaddr_add "$base_mac" -1)
++		wan_mac=$(macaddr_add "$lan_mac" -1)
++		;;
+ 	dlink,dir-860l-b1)
+ 		lan_mac=$(mtd_get_mac_ascii factory lanmac)
+ 		wan_mac=$(mtd_get_mac_ascii factory wanmac)
+diff --git a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+index bb66c1e6a2d80..937986230e4f1 100644
+--- a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
++++ b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+@@ -33,6 +33,12 @@
+ 		[ "$PHYNBR" = "1" ] && \
+ 		macaddr_setbit_la "$(macaddr_add $hw_mac_addr 0x100000)" > /sys${DEVPATH}/macaddress
+ 		;;
++	c-life,xg1)
++		if [ "$PHYNBR" = "1" ]; then
++			base_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x4)" 1)
++			macaddr_setbit_la "$base_mac" > /sys${DEVPATH}/macaddress
++		fi
++		;;
+ 	dlink,dap-1620-b1|\
+ 	dlink,dir-853-a1)
+ 		lan_mac_addr="$(mtd_get_mac_binary factory 0xe000)"
+diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+index af9dc9ca9a1eb..427c39c0675ff 100755
+--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+@@ -63,6 +63,7 @@
+ 	beeline,smartbox-turbo|\
+ 	beeline,smartbox-turbo-plus|\
+ 	belkin,rt1800|\
++	c-life,xg1|\
+ 	dlink,dap-x1860-a1|\
+ 	dlink,dir-1960-a1|\
+ 	dlink,dir-2640-a1|\
+

devices/ramips_mt7621/patches/ht-jsh_0211.patch

@@ -0,0 +1,172 @@
+From e56218bff2d67efe4192f7b8d87525b101861194 Mon Sep 17 00:00:00 2001
+From: AmadeusGhost <[email protected]>
+Date: Fri, 2 Jun 2023 23:03:25 +0800
+Subject: [PATCH] ramips: add HT-JSH-0211 support
+
+Replace the boot loader to the breed of K2P.
+---
+ target/linux/ramips/Makefile                  |   2 +-
+ .../linux/ramips/dts/mt7621_ht-jsh_0211.dts   | 105 ++++++++++++++++++
+ target/linux/ramips/image/mt7621.mk           |   9 ++
+ .../mt7621/base-files/etc/board.d/02_network  |   4 +
+ 4 files changed, 119 insertions(+), 1 deletion(-)
+ create mode 100644 target/linux/ramips/dts/mt7621_ht-jsh_0211.dts
+
+diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
+index 3053906f68496..b336489f4da00 100644
+--- a/target/linux/ramips/Makefile
++++ b/target/linux/ramips/Makefile
+@@ -18,6 +18,6 @@ define Target/Description
+ endef
+ 
+ include $(INCLUDE_DIR)/target.mk
+-DEFAULT_PACKAGES += kmod-leds-gpio kmod-gpio-button-hotplug
++DEFAULT_PACKAGES += kmod-leds-gpio kmod-gpio-button-hotplug -procd-ujail
+ 
+ $(eval $(call BuildTarget))
+diff --git a/target/linux/ramips/dts/mt7621_ht-jsh_0211.dts b/target/linux/ramips/dts/mt7621_ht-jsh_0211.dts
+new file mode 100644
+index 0000000000000..fa4d209e80e20
+--- /dev/null
++++ b/target/linux/ramips/dts/mt7621_ht-jsh_0211.dts
+@@ -0,0 +1,105 @@
++// SPDX-License-Identifier: GPL-2.0-only
++
++#include "mt7621.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++
++/ {
++	compatible = "ht-jsh,0211", "mediatek,mt7621-soc";
++	model = "HT-JSH-0211";
++
++	keys {
++		compatible = "gpio-keys";
++
++		reset {
++			label = "reset";
++			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_RESTART>;
++		};
++	};
++};
++
++&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 = "Bootloader";
++				reg = <0x0 0x30000>;
++				read-only;
++			};
++
++			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 0xfb0000>;
++			};
++		};
++	};
++};
++
++&pcie {
++	status = "okay";
++};
++
++&pcie0 {
++	mt76@0,0 {
++		reg = <0x0000 0 0 0 0>;
++		mediatek,mtd-eeprom = <&factory 0x0>;
++	};
++};
++
++&gmac0 {
++	mtd-mac-address = <&factory 0xe000>;
++};
++
++&gmac1 {
++	mtd-mac-address = <&factory 0xe006>;
++	status = "okay";
++};
++
++&gsw {
++	mediatek,portmap = "wllll";
++	status = "okay";
++};
++
++&hnat {
++	mtketh-wan = "eth1";
++	mtketh-ppd = "eth0";
++	mtketh-lan = "eth0";
++	mtketh-max-gmac = <2>;
++	/delete-property/ mtkdsa-wan-port;
++};
++
++&switch0 {
++	status = "disabled";
++};
++
++&state_default {
++	gpio {
++		groups = "i2c";
++		function = "gpio";
++	};
++};
+diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
+index 1908f60bc37bc..bc6a3ac05ae3a 100644
+--- a/target/linux/ramips/image/mt7621.mk
++++ b/target/linux/ramips/image/mt7621.mk
+@@ -802,6 +802,15 @@ define Device/hiwifi_hc5962
+ endef
+ TARGET_DEVICES += hiwifi_hc5962
+ 
++define Device/ht-jsh_0211
++  $(Device/dsa-migration)
++  IMAGE_SIZE := 16064k
++  DEVICE_VENDOR := HT-JSH
++  DEVICE_MODEL := 0211
++  DEVICE_PACKAGES := kmod-mt7603
++endef
++TARGET_DEVICES += ht-jsh_0211
++
+ define Device/iodata_wn-ax1167gr
+   $(Device/dsa-migration)
+   $(Device/uimage-lzma-loader)
+diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+index 37037c666d980..816e7c3dd2f4b 100644
+--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
++++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+@@ -65,6 +65,10 @@ ramips_setup_interfaces()
+ 	hatlab,gateboard-one)
+ 		ucidef_set_interfaces_lan_wan "eth0 eth1 eth2 eth3 eth4" "eth5"
+ 		;;
++	ht-jsh,0211)
++		ucidef_add_switch "switch0" \
++			"0:wan" "2:lan" "3:lan" "6u@eth0" "5u@eth1"
++		;;
+ 	linksys,re6500|\
+ 	netgear,wac104)
+ 		ucidef_set_interface_lan "lan1 lan2 lan3 lan4"

devices/rockchip_rk3588_bsp/.config

@@ -4,6 +4,7 @@ CONFIG_TARGET_rockchip_rk3588_bsp=y
 CONFIG_TARGET_MULTI_PROFILE=y
 
 CONFIG_TARGET_DEVICE_rockchip_rk3588_bsp_DEVICE_friendlyelec_nanopi-r6c=y
+CONFIG_TARGET_DEVICE_rockchip_rk3588_bsp_DEVICE_friendlyelec_nanopi-r6c-plus=y
 CONFIG_TARGET_DEVICE_rockchip_rk3588_bsp_DEVICE_friendlyelec_nanopi-r6s=y
 CONFIG_TARGET_DEVICE_rockchip_rk3588_bsp_DEVICE_friendlyelec_nanopc-t6=y
 CONFIG_TARGET_DEVICE_rockchip_rk3588_bsp_DEVICE_xunlong_orangepi-5=y
@@ -13,18 +14,6 @@ CONFIG_PACKAGE_kmod-rtl8821cu=m
 CONFIG_PACKAGE_kmod-rtl88x2bu=m
 CONFIG_PACKAGE_kmod-pcie_mhi=m
 
-CONFIG_PACKAGE_kmod-dax=n
-CONFIG_PACKAGE_kmod-dm=n
-CONFIG_PACKAGE_kmod-dm-raid=n
-
-CONFIG_PACKAGE_kmod-owl-loader=n
-CONFIG_PACKAGE_kmod-ath9k=n
-CONFIG_PACKAGE_kmod-ath9k-htc=n
-CONFIG_PACKAGE_kmod-ramoops=n
-CONFIG_PACKAGE_kmod-pstore=n
-
-# CONFIG_PACKAGE_iptables-mod-conntrack-extra=n
-
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 

devices/rockchip_rk3588_bsp/diy.sh

@@ -11,21 +11,19 @@ sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-drm-rockchip/
 
 echo '
 CONFIG_SENSORS_PWM_FAN=y
-' >> ./target/linux/rockchip/armv8/config-5.10
+' >> ./target/linux/rockchip/armv8/config-6.1
 
 sed -i "/KernelPackage,ptp/d" package/kernel/linux/modules/other.mk
 
-rm -rf package/devel/perf package/feeds/kiddin9/{shortcut-fe,oaf,fast-classifier,rtl8821cu,rtl88x2bu} package/kernel/rtl8812au-ct package/kernel/ath10k-ct package/feeds/routing/batman-adv
-
-sed -i "/KernelPackage,dma-buf/d" package/kernel/linux/modules/other.mk
+rm -rf feeds/kiddin9/{quectel_MHI,shortcut-fe,quectel_Gobinet,rtl88*}
 
 sed -i "/friendlyelec/d" package/feeds/kiddin9/base-files/files/lib/preinit/02_sysinfo
 
-sed -i "s/ath11k ath11k-ahb ath11k-pci //" package/kernel/mac80211/ath.mk
-
 mv -f target/linux/rockchip/image/armv8.mk target/linux/rockchip/image/rk3588_bsp.mk
 
 mv -f target/linux/rockchip/armv8 target/linux/rockchip/rk3588_bsp
 
+sed -i "s/BUILD_SUBTARGET:=armv8/BUILD_SUBTARGET:=rk3588_bsp/" package/boot/uboot-rockchip/Makefile
+
 #curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
 

devices/rockchip_rk3588_bsp/feeds.conf

@@ -1,4 +0,0 @@
-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
-src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-23.05
-src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master

devices/rockchip_rk3588_bsp/patches/fix.patch

@@ -5,7 +5,7 @@
      CATEGORY:=Boot Loaders
      TITLE:=ARM Trusted Firmware for Rockchip
 -    DEPENDS:=@TARGET_rockchip_armv8
-+    DEPENDS:=@TARGET_rockchip_armv8_bsp
++    DEPENDS:=@TARGET_rockchip_rk3588_bsp
  endef
  
  define Build/Prepare
@@ -26,32 +26,3 @@ index 000000000..ddfa7f575
 + 
 + ifdef CONFIG_UNWINDER_ORC
 + ifeq ($(ARCH),x86_64)
-
---- a/package/kernel/linux/modules/netfilter.mk
-+++ b/package/kernel/linux/modules/netfilter.mk
-@@ -39,6 +39,17 @@ endef
- 
- $(eval $(call KernelPackage,nf-reject6))
- 
-+define KernelPackage/nf-conncount
-+  SUBMENU:=$(NF_MENU)
-+  TITLE:=Netfilter conncount support
-+  KCONFIG:=$(KCONFIG_NF_CONNCOUNT)
-+  HIDDEN:=1
-+  DEPENDS:=+kmod-nf-conntrack
-+  FILES:=$(foreach mod,$(NF_CONNCOUNT-m),$(LINUX_DIR)/net/$(mod).ko)
-+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNCOUNT-m)))
-+endef
-+
-+$(eval $(call KernelPackage,nf-conncount))
- 
- define KernelPackage/nf-ipt
-   SUBMENU:=$(NF_MENU)
-@@ -236,6 +247,7 @@ $(eval $(call KernelPackage,ipt-conntrack))
- 
- define KernelPackage/ipt-conntrack-extra
-   TITLE:=Extra connection tracking modules
-+  DEPENDS:=+kmod-nf-conncount
-   KCONFIG:=$(KCONFIG_IPT_CONNTRACK_EXTRA)
-   FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
-   AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CONNTRACK_EXTRA-m)))

devices/rockchip_rk3588_bsp/settings.ini

@@ -1,2 +1,2 @@
 REPO_URL="https://github.com/mj22226/openwrt"
-REPO_BRANCH="rk3588-bsp"
+REPO_BRANCH="linux-6.1"