update

devices/ipq60xx_generic/.config

@@ -3,64 +3,6 @@ CONFIG_TARGET_ipq60xx=y
 CONFIG_TARGET_ipq60xx_generic=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_ALL_PROFILES=y
-CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-ax1800=n
-CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-axt1800=n
-
-CONFIG_TARGET_ROOTFS_INITRAMFS=n
-
-CONFIG_PACKAGE_perf=n
-
-CONFIG_GCC_USE_VERSION_7=y
-CONFIG_PACKAGE_kmod-dm-raid=n
-CONFIG_PACKAGE_kmod-dm=n
-CONFIG_PACKAGE_kmod-fs-xfs=n
-CONFIG_PACKAGE_kmod-fs-btrfs=n
-CONFIG_PACKAGE_kmod-qca-nss-drv-bridge-mgr=n
-CONFIG_PACKAGE_kmod-qca-nss-drv-vlan-mgr=n
-CONFIG_PACKAGE_kmod-drm-ttm=n
-CONFIG_PACKAGE_kmod-drm-kms-helper=n
-CONFIG_PACKAGE_kmod-gigaset=n
-CONFIG_PACKAGE_kmod-isdn4linux=n
-CONFIG_PACKAGE_kmod-video-pwc=n
-CONFIG_PACKAGE_kmod-mmc-spi=n
-CONFIG_PACKAGE_kmod-scsi-cdrom=n
-CONFIG_PACKAGE_kmod-scsi-generic=n
-CONFIG_PACKAGE_kmod-scsi-tape=n
-CONFIG_PACKAGE_kmod-sound-core=n
-CONFIG_PACKAGE_kmod-iio-hmc5843=n
-CONFIG_PACKAGE_kmod-ledtrig-netdev=n
-CONFIG_PACKAGE_kmod-tg3=n
-CONFIG_PACKAGE_kmod-be2net=n
-CONFIG_PACKAGE_kmod-bmp085-spi=n
-CONFIG_PACKAGE_kmod-mac80211-hwsim=n
-CONFIG_PACKAGE_kmod-ath3k=n
-CONFIG_PACKAGE_kmod-ath5k=n
-CONFIG_PACKAGE_kmod-ath6kl-sdio=n
-CONFIG_PACKAGE_kmod-ath6kl-usb=n
-CONFIG_PACKAGE_kmod-ath9k=n
-CONFIG_PACKAGE_kmod-ath10k=n
-CONFIG_PACKAGE_kmod-ath10k-ct=n
-CONFIG_PACKAGE_kmod-ath10k-ct-smallbuffers=n
-CONFIG_PACKAGE_kmod-crypto-qcrypto=n
-CONFIG_PACKAGE_kmod-gl-mifi-mcu=n
-CONFIG_PACKAGE_kmod-mdio-netlink=n
-CONFIG_PACKAGE_kmod-nf-nathelper-extra=n
-CONFIG_PACKAGE_kmod-nf-ipvs-sip=n
-CONFIG_PACKAGE_kmod-nf-nathelper-extra=n
-CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n
-CONFIG_PACKAGE_kmod-ovpn-dco=n
-CONFIG_PACKAGE_spidev-test=n
-CONFIG_PACKAGE_kmod-lib80211=n
-CONFIG_PACKAGE_kmod-carl9170=n
-CONFIG_PACKAGE_kmod-batman-adv=n
-CONFIG_PACKAGE_kmod-rtl8812au-ct=n
-CONFIG_PACKAGE_kmod-rtl8821cu=n
-CONFIG_PACKAGE_kmod-rtl88x2bu=n
-CONFIG_PACKAGE_kmod-pf-ring=n
-CONFIG_PACKAGE_kmod-netatop=n
-
-
-CONFIG_SECCOMP=n
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 

devices/ipq60xx_generic/README.md

@@ -1 +0,0 @@
-Kernel等部分源码来源 https://github.com/coolsnowwolf/openwrt-gl-ax1800 感谢

devices/ipq60xx_generic/diy.sh

@@ -1,48 +1,11 @@
 #!/bin/bash
 shopt -s extglob
 
-rm -rf package/boot/uboot-envtools package/kernel package/firmware/ath11k* package/qca target/linux/generic target/linux/ipq60xx package/network/config/netifd feeds/kiddin9/fullconenat toolchain tools/squashfskit4
-svn export --force https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/boot/uboot-envtools package/boot/uboot-envtools
-svn export --force https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/firmware/ath11k-firmware package/firmware/ath11k-firmware
-svn export --force https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/qca package/qca
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/ipq60xx target/linux/ipq60xx
 
-svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/target/linux/generic target/linux/generic
-svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/target/linux/ipq60xx target/linux/ipq60xx
-wget -P dl/ https://github.com/coolsnowwolf/openwrt-gl-ax1800/raw/master/dl/linux-4.4.60.tar.xz
-svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/kernel package/kernel
-svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/network/services/fullconenat feeds/kiddin9/fullconenat
-svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/network/config/netifd package/network/config/netifd
-svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/toolchain toolchain
-svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/tools/squashfskit4 tools/squashfskit4
-rm -rf target/linux/generic/files
-rm -rf package/network/config/netifd/patches
+git clone https://github.com/robimarko/nss-packages package/nss-packages
+svn co https://github.com/coolsnowwolf/lede/trunk/package/qca package/nss-packages/qca
+mv -f package/nss-packages/qca/nss/* package/nss-packages/qca/
+rm -rf package/nss-packages/qca/qca-ssdk package/nss-packages/qca/qca-nss-dp package/nss-packages/qca/qca-*-64 package/nss-packages/qca/nss
 
-sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2024-12-06/" package/network/config/netifd/Makefile
-
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/openwrt-gl-ax1800/master/include/netfilter.mk -o include/netfilter.mk
-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 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
-svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/package/utils/util-linux package/utils/util-linux
-svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/package/libs/openssl package/libs/openssl
-svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/package/network/utils/iptables package/network/utils/iptables
-svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/package/network/utils/uqmi package/network/utils/uqmi
-
-sed -i "s/5.4.0/4.4.0/" toolchain/glibc/common.mk
-
-echo '
-CONFIG_PNP_DEBUG_MESSAGES=y
-CONFIG_PINCTRL_BAYTRAIL=n
-CONFIG_PINCTRL_CHERRYVIEW=n
-CONFIG_PINCTRL_BROXTON=n
-CONFIG_PINCTRL_SUNRISEPOINT=n
-CONFIG_PINCTRL_QDF2XXX=n
-CONFIG_GPIO_AMDPT=n
-CONFIG_PCC=n
-CONFIG_PMIC_OPREGION=n
-CCONFIG_RYPTO_CRC32_ARM64=n
-' >> ./target/linux/ipq60xx/config-4.4
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-qca-nss-dp kmod-qca-nss-drv kmod-qca-nss-drv-pppoe nss-firmware-ipq6018 qca-nss-ecm/' target/linux/ipq60xx/Makefile

devices/ipq60xx_generic/diy/include/kernel-4.4

@@ -1,2 +0,0 @@
-LINUX_VERSION-4.4 = .60
-LINUX_KERNEL_HASH-4.4.60 = 10f619f7f9ab9f2776d0e34d37138b1ca14e9a026b91790dbdb1eb6c8d15edc6

devices/ipq60xx_generic/diy/package/system/fstools/patches/fix.patch

@@ -1,11 +0,0 @@
---- a/libfstools/overlay.c
-+++ b/libfstools/overlay.c
-@@ -33,4 +33,8 @@
- #define SWITCH_JFFS2 "/tmp/.switch_jffs2"
- 
-+#ifndef GLOB_ONLYDIR
-+#define GLOB_ONLYDIR 0
-+#endif
-+
- static bool keep_sysupgrade;
- 

devices/ipq60xx_generic/patches/fix.patch

@@ -1,117 +0,0 @@
---- a/rules.mk
-+++ b/rules.mk
-@@ -136,8 +136,12 @@ else
-   TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME)
- endif
- 
--ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),)
--  iremap = -f$(if $(CONFIG_REPRODUCIBLE_DEBUG_INFO),file,macro)-prefix-map=$(1)=$(2)
-+ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
-+  ifeq ($(CONFIG_GCC_USE_EMBEDDED_PATH_REMAP),y)
-+    iremap = -fmacro-prefix-map=$(1)=$(2)
-+  else
-+    iremap = -iremap$(1):$(2)
-+  endif
- endif
- 
- PACKAGE_DIR:=$(BIN_DIR)/packages
-
---- a/include/image.mk
-+++ b/include/image.mk
-@@ -159,9 +159,6 @@ DTC_WARN_FLAGS := \
-   -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
- 	mv $(1).new $(1)
-
---- a/package/network/utils/iptables/Makefile
-+++ b/package/network/utils/iptables/Makefile
-@@ -784,7 +784,6 @@ $(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)))
-
---- a/include/target.mk
-+++ b/include/target.mk
-@@ -147,10 +147,17 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
- endif
- 
- GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
-+ifeq ($(CONFIG_TARGET_ipq60xx),y)
-+GENERIC_BACKPORT_DIR :=
-+GENERIC_PATCH_DIR :=
-+GENERIC_HACK_DIR :=
-+GENERIC_FILES_DIR :=
-+else
- GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
- GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
- GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
- GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
-+endif
- 
- __config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default
- __config_list = $(firstword $(wildcard $(call __config_name_list,$(1))))
-
---- a/package/kernel/mac80211/ath.mk
-+++ b/package/kernel/mac80211/ath.mk
-@@ -282,7 +282,7 @@ define KernelPackage/ath11k
-   TITLE:=Atheros 802.11ax wireless cards support
-   URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath11k
-   DEPENDS+= @TARGET_ipq60xx +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT \
--	+@DRIVER_11AX_SUPPORT +@DRIVER_11W_SUPPORT +kmod-qca-nss-drv
-+	+@DRIVER_11AX_SUPPORT +@DRIVER_11W_SUPPORT +kmod-qca-nss-drv +kmod-hwmon-core
-   FILES:= \
- 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath11k/ath11k.ko
- endef
-
---- a/target/linux/ipq60xx/Makefile
-+++ b/target/linux/ipq60xx/Makefile
-@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/target.mk
- DEFAULT_PACKAGES += \
- 	kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
- 	kmod-qca-nss-dp kmod-qca-nss-drv kmod-qca-ssdk \
--	kmod-ath11k-ahb qca-ssdk-shell wpad-openssl \
-+	kmod-ath11k-ahb qca-ssdk-shell wpad-basic-mbedtls \
- 	ath11k-firmware-ipq6018 nss-firmware-ipq6018 \
- 	kmod-qca-nss-drv-pppoe kmod-qca-nss-ecm uboot-envtools
- 
-
---- a/target/linux/ipq60xx/image/Makefile
-+++ b/target/linux/ipq60xx/image/Makefile
-@@ -104,7 +104,7 @@ define Device/qihoo_v6
- 	PAGESIZE := 2048
- 	DEVICE_DTS := qcom-ipq6018-qihoo-v6
- 	DEVICE_DTS_CONFIG := config@cp03-c1
--	DEVICE_TITLE := Qihoo V6
-+	DEVICE_TITLE := Qihoo 360 V6
- 	DEVICE_PACKAGES := ath11k-wifi-qihoo-v6 kmod-usb3 kmod-usb-phy-msm
- endef
- TARGET_DEVICES += qihoo_v6
-
---- a/target/linux/ipq60xx/files-4.4/arch/arm64/boot/dts/qcom/qcom-ipq6018-zn-m2.dts
-+++ b/target/linux/ipq60xx/files-4.4/arch/arm64/boot/dts/qcom/qcom-ipq6018-zn-m2.dts
-@@ -70,3 +70,15 @@
- 		};
- 	};
- };
-+
-+&qusb_phy_0 {
-+status = "ok";
-+};
-+
-+&ssphy_0 {
-+status = "ok";
-+};
-+
-+&usb3 {
-+status = "ok";
-+};

devices/ipq806x_generic/diy.sh

@@ -3,3 +3,12 @@
 shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+
+git clone https://github.com/robimarko/nss-packages package/nss-packages
+svn co https://github.com/coolsnowwolf/lede/trunk/package/qca package/nss-packages/qca
+mv -f package/nss-packages/qca/nss/* package/nss-packages/qca/
+rm -rf package/nss-packages/qca/qca-ssdk package/nss-packages/qca/qca-nss-dp package/nss-packages/qca/qca-*-64 package/nss-packages/qca/nss
+
+sed -i "/DEPENDS:/d" package/nss-packages/qca/qca-nss-drv/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-pppoe kmod-qca-mcs/' target/linux/ipq806x/Makefile

devices/ipq807x_generic/diy.sh

@@ -3,9 +3,12 @@ shopt -s extglob
 
 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
+git clone https://github.com/robimarko/nss-packages package/nss-packages
+svn co https://github.com/coolsnowwolf/lede/trunk/package/qca package/nss-packages/qca
+mv -f package/nss-packages/qca/nss/* package/nss-packages/qca/
+rm -rf package/nss-packages/qca/qca-ssdk package/nss-packages/qca/qca-nss-dp package/nss-packages/qca/qca-*-64 package/nss-packages/qca/nss
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += qca-ssdk-shell/' target/linux/ipq807x/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-qca-nss-dp kmod-qca-nss-drv kmod-qca-nss-drv-pppoe kmod-qca-nss-ecm kmod-qca-nss-drv-bridge-mgr kmod-qca-nss-drv-vlan-mgr nss-firmware-ipq8074/' target/linux/ipq807x/Makefile
 
 sh -c "curl -sfL https://github.com/robimarko/openwrt/commit/23fa931934151f72c1655ffa62ff1a979575f07e.patch | patch -d './' -p1 --forward"
 

devices/mediatek_filogic/.config

@@ -9,6 +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_mi-router-wr30u-112m-nmbm=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

@@ -1,6 +1,6 @@
 --- 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
+@@ -384,29 +384,18 @@ TARGET_DEVICES += xiaomi_redmi-router-ax6000-stock
  
  define Device/xiaomi_redmi-router-ax6000-ubootmod
    DEVICE_VENDOR := Xiaomi
@@ -14,8 +14,7 @@
    UBINIZE_OPTS := -E 5
    BLOCKSIZE := 128k
    PAGESIZE := 2048
-+  IMAGE_SIZE := 112640k
-   KERNEL_IN_UBI := 1
+-  KERNEL_IN_UBI := 1
 -  UBOOTENV_IN_UBI := 1
 -  KERNEL := kernel-bin | gzip
 -  KERNEL_INITRAMFS := kernel-bin | lzma | \
@@ -25,12 +24,12 @@
 -  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),)
+ 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)
++  ARTIFACTS := initramfs-factory.ubi
++  ARTIFACT/initramfs-factory.ubi := append-image-stage initramfs-kernel.bin | ubinize-kernel
+ endif
 +  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
  endef
  TARGET_DEVICES += xiaomi_redmi-router-ax6000-ubootmod
@@ -38,13 +37,17 @@
 
 --- a/package/boot/uboot-envtools/files/mediatek_filogic
 +++ b/package/boot/uboot-envtools/files/mediatek_filogic
-@@ -51,11 +51,13 @@ xiaomi,redmi-router-ax6000-stock)
+@@ -47,7 +47,8 @@ mercusys,mr90x-v1)
+ netgear,wax220)
+ 	ubootenv_add_uci_config "/dev/mtd5" "0x0" "0x20000" "0x20000"
+ 	;;
+-xiaomi,redmi-router-ax6000-stock)
++xiaomi,redmi-router-ax6000-stock|\
++xiaomi,redmi-router-ax6000-ubootmod)
  	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x20000"
  	ubootenv_add_uci_sys_config "/dev/mtd2" "0x0" "0x10000" "0x20000"
  	;;
-+xiaomi,redmi-router-ax6000*)
-+	ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x10000" "0x20000" "1"
-+	;;
+@@ -55,8 +56,7 @@ h3c,magic-nx30-pro|\
  qihoo,360t7|\
  tplink,tl-xdr4288|\
  tplink,tl-xdr6086|\
@@ -57,7 +60,7 @@
 
 --- 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 @@
+@@ -4,13 +4,31 @@
  #include "mt7986a-xiaomi-redmi-router-ax6000.dtsi"
  
  / {
@@ -66,86 +69,28 @@
  	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>;
-+	};
++&spi_nand_flash {
++	mediatek,nmbm;
++	mediatek,bmt-max-ratio = <1>;
++	mediatek,bmt-max-reserved-blocks = <64>;
 +};
 +
-+/ {
-+	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>;
-+			};
+ &partitions {
+ 	partition@580000 {
++		label = "crash";
++		reg = <0x580000 0x40000>;
++		read-only;
++	};
 +
-+			partition@5c0000 {
-+				label = "crash_log";
-+				reg = <0x5c0000 0x40000>;
-+			};
++	partition@5c0000 {
++		label = "crash_log";
++		reg = <0x5c0000 0x40000>;
++		read-only;
++	};
 +
-+			partition@600000 {
-+				label = "ubi";
-+				reg = <0x600000 0x6e00000>;
-+			};
-+		};
++	partition@600000 {
+ 		label = "ubi";
+-		reg = <0x580000 0x7a80000>;
++		reg = <0x600000 0x6e00000>;
  	};
  };

devices/mediatek_filogic/settings.ini

@@ -0,0 +1,2 @@
+REPO_URL="https://github.com/openwrt/openwrt"
+REPO_BRANCH="openwrt-23.05"

devices/mediatek_mt7981/.config

@@ -6,7 +6,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-112m=y
 CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_cetron_ct3003=y
 CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_jcg_q30=y
 

devices/rockchip_rk3588_armv8/diy.sh

@@ -18,5 +18,7 @@ mv -f target/linux/rockchip target/linux/rockchip_rk3588
 
 rm -rf package/feeds/packages/glib2 package/devel/perf package/feeds/kiddin9/{shortcut-fe,fibocom_QMI_WWAN,oaf,fast-classifier,firewall,rtl88x2bu,rtl8821cu} package/feeds/packages/bluez package/kernel/ksmbd package/feeds/routing/batman-adv
 
+sed -i "/friendlyelec/d" package/feeds/kiddin9/base-files/files/lib/preinit/02_sysinfo
+
 #curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk