update

.github/workflows/repo-dispatcher.yml

@@ -102,7 +102,7 @@ jobs:
           -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": "armvirt_64 ${{ github.event.inputs.param }}", "client_payload": {"target": "armvirt_64"}}'
+          -d '{"event_type": "armsr_armv8 ${{ github.event.inputs.param }}", "client_payload": {"target": "armsr_armv8"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \

devices/armvirt_64/.config → devices/armsr_armv8/.config

@@ -1,6 +1,8 @@
-CONFIG_TARGET_armvirt=y
-CONFIG_TARGET_armvirt_64=y
-CONFIG_TARGET_armvirt_64_DEVICE_box=y
+CONFIG_TARGET_armsr=y
+CONFIG_TARGET_armsr_armv8=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_armsr_armv8_DEVICE_generic=y
+CONFIG_TARGET_DEVICE_armsr_armv8_DEVICE_box=y
 CONFIG_PACKAGE_kmod-brcmfmac=y
 CONFIG_BRCMFMAC_SDIO=y
 CONFIG_TARGET_ROOTFS_TARGZ=y

devices/armvirt_64/diy.sh → devices/armsr_armv8/diy.sh

@@ -4,6 +4,6 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += -luci-app-attendedsysupgrade -luci-app-gpsysupgrade/' target/linux/armvirt/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += -luci-app-attendedsysupgrade -luci-app-gpsysupgrade/' target/linux/armsr/Makefile
 
 

devices/armvirt_64/patches/rootfs.patch → devices/armsr_armv8/patches/rootfs.patch

@@ -12,11 +12,11 @@
    $(call Device/$(if $(DUMP),Dump,Build),$(1))
  
 
---- a/target/linux/armvirt/image/Makefile
-+++ b/target/linux/armvirt/image/Makefile
-@@ -23,10 +23,30 @@ endef
- 
- $(eval $(call Image/gzip-ext4-padded-squashfs))
+--- a/target/linux/armsr/image/Makefile
++++ b/target/linux/armsr/image/Makefile
+@@ -115,4 +115,21 @@ define Device/generic
+ endef
+ TARGET_DEVICES += generic
  
 +define Device/box
 +  DEVICE_VENDOR := 
@@ -25,16 +25,7 @@
 +endef
 +TARGET_DEVICES += box
 +
-+define Device/armvirt
-+  DEVICE_MODEL := QEMU ARM virt machine
-+  DEVICE_PACKAGES :=
-+endef
-+TARGET_DEVICES += armvirt
-+
- define Image/Build
- 	$(call Image/Build/$(1))
- 	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_ROOTFS)-$(1).img
- 	$(call Image/Build/gzip/$(1))
++ define Image/Build
 +	if [ "$(PROFILE_SANITIZED)" == "box" ]; then \
 +	export BIN_DIR=$(BIN_DIR); \
 +	export DATE=$(DATE); \
@@ -42,6 +33,6 @@
 +	. ../modify_amlogic.sh; \
 +	./make -k 5.15.100 -b $(MORE) -s $(shell echo $$(($(ROOTFS_PARTSIZE)/1024/1024))) || true; \
 +	fi
- endef
- 
++ endef
++
  $(eval $(call BuildImage))

devices/common/diy.sh

@@ -48,7 +48,7 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linu
 sed -i "s/CONFIG_WERROR=y/CONFIG_WERROR=n/" target/linux/generic/config-5.15
 ) &
 
-grep -q "23.05" include/version.mk && {
+grep -q "23.05" include/version.mk && [ -d package/kernel/mt76 ] && {
 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
 } || rm -rf devices/common/patches/mt7922.patch

devices/ipq60xx_generic/diy.sh

@@ -23,7 +23,7 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/openwrt-gl-ax1800/maste
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/openwrt-gl-ax1800/master/include/quilt.mk -o include/quilt.mk
 
 rm -rf toolchain/.svn
-rm -rf feeds/kiddin9/{rtl*,fullconenat-nft,shortcut-fe,netifd} package/kernel/mt76 toolchain/musl package/feeds/packages/{xtables-addons,openvswitch} package/libs/elfutils package/utils/util-linux package/feeds/luci/ucode-mod-html package/libs/openssl package/network/utils/iptables package/feeds/packages/v4l2loopback package/feeds/packages/jool package/network/utils/uqmi
+rm -rf feeds/kiddin9/{rtl*,fullconenat-nft,shortcut-fe,netifd} package/kernel/mt76 toolchain/musl package/feeds/packages/{xtables-addons,openvswitch} package/libs/elfutils package/utils/util-linux package/feeds/luci/ucode-mod-html package/libs/openssl package/network/utils/iptables package/feeds/packages/v4l2loopback package/feeds/packages/jool package/network/utils/uqmi devices/common/patches/mt7922.patch
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/glibc toolchain/glibc
 svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/package/libs/elfutils package/libs/elfutils

devices/ipq60xx_generic/patches/fix.patch

@@ -18,24 +18,12 @@
 
 --- a/include/image.mk
 +++ b/include/image.mk
-@@ -152,21 +152,6 @@ ifdef CONFIG_TARGET_IMAGES_GZIP
-   endef
- endif
+@@ -159,9 +159,6 @@ DTC_WARN_FLAGS := \
+   -Wno-graph_port \
+   -Wno-unique_unit_address
  
--
--# Disable noisy checks by default as in upstream
--DTC_FLAGS += \
--  -Wno-unit_address_vs_reg \
--  -Wno-simple_bus_reg \
--  -Wno-unit_address_format \
--  -Wno-pci_bridge \
--  -Wno-pci_device_bus_num \
--  -Wno-pci_device_reg \
--  -Wno-avoid_unnecessary_addr_size \
--  -Wno-alias_paths \
--  -Wno-graph_child_address \
--  -Wno-graph_port \
--  -Wno-unique_unit_address
+-DTC_FLAGS += $(DTC_WARN_FLAGS)
+-DTCO_FLAGS += $(DTC_WARN_FLAGS)
 -
  define Image/pad-to
  	dd if=$(1) of=$(1).new bs=$(2) conv=sync
@@ -97,18 +85,6 @@
  	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]>
-
 --- a/target/linux/ipq60xx/image/Makefile
 +++ b/target/linux/ipq60xx/image/Makefile
 @@ -104,7 +104,7 @@ define Device/qihoo_v6
@@ -138,4 +114,4 @@
 +
 +&usb3 {
 +status = "ok";
-+};
++};

devices/ipq806x_generic/.config

@@ -12,6 +12,7 @@ CONFIG_TARGET_DEVICE_ipq806x_generic_DEVICE_netgear_xr500=y
 CONFIG_TARGET_DEVICE_ipq806x_generic_DEVICE_tplink_ad7200=y
 CONFIG_TARGET_DEVICE_ipq806x_generic_DEVICE_tplink_c2600=y
 CONFIG_TARGET_DEVICE_ipq806x_generic_DEVICE_tplink_vr2600v=y
+CONFIG_TARGET_DEVICE_ipq806x_generic_DEVICE_buffalo_wxr-2533dhp=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 

devices/ipq807x_generic/diy.sh

@@ -5,8 +5,10 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 svn co https://github.com/robimarko/nss-packages/trunk/qca/qca-ssdk-shell package/network/utils/qca-ssdk-shell
 
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += qca-ssdk-shell/' target/linux/ipq807x/Makefile
+
 sh -c "curl -sfL https://github.com/robimarko/openwrt/commit/23fa931934151f72c1655ffa62ff1a979575f07e.patch | patch -d './' -p1 --forward"
 
 sed -i '/rm -rf $(KDIR)\/tmp/d' include/image.mk
 
-rm -rf feeds/kiddin9/{rtl8821cu,rtl88x2bu} package/kernel/mt76
+rm -rf feeds/kiddin9/{rtl8821cu,rtl88x2bu} package/kernel/mt76 devices/common/patches/mt7922.patch

devices/ipq807x_generic/patches/01-zte_mf269.bin.patch

@@ -578,11 +578,10 @@ index 00000000000..be76ddf12e4
 
 --- a/target/linux/ipq807x/image/generic.mk
 +++ b/target/linux/ipq807x/image/generic.mk
-@@ -147,6 +147,19 @@
- endif
+@@ -162,6 +162,19 @@ endif
  endef
  TARGET_DEVICES += xiaomi_ax9000
-+
+ 
 +define Device/zte_mf269
 +	$(call Device/FitImage)
 +	$(call Device/UbiFit)
@@ -595,6 +594,7 @@ index 00000000000..be76ddf12e4
 +	DEVICE_PACKAGES := ipq-wifi-zte_mf269
 +endef
 +TARGET_DEVICES += zte_mf269
- 
++
  define Device/zyxel_nbg7815
  	$(call Device/FitImage)
+ 	$(call Device/EmmcImage)

devices/ipq807x_generic/patches/04-stock.patch

@@ -1,54 +1,30 @@
---- a/target/linux/ipq807x/Makefile
-+++ b/target/linux/ipq807x/Makefile
-@@ -12,10 +12,9 @@ KERNEL_PATCHVER:=5.15
- 
- include $(INCLUDE_DIR)/target.mk
- DEFAULT_PACKAGES += \
--	kmod-usb3 kmod-usb-dwc3 kmod-usb-dwc3-qcom \
- 	kmod-leds-gpio kmod-gpio-button-hotplug \
- 	kmod-phy-aquantia kmod-qca-nss-dp \
- 	ath11k-firmware-ipq8074 kmod-ath11k-ahb \
--	wpad-basic-mbedtls uboot-envtools
-+	wpad-basic-mbedtls uboot-envtools qca-ssdk-shell
- 
- $(eval $(call BuildTarget))
-
 --- a/target/linux/ipq807x/image/generic.mk
 +++ b/target/linux/ipq807x/image/generic.mk
-@@ -68,7 +68,7 @@ define Device/qnap_301w
- 	IMAGES += factory.bin sysupgrade.bin
- 	IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 64k
- 	IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to 64k | sysupgrade-tar rootfs=$$$$@ | append-metadata
--	DEVICE_PACKAGES := ipq-wifi-qnap_301w e2fsprogs kmod-fs-ext4 losetup
-+	DEVICE_PACKAGES := ipq-wifi-qnap_301w e2fsprogs kmod-fs-ext4 losetup kmod-usb3 kmod-usb-dwc3 kmod-usb-dwc3-qcom
- endef
- TARGET_DEVICES += qnap_301w
- 
-@@ -89,12 +89,7 @@ define Device/xiaomi_ax3600
+@@ -134,12 +134,7 @@ define Device/xiaomi_ax3600
  	PAGESIZE := 2048
  	DEVICE_DTS_CONFIG := config@ac04
  	SOC := ipq8071
 -	KERNEL_SIZE := 36608k
- 	DEVICE_PACKAGES := ipq-wifi-xiaomi_ax3600 kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct
+-	DEVICE_PACKAGES := ipq-wifi-xiaomi_ax3600 kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct
 -ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
 -	ARTIFACTS := initramfs-factory.ubi
 -	ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-uImage.itb | ubinize-kernel
 -endif
++	DEVICE_PACKAGES := ipq-wifi-xiaomi_ax3600 kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct -kmod-usb3 -kmod-usb-dwc3 -kmod-usb-dwc3-qcom
  endef
  TARGET_DEVICES += xiaomi_ax3600
  
-@@ -107,13 +102,8 @@ define Device/xiaomi_ax9000
+@@ -152,13 +147,8 @@ define Device/xiaomi_ax9000
  	PAGESIZE := 2048
  	DEVICE_DTS_CONFIG := config@hk14
  	SOC := ipq8072
 -	KERNEL_SIZE := 57344k
  	DEVICE_PACKAGES := ipq-wifi-xiaomi_ax9000 kmod-ath11k-pci ath11k-firmware-qcn9074 \
--	kmod-ath10k-ct ath10k-firmware-qca9887-ct
+ 	kmod-ath10k-ct ath10k-firmware-qca9887-ct
 -ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
 -	ARTIFACTS := initramfs-factory.ubi
 -	ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-uImage.itb | ubinize-kernel
 -endif
-+	kmod-ath10k-ct ath10k-firmware-qca9887-ct kmod-usb3 kmod-usb-dwc3 kmod-usb-dwc3-qcom
  endef
  TARGET_DEVICES += xiaomi_ax9000
  

devices/mediatek_filogic/.config

@@ -9,4 +9,6 @@ CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_tplink_tl-xdr6086=y
 CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_tplink_tl-xdr6088=y
 CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_glinet_gl-mt3000=y
 CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_h3c_magic-nx30-pro=y
+CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_xiaomi_mi-router-wr30u-112m=y
+CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_xiaomi_redmi-router-ax6000-ubootmod=y
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务

devices/mediatek_filogic/patches/ax6000.patch

@@ -0,0 +1,145 @@
+--- a/target/linux/mediatek/image/filogic.mk
++++ b/target/linux/mediatek/image/filogic.mk
+@@ -351,29 +351,18 @@ TARGET_DEVICES += xiaomi_redmi-router-ax6000-stock
+ 
+ define Device/xiaomi_redmi-router-ax6000-ubootmod
+   DEVICE_VENDOR := Xiaomi
+-  DEVICE_MODEL := Redmi Router AX6000 (OpenWrt U-Boot layout)
++  DEVICE_MODEL := Redmi Router AX6000 (不死U-Boot)
+   DEVICE_DTS := mt7986a-xiaomi-redmi-router-ax6000-ubootmod
+   DEVICE_DTS_DIR := ../dts
+   DEVICE_PACKAGES := kmod-leds-ws2812b kmod-mt7986-firmware mt7986-wo-firmware
+-  KERNEL_INITRAMFS_SUFFIX := -recovery.itb
+-  IMAGES := sysupgrade.itb
+   UBINIZE_OPTS := -E 5
+   BLOCKSIZE := 128k
+   PAGESIZE := 2048
++  IMAGE_SIZE := 112640k
+   KERNEL_IN_UBI := 1
+-  UBOOTENV_IN_UBI := 1
+-  KERNEL := kernel-bin | gzip
+-  KERNEL_INITRAMFS := kernel-bin | lzma | \
+-        fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
+-  IMAGE/sysupgrade.itb := append-kernel | \
+-        fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata
+-  ARTIFACTS := preloader.bin bl31-uboot.fip
+-  ARTIFACT/preloader.bin := mt7986-bl2 spim-nand-ddr4
+-  ARTIFACT/bl31-uboot.fip := mt7986-bl31-uboot xiaomi_redmi-router-ax6000
+-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+-  ARTIFACTS += initramfs-factory.ubi
+-  ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-recovery.itb | ubinize-kernel
+-endif
++  IMAGES += factory.bin
++  IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
++  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+ endef
+ TARGET_DEVICES += xiaomi_redmi-router-ax6000-ubootmod
+ 
+
+--- a/package/boot/uboot-envtools/files/mediatek_filogic
++++ b/package/boot/uboot-envtools/files/mediatek_filogic
+@@ -54,8 +54,7 @@ xiaomi,redmi-router-ax6000-stock)
+ qihoo,360t7|\
+ tplink,tl-xdr4288|\
+ tplink,tl-xdr6086|\
+-tplink,tl-xdr6088|\
+-xiaomi,redmi-router-ax6000-ubootmod)
++tplink,tl-xdr6088)
+ 	. /lib/upgrade/nand.sh
+ 	local envubi=$(nand_find_ubi ubi)
+ 	local envdev=/dev/$(nand_find_volume $envubi ubootenv)
+
+--- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000-ubootmod.dts
++++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000-ubootmod.dts
+@@ -4,13 +4,86 @@
+ #include "mt7986a-xiaomi-redmi-router-ax6000.dtsi"
+ 
+ / {
+-	model = "Xiaomi Redmi Router AX6000 (OpenWrt U-Boot layout)";
++	model = "Xiaomi Redmi Router AX6000 (不死U-Boot)";
+ 	compatible = "xiaomi,redmi-router-ax6000-ubootmod", "mediatek,mt7986a";
+ };
+ 
+-&partitions {
+-	partition@580000 {
+-		label = "ubi";
+-		reg = <0x580000 0x7a80000>;
++&spi0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&spi_flash_pins>;
++	cs-gpios = <0>, <0>;
++	status = "okay";
++
++	spi_nand: spi_nand@1 {
++		#address-cells = <1>;
++		#size-cells = <1>;
++		compatible = "spi-nand";
++		reg = <1>;
++		spi-max-frequency = <52000000>;
++		spi-tx-buswidth = <4>;
++		spi-rx-buswidth = <4>;
++		spi-cal-enable;
++		spi-cal-mode = "read-data";
++		spi-cal-datalen = <7>;
++		spi-cal-data = /bits/ 8 <0x53 0x50 0x49 0x4E 0x41 0x4E 0x44>; /* 'SPINAND' */
++		spi-cal-addrlen = <5>;
++		spi-cal-addr = /bits/ 32 <0x0 0x0 0x0 0x0 0x0>;
++	};
++};
++
++/ {
++	nmbm_spim_nand {
++		compatible = "generic,nmbm";
++		#address-cells = <1>;
++		#size-cells = <1>;
++
++		lower-mtd-device = <&spi_nand>;
++		forced-create;
++
++		partitions {
++			compatible = "fixed-partitions";
++			#address-cells = <0x01>;
++			#size-cells = <0x01>;
++
++			partition@0 {
++				label = "BL2";
++				reg = <0x00 0x100000>;
++			};
++
++			partition@100000 {
++				label = "Nvram";
++				reg = <0x100000 0x40000>;
++			};
++
++			partition@140000 {
++				label = "Bdata";
++				reg = <0x140000 0x40000>;
++			};
++
++			partition@180000 {
++				label = "Factory";
++				reg = <0x180000 0x200000>;
++			};
++
++			partition@380000 {
++				label = "FIP";
++				reg = <0x380000 0x200000>;
++			};
++
++			partition@580000 {
++				label = "crash";
++				reg = <0x580000 0x40000>;
++			};
++
++			partition@5c0000 {
++				label = "crash_log";
++				reg = <0x5c0000 0x40000>;
++			};
++
++			partition@600000 {
++				label = "ubi";
++				reg = <0x600000 0x6e00000>;
++			};
++		};
+ 	};
+ };

devices/mediatek_mt7981/.config

@@ -7,7 +7,6 @@ CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_glinet_gl-x3000=y
 CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_glinet_gl-xe3000=y
 CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_mt7981-360-t7-108M=y
 CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_livinet_zr-3020=y
-CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_xiaomi_mi-router-wr30u=y
 CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_xiaomi_mi-router-wr30u-112m=y
 
 CONFIG_VERSION_DIST="OpenWrt"

devices/mediatek_mt7986/.config

@@ -1,127 +0,0 @@
-
-CONFIG_TARGET_mediatek=y
-CONFIG_TARGET_mediatek_mt7986=y
-CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_xiaomi_redmi-router-ax6000=y
-CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_xiaomi_redmi-router-ax6000-stock=y
-
-
-CONFIG_VERSION_DIST="OpenWrt"
-CONFIG_PACKAGE_kmod-nft-fullcone=n
-CONFIG_PACKAGE_kmod-ax25=n
-CONFIG_PACKAGE_kmod-fast-classifier=n
-CONFIG_PACKAGE_kmod-shortcut-fe=n
-CONFIG_PACKAGE_kmod-shortcut-fe-cm=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_MTK_ACK_CTS_TIMEOUT_SUPPORT=y
-CONFIG_MTK_AIR_MONITOR=y
-CONFIG_MTK_AMPDU_CONF_SUPPORT=y
-CONFIG_MTK_ANTENNA_CONTROL_SUPPORT=y
-CONFIG_MTK_APCLI_SUPPORT=y
-CONFIG_MTK_ATE_SUPPORT=y
-CONFIG_MTK_BACKGROUND_SCAN_SUPPORT=y
-CONFIG_MTK_CAL_BIN_FILE_SUPPORT=y
-CONFIG_MTK_CFG_SUPPORT_FALCON_MURU=y
-CONFIG_MTK_CFG_SUPPORT_FALCON_PP=y
-CONFIG_MTK_CFG_SUPPORT_FALCON_SR=y
-CONFIG_MTK_CFG_SUPPORT_FALCON_TXCMD_DBG=y
-CONFIG_MTK_CHIP_MT7986=y
-CONFIG_MTK_CONNINFRA_APSOC=y
-CONFIG_MTK_CONNINFRA_APSOC_MT7986=y
-CONFIG_MTK_CON_WPS_SUPPORT=y
-CONFIG_MTK_DBDC_MODE=y
-CONFIG_MTK_DOT11K_RRM_SUPPORT=y
-CONFIG_MTK_DOT11R_FT_SUPPORT=y
-CONFIG_MTK_DOT11W_PMF_SUPPORT=y
-CONFIG_MTK_DOT11_HE_AX=y
-CONFIG_MTK_DOT11_N_SUPPORT=y
-CONFIG_MTK_DOT11_VHT_AC=y
-CONFIG_MTK_FAST_NAT_SUPPORT=y
-CONFIG_MTK_FIRST_IF_EEPROM_FLASH=y
-CONFIG_MTK_FIRST_IF_IPAILNA=y
-CONFIG_MTK_FIRST_IF_MT7986=y
-CONFIG_MTK_GREENAP_SUPPORT=y
-CONFIG_MTK_G_BAND_256QAM_SUPPORT=y
-CONFIG_MTK_HDR_TRANS_RX_SUPPORT=y
-CONFIG_MTK_HDR_TRANS_TX_SUPPORT=y
-CONFIG_MTK_ICAP_SUPPORT=y
-CONFIG_MTK_IGMP_SNOOP_SUPPORT=y
-CONFIG_MTK_INTERWORKING=y
-CONFIG_MTK_MAP_R2_VER_SUPPORT=y
-CONFIG_MTK_MAP_R3_VER_SUPPORT=y
-CONFIG_MTK_MAP_SUPPORT=y
-CONFIG_MTK_MBSS_DTIM_SUPPORT=y
-CONFIG_MTK_MBSS_SUPPORT=y
-CONFIG_MTK_MCAST_RATE_SPECIFIC=y
-CONFIG_MTK_MEMORY_SHRINK=y
-CONFIG_MTK_MGMT_TXPWR_CTRL=y
-CONFIG_MTK_MLME_MULTI_QUEUE_SUPPORT=y
-CONFIG_MTK_MT_AP_SUPPORT=m
-CONFIG_MTK_MT_DFS_SUPPORT=y
-CONFIG_MTK_MT_MAC=y
-CONFIG_MTK_MT_WIFI=m
-CONFIG_MTK_MT_WIFI_PATH="mt_wifi"
-CONFIG_MTK_MUMIMO_SUPPORT=y
-CONFIG_MTK_MU_RA_SUPPORT=y
-CONFIG_MTK_OFFCHANNEL_SCAN_FEATURE=y
-CONFIG_MTK_OWE_SUPPORT=y
-CONFIG_MTK_QOS_R1_SUPPORT=y
-CONFIG_MTK_RA_PHY_RATE_SUPPORT=y
-CONFIG_MTK_RED_SUPPORT=y
-CONFIG_MTK_RTMP_FLASH_SUPPORT=y
-CONFIG_MTK_RT_FIRST_CARD_EEPROM="flash"
-CONFIG_MTK_RT_FIRST_IF_RF_OFFSET=0xc0000
-CONFIG_MTK_SCS_FW_OFFLOAD=y
-CONFIG_MTK_SECOND_IF_NONE=y
-CONFIG_MTK_SMART_CARRIER_SENSE_SUPPORT=y
-CONFIG_MTK_SPECTRUM_SUPPORT=y
-CONFIG_MTK_SUPPORT_OPENWRT=y
-CONFIG_MTK_THIRD_IF_NONE=y
-CONFIG_MTK_TPC_SUPPORT=y
-CONFIG_MTK_TXBF_SUPPORT=y
-CONFIG_MTK_UAPSD=y
-CONFIG_MTK_VLAN_SUPPORT=y
-CONFIG_MTK_VOW_SUPPORT=y
-CONFIG_MTK_WARP_V2=y
-CONFIG_MTK_WDS_SUPPORT=y
-CONFIG_MTK_WHNAT_SUPPORT=m
-CONFIG_MTK_WIFI_BASIC_FUNC=y
-CONFIG_MTK_WIFI_DRIVER=y
-CONFIG_MTK_WIFI_EAP_FEATURE=y
-CONFIG_MTK_WIFI_FW_BIN_LOAD=y
-CONFIG_MTK_WIFI_MODE_AP=m
-CONFIG_MTK_WIFI_MT_MAC=y
-CONFIG_MTK_WIFI_TWT_SUPPORT=y
-CONFIG_MTK_WLAN_HOOK=y
-CONFIG_MTK_WLAN_SERVICE=y
-CONFIG_MTK_WNM_SUPPORT=y
-CONFIG_MTK_WPA3_SUPPORT=y
-CONFIG_MTK_WSC_INCLUDED=y
-CONFIG_MTK_WSC_V2_SUPPORT=y
-
-CONFIG_CONNINFRA_AUTO_UP=y
-CONFIG_CONNINFRA_EMI_SUPPORT=y
-
-CONFIG_WARP_CHIPSET="mt7986"
-CONFIG_WARP_VERSION=2
-CONFIG_WED_HW_RRO_SUPPORT=y
-CONFIG_first_card_name="MT7986"
-
-CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
-
-
-

devices/mediatek_mt7986/diy.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-shopt -s extglob
-
-SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-
-rm -rf package/feeds/kiddin9/rtl* package/feeds/packages/gptfdisk
-
-sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2024-12-06/" package/network/config/netifd/Makefile
-
-rm -rf devices/common/patches/{glinet,fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}
-
-rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl package/feeds/luci/ucode-mod-html package/feeds/luci/rpcd-mod-luci
-
-svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
-svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
-svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
-svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/ucode package/utils/ucode
-#ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/

devices/mediatek_mt7986/feeds.conf

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

devices/mediatek_mt7986/patches/base-files.patch

@@ -1,22 +0,0 @@
---- a/package/feeds/kiddin9/base-files/Makefile
-+++ b/package/feeds/kiddin9/base-files/Makefile
-@@ -205,6 +205,9 @@ define Package/base-files/install
- 
- 	$(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \
- 		rm -f $(1)/etc/banner.failsafe,)
-+
-+	$(if $(CONFIG_PACKAGE_wifi-profile), \
-+		rm -f $(1)/sbin/wifi)
- endef
- 
- ifneq ($(DUMP),1)
-
---- a/package/feeds/kiddin9/base-files/files/etc/hotplug.d/net/00-sysctl
-+++ b/package/feeds/kiddin9/base-files/files/etc/hotplug.d/net/00-sysctl
-@@ -6,4 +6,6 @@ if [ "$ACTION" = add ]; then
- 		sed -ne "/^[[:space:]]*net\..*\.$DEVICENAME\./p" "$CONF" | \
- 			sysctl -e -p - | logger -t sysctl
- 	done
-+
-+	[ -f /sbin/smp.sh ] && /sbin/smp.sh
- fi

devices/mediatek_mt7986/patches/depends.patch

@@ -1,28 +0,0 @@
---- a/target/linux/mediatek/image/mt7986.mk
-+++ b/target/linux/mediatek/image/mt7986.mk
-@@ -356,10 +356,11 @@ TARGET_DEVICES += mediatek_mt7986-fpga-ubi
- 
- define Device/xiaomi_redmi-router-ax6000
-   DEVICE_VENDOR := Xiaomi
--  DEVICE_MODEL := Redmi Router AX6000
-+  DEVICE_MODEL := Redmi Router AX6000 (Uboot专用)
-   DEVICE_DTS := mt7986a-xiaomi-redmi-router-ax6000
-   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-   DEVICE_PACKAGES := kmod-leds-ws2812b
-+  DEVICE_PACKAGES := luci-app-mtk mii_mgr wifi-profile switch regs kmod-warp kmod-mt_wifi kmod-mediatek_hnat kmod-conninfra datconf-lua
-   SUPPORTED_DEVICES := xiaomi,redmi-router-ax6000
-   UBINIZE_OPTS := -E 5
-   BLOCKSIZE := 128k
-@@ -374,10 +375,11 @@ TARGET_DEVICES += xiaomi_redmi-router-ax6000
- 
- define Device/xiaomi_redmi-router-ax6000-stock
-   DEVICE_VENDOR := Xiaomi
--  DEVICE_MODEL := Redmi Router AX6000 (stock layout)
-+  DEVICE_MODEL := Redmi Router AX6000 (原厂布局)
-   DEVICE_DTS := mt7986a-xiaomi-redmi-router-ax6000-stock
-   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-   DEVICE_PACKAGES := kmod-leds-ws2812b
-+  DEVICE_PACKAGES := luci-app-mtk mii_mgr wifi-profile switch regs kmod-warp kmod-mt_wifi kmod-mediatek_hnat kmod-conninfra datconf-lua
-   SUPPORTED_DEVICES := xiaomi,redmi-router-ax6000-stock
-   UBINIZE_OPTS := -E 5
-   BLOCKSIZE := 128k

devices/mediatek_mt7986/patches/fix.patch

@@ -1,55 +0,0 @@
---- a/include/image.mk
-+++ b/include/image.mk
-@@ -609,6 +609,7 @@ define Device/Build/image
- 	IMAGE_TYPE=$(word 1,$(subst ., ,$(2))) \
- 	IMAGE_FILESYSTEM="$(1)" \
- 	IMAGE_PREFIX="$(IMAGE_PREFIX)" \
-+	KERNEL_INITRAMFS_IMAGE="$(subst $(IMG_PREFIX_EXTRA),,$(KERNEL_INITRAMFS_IMAGE))" \
- 	DEVICE_VENDOR="$(DEVICE_VENDOR)" \
- 	DEVICE_MODEL="$(DEVICE_MODEL)" \
- 	DEVICE_VARIANT="$(DEVICE_VARIANT)" \
-
---- a/scripts/json_add_image_info.py
-+++ b/scripts/json_add_image_info.py
-@@ -48,6 +48,7 @@ def get_titles():
-     "profiles": {
-         device_id: {
-             "image_prefix": getenv("IMAGE_PREFIX"),
-+            "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
-             "images": [
-                 {
-                     "type": getenv("IMAGE_TYPE"),
-
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
- 
- 
- if output:
--    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"] = run(
-         [
-             "make",
-             "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
-             "target/linux/",
-             "val.DEFAULT_PACKAGES",
-             "val.ARCH_PACKAGES",
-+            "val.LINUX_VERSION",
-         ],
-         stdout=PIPE,
-         stderr=PIPE,
-
---- a/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
-+++ b/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
-@@ -581,9 +581,7 @@ <h2><%:Interface Configurations%> - <%=vifname and devname.."@"..vifname or devn
-         </table>
-         <h3><%:Access control MAC address list%></h3>
-         <textarea name="__maclist" id="__maclist" style="width:98%; height: 100px;"><%
--        local list = cfgs["AccessControlList"..(vifidx-1)] or ""
--        print(table.concat(list:split(";"), "\n"))
--        %></textarea>
-+        local list = cfgs["AccessControlList"..(vifidx-1)] or "" %><%=table.concat(list:split(";"), "\n")%></textarea>
-         </fieldset>
- 
-         <% if string.split(cfgs.WirelessMode,";")[1] == "16" or string.split(cfgs.WirelessMode,";")[1] == "17" or string.split(cfgs.WirelessMode,";")[1] == "18" then %>

devices/mediatek_mt7986/patches/iptables-mod-socket.patch

@@ -1,40 +0,0 @@
---- a/package/network/utils/iptables/Makefile
-+++ b/package/network/utils/iptables/Makefile
-@@ -388,6 +388,19 @@ iptables extension for triggering a LED.
- 
- endef
- 
-+define Package/iptables-mod-socket
-+$(call Package/iptables/Module, +kmod-ipt-socket)
-+  TITLE:=Socket match iptables extensions
-+endef
-+
-+define Package/iptables-mod-socket/description
-+Socket match iptables extensions.
-+
-+ Matches:
-+  - socket
-+
-+endef
-+
- define Package/iptables-mod-tproxy
- $(call Package/iptables/Module, +kmod-ipt-tproxy)
-   TITLE:=Transparent proxy iptables extensions
-@@ -396,9 +409,6 @@ endef
- define Package/iptables-mod-tproxy/description
- Transparent proxy iptables extensions.
- 
-- Matches:
--  - socket
--
-  Targets:
-   - TPROXY
- 
-@@ -721,6 +731,7 @@ $(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
- $(eval $(call BuildPlugin,iptables-mod-hashlimit,$(IPT_HASHLIMIT-m)))
- $(eval $(call BuildPlugin,iptables-mod-rpfilter,$(IPT_RPFILTER-m)))
- $(eval $(call BuildPlugin,iptables-mod-led,$(IPT_LED-m)))
-+$(eval $(call BuildPlugin,iptables-mod-socket,$(IPT_SOCKET-m)))
- $(eval $(call BuildPlugin,iptables-mod-tproxy,$(IPT_TPROXY-m)))
- $(eval $(call BuildPlugin,iptables-mod-tee,$(IPT_TEE-m)))
- $(eval $(call BuildPlugin,iptables-mod-u32,$(IPT_U32-m)))

devices/mediatek_mt7986/patches/targets.patch

@@ -1,45 +0,0 @@
---- a/include/target.mk
-+++ b/include/target.mk
-@@ -46,28 +46,27 @@ DEFAULT_PACKAGES.router:=\
- 	dnsmasq-full \
- 	firewall \
- 	iptables \
--	ipv6helper \
-+	ip6tables \
-+	kmod-ipt-nat \
-+	kmod-ipt-nat6 \
-+	kmod-ipt-offload \
-+	odhcp6c \
-+	odhcpd-ipv6only \
- 	ppp \
- 	ppp-mod-pppoe
--# For easy usage
--DEFAULT_PACKAGES.tweak:=\
--	block-mount \
--	default-settings-chn \
--	kmod-ipt-raw \
--	kmod-nf-nathelper \
--	kmod-nf-nathelper-extra \
--	luci \
--	luci-app-filetransfer \
--	luci-app-turboacc \
--	luci-compat \
--	luci-lib-base \
--	luci-lib-fs \
--	luci-lib-ipkg
- 
- ifneq ($(DUMP),)
-   all: dumpinfo
- endif
- 
-+ifeq ($(ARCH),arm)
-+  DEFAULT_PACKAGES+=luci-app-cpufreq
-+endif
-+
-+ifeq ($(ARCH),aarch64)
-+  DEFAULT_PACKAGES+=luci-app-cpufreq
-+endif
-+
- target_conf=$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
- ifeq ($(DUMP),)
-   PLATFORM_DIR:=$(TOPDIR)/target/linux/$(BOARD)

devices/mediatek_mt7986/settings.ini

@@ -1,2 +0,0 @@
-REPO_URL="https://github.com/hanwckf/immortalwrt-mt798x"
-REPO_BRANCH="openwrt-21.02"

devices/rockchip_armv8/.config

@@ -4,6 +4,9 @@ CONFIG_TARGET_rockchip_armv8=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_ALL_PROFILES=y
 
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r6c=n
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r6s=n
+
 CONFIG_PACKAGE_kmod-rtl8821cu=m
 CONFIG_PACKAGE_kmod-rtl88x2bu=m
 CONFIG_PACKAGE_kmod-pcie_mhi=m

devices/rockchip_armv8/diy.sh

@@ -10,7 +10,7 @@ rm -rf target/linux/rockchip/!(Makefile|patches-5.15)
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/rockchip target/linux/rockchip
 rm -rf target/linux/rockchip/{.svn,patches-5.15/.svn}
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/rockchip/patches-5.15 target/linux/rockchip/patches-5.15
-rm -rf target/linux/rockchip/patches-5.15/{002-net-usb*,204-rockchip-rk3328*,003-dt-bindings*,006-rockchip-rk3399*,072-v6.2-net-phy*,073-v6.2-net-phy*,074-v6.3-net-phy*,075-v6.3-net-phy*,076-v6.3-net-phy*,077-v6.3-net-phy*,078-v6.3-net-phy*,079-v6.3-net-phy*}
+rm -rf target/linux/rockchip/patches-5.15/{002-net-usb*,204-rockchip-rk3328*,003-dt-bindings*,006-rockchip-rk3399*,072-v6.2-net-phy*,073-v6.2-net-phy*,074-v6.3-net-phy*,075-v6.3-net-phy*,076-v6.3-net-phy*,077-v6.3-net-phy*,078-v6.3-net-phy*,079-v6.3-net-phy*,202-rockchip-rk3328-Add*,203-rockchip-rk3328-Add*}
 
 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_armv8/.config

@@ -5,7 +5,6 @@ CONFIG_TARGET_MULTI_PROFILE=y
 
 CONFIG_TARGET_DEVICE_rockchip_rk3588_armv8_DEVICE_friendlyelec_nanopi-r6c=y
 CONFIG_TARGET_DEVICE_rockchip_rk3588_armv8_DEVICE_friendlyelec_nanopi-r6s=y
-CONFIG_TARGET_DEVICE_rockchip_rk3588_armv8_DEVICE_friendlyelec_nanopc-t6=y
 CONFIG_TARGET_DEVICE_rockchip_rk3588_armv8_DEVICE_xunlong_orangepi-5=y
 CONFIG_TARGET_DEVICE_rockchip_rk3588_armv8_DEVICE_xunlong_orangepi-5-plus=y