build: Add support for linking with DT_RELR

This adds the -Wl,-z,pack-relative-relocs linking options.
This reduces the size of some binaries.

This is only supported on i386, x86_64, aarch64 and loongarch64 in
binutils. This feature is not support for MIPS.

musl libc supports it since version 1.2.4 .
glibc supports it since vesion 2.36.
binutils ld supports it since version 2.38 for x86 and since version
2.43 for LoongArch.

This reduces the size of the armsr default root file system from
5,262,198 bytes to 5,200,950 bytes by 61,248 bytes.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

.gitattributes

@@ -1,4 +1,2 @@
 * -text
 *.patch whitespace=-indent-with-non-tab,-space-before-tab,-tab-in-indent,-trailing-space
-*.dts text eol=lf
-*.dts[io] text eol=lf

.github/labeler.yml

@@ -126,12 +126,6 @@
     - "target/linux/mediatek/**"
     - "package/boot/arm-trusted-firmware-mediatek/**"
     - "package/boot/uboot-mediatek/**"
-"target/microchipsw":
-- changed-files:
-  - any-glob-to-any-file:
-    - "target/linux/microchipsw/**"
-    - "package/boot/arm-trusted-firmware-microchipsw/**"
-    - "package/boot/uboot-microchipsw/**"
 "target/mpc85xx":
 - changed-files:
   - any-glob-to-any-file:

.github/workflows/formal.yml

@@ -5,14 +5,8 @@ on:
 
 permissions:
   contents: read
-  pull-requests: write
 
 jobs:
   build:
     name: Test Formalities
     uses: openwrt/actions-shared-workflows/.github/workflows/formal.yml@main
-    # with:
-    #   # Post formality check summaries to the PR.
-    #   # Repo's permissions need to be updated for actions to modify PRs:
-    #   # https://docs.github.com/en/rest/issues/comments?apiVersion=2022-11-28#create-an-issue-comment
-    #   post_comment: true

config/Config-build.in

@@ -108,7 +108,6 @@ menu "Global build settings"
 	config CLEAN_IPKG
 		bool
 		prompt "Remove ipkg/opkg status data files in final images"
-		depends on !USE_APK
 		help
 		  This removes all ipkg/opkg status data files from the target directory
 		  before building the root filesystem.
@@ -251,15 +250,6 @@ menu "Global build settings"
 
 	comment "Hardening build options"
 
-	config PKG_FANALYZER
-		bool
-		prompt "Enable gcc fanalyzer"
-		default n
-		help
-		  Add -fanalyzer to the CFLAGS. As a result of this option, a static analysis
-		  of the program flow is conducted, allowing interprocedural paths to be
-		  identified and warnings to be issued if problems are identified.
-
 	config PKG_CHECK_FORMAT_SECURITY
 		bool
 		prompt "Enable gcc format-security"

config/Config-images.in

@@ -18,7 +18,6 @@ menu "Target Images"
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
 			default TARGET_INITRAMFS_COMPRESSION_ZSTD if TARGET_qualcommax
-			default TARGET_INITRAMFS_COMPRESSION_ZSTD if TARGET_microchipsw
 			default TARGET_INITRAMFS_COMPRESSION_XZ if USES_SEPARATE_INITRAMFS
 			default TARGET_INITRAMFS_COMPRESSION_NONE
 			depends on TARGET_ROOTFS_INITRAMFS
@@ -336,7 +335,7 @@ menu "Target Images"
 		int "Root filesystem partition size (in MiB)"
 		depends on USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS
 		default 232 if TARGET_loongarch64
-		default 448 if TARGET_mediatek || TARGET_microchipsw
+		default 448 if TARGET_mediatek
 		default 104
 		help
 		  Select the root filesystem partition size.

config/Config-kernel.in

@@ -597,12 +597,14 @@ choice
 
 	config KERNEL_TRANSPARENT_HUGEPAGE_NEVER
 		bool "never"
+		depends on !LINUX_6_6
 endchoice
 
 config KERNEL_ARM64_CONTPTE
 	bool "Compile the kernel with Contiguous PTE mappings for user memory"
-	depends on aarch64
+	depends on KERNEL_ARM64
 	depends on KERNEL_TRANSPARENT_HUGEPAGE
+	depends on !LINUX_6_6
 	default y
 
 config KERNEL_HUGETLBFS
@@ -860,6 +862,7 @@ if KERNEL_CGROUPS
 	config KERNEL_CPUSETS_V1
 		bool "Legacy cgroup v1 cpusets controller"
 		depends on KERNEL_CPUSETS
+		depends on !LINUX_6_6
 		default n
 		help
 		  Legacy cgroup v1 cpusets controller which has been deprecated by
@@ -918,6 +921,7 @@ if KERNEL_CGROUPS
 		bool "Legacy cgroup v1 memory controller"
 		default n
 		depends on KERNEL_MEMCG
+		depends on !LINUX_6_6
 		help
 		  Legacy cgroup v1 memory controller which has been deprecated by
 		  cgroup v2 implementation. The v1 is there for legacy applications
@@ -1181,7 +1185,6 @@ config KERNEL_NET_L3_MASTER_DEV
 config KERNEL_DCB
 	bool "Data Center Bridging support"
 	default y if TARGET_armsr_armv8
-	default y if TARGET_microchipsw
 	default y if TARGET_x86_64
 	help
 	  This enables support for configuring Data Center Bridging (DCB)

feeds.conf.default

@@ -1,5 +1,8 @@
-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-25.12
-src-git luci https://git.openwrt.org/project/luci.git;openwrt-25.12
-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-25.12
-src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-25.12
-src-git video https://github.com/openwrt/video.git;openwrt-25.12
+src-git packages https://git.openwrt.org/feed/packages.git
+src-git luci https://git.openwrt.org/project/luci.git
+src-git routing https://git.openwrt.org/feed/routing.git
+src-git telephony https://git.openwrt.org/feed/telephony.git
+src-git video https://github.com/openwrt/video.git
+#src-git targets https://github.com/openwrt/targets.git
+#src-git oldpackages http://git.openwrt.org/packages.git
+#src-link custom /usr/src/openwrt/custom-feed

include/cmake.mk

@@ -89,8 +89,8 @@ endif
 define Build/Configure/Default
 	mkdir -p $(CMAKE_BINARY_DIR)
 	(cd $(CMAKE_BINARY_DIR); \
-		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
-		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
 		cmake \
 			--no-warn-unused-cli \

include/hardening.mk

@@ -9,7 +9,6 @@ PKG_SSP ?= 1
 PKG_FORTIFY_SOURCE ?= 1
 PKG_RELRO ?= 1
 PKG_DT_RELR ?= 1
-PKG_FANALYZER ?= 0
 
 ifdef CONFIG_PKG_CHECK_FORMAT_SECURITY
   ifeq ($(strip $(PKG_CHECK_FORMAT_SECURITY)),1)
@@ -78,8 +77,3 @@ ifdef CONFIG_PKG_DT_RELR
   endif
 endif
 
-ifdef CONFIG_PKG_FANALYZER
-  ifeq ($(strip $(PKG_FANALYZER)),1)
-    TARGET_CFLAGS +=  -fanalyzer
-  endif
-endif

include/image-commands.mk

@@ -430,7 +430,7 @@ define Build/initrd_compression
 	$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD),.zstd)
 endef
 
-define Build/fit-its
+define Build/fit
 	$(if $(findstring with-rootfs,$(word 3,$(1))), \
 		$(call locked,dd if=$(IMAGE_ROOTFS) of=$(IMAGE_ROOTFS).pagesync bs=4096 conv=sync, \
 		  gen-cpio$(if $(TARGET_PER_DEVICE_ROOTFS),.$(ROOTFS_ID/$(DEVICE_NAME)))))
@@ -452,20 +452,12 @@ define Build/fit-its
 		$(if $(DEVICE_DTS_OVERLAY),$(foreach dtso,$(DEVICE_DTS_OVERLAY), -O $(dtso):$(KERNEL_BUILD_DIR)/image-$(dtso).dtbo)) \
 		-c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config-1") \
 		-A $(LINUX_KARCH) -v $(LINUX_VERSION)
-endef
-
-define Build/fit-image
 	$(call locked,PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage $(if $(findstring external,$(word 3,$(1))),\
 		-E -B 0x1000 $(if $(findstring static,$(word 3,$(1))),-p 0x1000)) -f $@.its $@.new, \
 	  gen-cpio$(if $(TARGET_PER_DEVICE_ROOTFS),.$(ROOTFS_ID/$(DEVICE_NAME))))
 	@mv $@.new $@
 endef
 
-define Build/fit
-	$(call Build/fit-its,$(1))
-	$(call Build/fit-image,$(1))
-endef
-
 define Build/libdeflate-gzip
 	$(STAGING_DIR_HOST)/bin/libdeflate-gzip -f -12 -c $@ $(1) > $@.new
 	@mv $@.new $@

include/image.mk

@@ -41,9 +41,6 @@ KDIR=$(KERNEL_BUILD_DIR)
 KDIR_TMP=$(KDIR)/tmp
 DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts
 
-ifeq ($(EXTRA_IMAGE_NAME),)
-EXTRA_IMAGE_NAME:=$(call qstrip,$(CONFIG_EXTRA_IMAGE_NAME))
-endif
 IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-)
 IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-)
 IMG_PREFIX_VERCODE:=$(if $(CONFIG_VERSION_CODE_FILENAMES),$(call sanitize,$(VERSION_CODE))-)
@@ -117,7 +114,6 @@ fs-types-$(CONFIG_TARGET_ROOTFS_JFFS2_NAND) += $(addprefix jffs2-nand-,$(NAND_BL
 fs-types-$(CONFIG_TARGET_ROOTFS_EXT4FS) += ext4
 fs-types-$(CONFIG_TARGET_ROOTFS_UBIFS) += ubifs
 fs-types-$(CONFIG_TARGET_ROOTFS_EROFS) += erofs
-fs-types-$(CONFIG_TARGET_ROOTFS_TARGZ) += targz
 fs-subtypes-$(CONFIG_TARGET_ROOTFS_JFFS2) += $(addsuffix -raw,$(addprefix jffs2-,$(JFFS2_BLOCKSIZE)))
 
 TARGET_FILESYSTEMS := $(fs-types-y)
@@ -330,12 +326,6 @@ define Image/mkfs/erofs
 		$@ $(call mkfs_target_dir,$(1))
 endef
 
-define Image/mkfs/targz
-	$(TAR) -cp --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \
-		$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
-		-C $(call mkfs_target_dir,$(1)) . | gzip -9n > $@
-endef
-
 define Image/Manifest
 	$(if $(CONFIG_USE_APK), \
 		$(call apk,$(TARGET_DIR_ORIG)) list --quiet --manifest --no-network \

include/kernel-defaults.mk

@@ -25,6 +25,7 @@ ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"")
     define Kernel/Prepare/Default
 	$(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
 	$(Kernel/Patch)
+	$(if $(QUILT),touch $(LINUX_DIR)/.quilt_used)
     endef
   else
     define Kernel/Prepare/Default

include/kernel.mk

@@ -306,3 +306,4 @@ kernel_patchver_ge=$(call kernel_version_cmp,-ge,$(KERNEL_PATCHVER),$(1))
 kernel_patchver_eq=$(call kernel_version_cmp,-eq,$(KERNEL_PATCHVER),$(1))
 kernel_patchver_le=$(call kernel_version_cmp,-le,$(KERNEL_PATCHVER),$(1))
 kernel_patchver_lt=$(call kernel_version_cmp,-lt,$(KERNEL_PATCHVER),$(1))
+

include/package-pack.mk

@@ -78,196 +78,6 @@ define FixupDependencies
   $(call AddDependency,$(1),$$(DEPS))
 endef
 
-# Format dependencies and extra dependencies
-#
-# ABI-version EXTRA_DEPENDS so dependencies can be correctly looked up using the
-# existing semantics without the ABI specified. This is needed since ABI-
-# versioned libraries don't provide `${package_name}=${package_version}`, so
-# that same library but with different ABI versions can be installed side by
-# side.
-#
-# Remove duplicate dependencies when EXTRA_DEPENDS specifies a versioned one
-# that is already in DEPENDS.
-#
-# 1: list of dependencies
-# 2: list of extra dependencies
-define FormatDepends
-$(strip
-  $(eval _COMMA_SEP := __COMMA_SEP__)
-  $(eval _SPACE_SEP := __SPACE_SEP__)
-  $(eval _DEPENDS := $(1))
-  $(eval _EXTRA_DEPENDS_ABI := )
-  $(eval _DEP_ITEMS := $(subst $(_COMMA_SEP),$(space),$(subst $(space),$(_SPACE_SEP),$(subst $(comma),$(_COMMA_SEP),$(2)))))
-
-  $(foreach dep,$(_DEP_ITEMS),
-    $(eval _EXTRA_DEP := )
-    $(eval _CUR_DEP := $(subst $(_SPACE_SEP),$(space),$(strip $(dep))))
-    $(eval _PKG_NAME := $(word 1,$(_CUR_DEP)))
-    $(if $(findstring $(paren_left), $(_PKG_NAME)),
-      $(error "Unsupported extra dependency format: no space before '(': $(_CUR_DEP)"))
-    )
-    $(eval _ABI_SUFFIX := $(call GetABISuffix,$(_PKG_NAME)))
-    $(eval _PKG_NAME_ABI := $(_PKG_NAME)$(_ABI_SUFFIX))
-    $(eval _VERSION_CONSTRAINT := $(word 2,$(_CUR_DEP)))
-    $(if $(_VERSION_CONSTRAINT),
-      $(eval _EXTRA_DEP := $(_PKG_NAME_ABI) $(_VERSION_CONSTRAINT)),
-      $(error "Extra dependencies must have version constraints. $(_PKG_NAME) seems to be unversioned.")
-    )
-    $(if $(and $(_EXTRA_DEPENDS_ABI),$(_EXTRA_DEP)),
-      $(eval _EXTRA_DEPENDS_ABI := $(_EXTRA_DEPENDS_ABI)$(comma)$(_EXTRA_DEP)),
-      $(eval _EXTRA_DEPENDS_ABI := $(_EXTRA_DEP))
-    )
-    $(if $(_DEPENDS),
-      $(eval _DEPENDS := $(filter-out $(_PKG_NAME_ABI),$(_DEPENDS)))
-    )
-  )
-
-  $(eval _DEPENDS := $(call mergelist,$(_DEPENDS)))
-  $(_EXTRA_DEPENDS_ABI)$(if $(_DEPENDS),$(comma) $(_DEPENDS))
-)
-endef
-
-# Format provide and add ABI and version if it's not a virtual provide marked
-# with an @.
-#
-# Same as for the base package name, if ABI version is set, provide both
-# unversioned provide and one with ABI version and version.
-#
-# 1: provide name
-# 2: provide version
-# 3: (optional) ABI version
-define AddProvide
-$(strip
-  $(if $(filter @%,$(1)),
-    $(patsubst @%,%,$(1)),
-    $(if $(3),
-      $(1) $(1)$(call FormatABISuffix,$(1),$(3))=$(2),
-      $(1)=$(2)
-    )
-  )
-)
-endef
-
-# Remove virtual provides prefix and self. apk doesn't like it when packages
-# specify a redundant provide pointing to self.
-#
-# 1: package name
-# 2: list of provides
-define SanitizeProvides
-$(filter-out $(1),$(patsubst @%,%,$(2)))
-endef
-
-# Format provides both for apk and control
-#
-# - If ABI version is defined:
-#   - package is named `${package_name}${ABI_version}`
-#     if a `package_name` ends in a number, the `ABI_version` will be prefixed
-#     with a - sign, e.g.: libsqlite3-0
-#   - package implicitly provides
-#     `${package_name}${ABI_version}=${package_version}`
-#     this implies that only one version of a package per ABI can be installed
-#     at the same time
-#   - additionally provide `${package_name}` so multiple packages can be looked
-#     up by its base name
-#   - for each `provides`:
-#     - provide `${provide}${ABI_version}=${package_version}`
-#       this implies that only one version of a provide can be installed at the
-#       same time
-#     - if a `provide` ends in a number, the `ABI_version` will be prefixed with
-#       a - sign, e.g.: provide1-0
-#     - additionally provide `${provide}` so multiple packages can be looked up
-#       by its base name
-#
-# - else if ABI version is _not_ defined
-#   - package is named `${package_name}`
-#   - package implicitly provides `${package_name}=${package_version}`
-#     this implies that only one version of a package can be installed at the
-#     same time
-#   - for each `provides`, provide `${provide}=${package_version}` this implies
-#     that only one version of a provide can be installed at the same time
-#
-# - Both with and without an ABI, if a provide starts with an @, treat it as a
-#   virtual provide, that doesn't own the name by not appending version.
-#   Multiple packages with the same virtual provides can be installed
-#   side-by-side.
-#
-# - apk doesn't like it when packages specify a redundant provide pointing to
-#   self. Filter it out, but keep virtual self provides, in the form of
-#   @(kmod-)?${package_name}-any.
-#
-# - Packages implicitly add a virtual @${package_name}-any provide in Package,
-#   which implies that kmods, which are also packages, will have a virtual
-#   @kmod-${package_name}-any provide.
-#
-# - Aside from the two aforementioned implicit provides, packages are expected
-#   to manage their provides themselves.
-#
-# - When multiple variants inside the same package have the same provide, a
-#   default variant must be set using DEFAULT_VARIANT:=1.
-#
-# - Cross-package provides must be virtual and a default variant must be set. If
-#   different packages provide the same versioned (i.e. non-virtual) provide the
-#   package with a higher version will be preferred, which results in unintended
-#   behavior, because the order might change with package updates.
-#
-#   Example:
-#   - both uclient-fetch and wget provide wget
-#   - wget doesn't have a default variant called wget that would provide an
-#     implicit @wget-any
-#     - add wget to PROVIDES for both wget-ssl and wget-nossl variants so they
-#       can't be installed at the same time
-#     - add @wget-any to both packages so packages outside of wget can provide
-#       it
-#   - uclient-fetch has only one variant
-#     - add @wget-any to PROVIDES
-#     - mark uclient-fetch as the default variant using DEFAULT_VARIANT:=1
-#   - switch wget consumer that don't depend on a specific version like apk to
-#     depend on @wget-any
-#
-# - Alternatives don't affect the packaging.
-#
-# 1: package name
-# 2: package version
-# 3: ABI version
-# 4: list of provides
-define FormatProvides
-$(strip \
-  $(if $(call FormatABISuffix,$(1),$(3)), \
-    $(1) $(foreach provide, \
-      $(filter-out $(1),$(4)), \
-      $(call AddProvide,$(provide),$(2),$(3)) \
-    ), \
-    $(foreach provide, \
-      $(filter-out $(1),$(4)), \
-      $(call AddProvide,$(provide),$(2)) \
-    ) \
-  ) \
-)
-endef
-
-# Get apk provider priority
-#
-# - if a package is marked as a default variant, set it to 100.
-#
-# - if a package has an ABI version defined, set it to 10.
-#   The enables packages with an ABI version to be installed by their base name
-#   instead of a name and an ABI version, e.g.:
-#   libfoo3, where 3 is the ABI version can be installed by just libfoo.
-#   This affects manual installation only, as the dependency resolution takes
-#   care of ABI versions.
-#
-# - otherwise return nothing, i.e. package will have the default priority 0.
-#
-# 1: Default variant
-# 2: ABI version
-define GetProviderPriority
-$(strip
-  $(if $(1),100,
-    $(if $(2),10)
-  )
-)
-endef
-
 ifneq ($(PKG_NAME),toolchain)
   define CheckDependencies
 	@( \
@@ -381,33 +191,17 @@ endif
     $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
 	mkdir -p $(STAGING_DIR_ROOT)/stamp
 	$(if $(ABI_VERSION),echo '$(ABI_VERSION)' | cmp -s - $(PKG_INFO_DIR)/$(1).version || { \
-		mkdir -p $(PKG_INFO_DIR); \
 		echo '$(ABI_VERSION)' > $(PKG_INFO_DIR)/$(1).version; \
-		$(foreach pkg,$(call SanitizeProvides,$(1),$(PROVIDES)), \
+		$(foreach pkg,$(filter-out $(1),$(PROVIDES)), \
 			cp $(PKG_INFO_DIR)/$(1).version $(PKG_INFO_DIR)/$(pkg).version; \
 		) \
 	} )
 	$(call locked,$(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(STAGING_DIR_ROOT)/,root-copy)
 	touch $$@
 
-    Package/$(1)/DEPENDS := $$(foreach dep,$$(filter-out @%,$$(IDEPEND_$(1))),$$(dep)$$(call GetABISuffix,$$(dep)))
+    Package/$(1)/DEPENDS := $$(call mergelist,$$(foreach dep,$$(filter-out @%,$$(IDEPEND_$(1))),$$(dep)$$(call GetABISuffix,$$(dep))))
     ifneq ($$(EXTRA_DEPENDS),)
-      ifeq ($(CONFIG_USE_APK),)
-        Package/$(1)/DEPENDS := $$(call mergelist,$$(Package/$(1)/DEPENDS))
-        Package/$(1)/DEPENDS := $$(EXTRA_DEPENDS)$$(if $$(Package/$(1)/DEPENDS),$$(comma) $$(Package/$(1)/DEPENDS))
-      else
-        Package/$(1)/DEPENDS := $$(call FormatDepends,$$(Package/$(1)/DEPENDS),$$(EXTRA_DEPENDS))
-      endif
-    else
-      Package/$(1)/DEPENDS := $$(call mergelist,$$(Package/$(1)/DEPENDS))
-    endif
-
-    ifeq ($(CONFIG_USE_APK),)
-      Package/$(1)/PROVIDES := $$(patsubst @%,%,$(PROVIDES))
-      Package/$(1)/PROVIDES := $$(filter-out $(1)$$(ABIV_$(1)),$$(Package/$(1)/PROVIDES)$$(if $$(ABIV_$(1)), $(1) $$(foreach provide,$$(Package/$(1)/PROVIDES),$$(provide)$$(ABIV_$(1)))))
-    else
-      Package/$(1)/PROVIDES := $$(call FormatProvides,$(1),$(VERSION),$(ABI_VERSION),$(PROVIDES))
-      Package/$(1)/PRIORITY := $$(call GetProviderPriority,$(DEFAULT_VARIANT),$(ABI_VERSION))
+      Package/$(1)/DEPENDS := $$(EXTRA_DEPENDS)$$(if $$(Package/$(1)/DEPENDS),$$(comma) $$(Package/$(1)/DEPENDS))
     endif
 
 $(_define) Package/$(1)/CONTROL
@@ -415,7 +209,7 @@ Package: $(1)$$(ABIV_$(1))
 Version: $(VERSION)
 $$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
 )$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
-)$$(call addfield,Provides,$$(call mergelist,$$(Package/$(1)/PROVIDES))
+)$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(ABIV_$(1))))))
 )$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES))
 )$$(call addfield,Source,$(SOURCE)
 )$$(call addfield,SourceName,$(PKG_NAME)
@@ -459,7 +253,7 @@ endif
 			fi; \
 		done; $(Package/$(1)/extra_provides) \
 	) | sort -u > $(PKG_INFO_DIR)/$(1).provides
-	$(if $(PROVIDES),@for pkg in $(call SanitizeProvides,$(1),$(PROVIDES)); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done)
+	$(if $(PROVIDES),@for pkg in $(filter-out $(1),$(PROVIDES)); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done)
 	$(CheckDependencies)
 
 	$(RSTRIP) $$(IDIR_$(1))
@@ -486,7 +280,7 @@ endif
 		)
     endif
 
-	$(INSTALL_DIR) $$(PDIR_$(1))
+	$(INSTALL_DIR) $$(PDIR_$(1))/tmp
 
 ifeq ($(CONFIG_USE_APK),)
 	mkdir -p $$(IDIR_$(1))/CONTROL
@@ -526,24 +320,24 @@ else
 		echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \
 		echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
 		echo 'export root="$$$${IPKG_INSTROOT}"'; \
-		echo 'export pkgname="$(1)$$(ABIV_$(1))"'; \
+		echo 'export pkgname="$(1)"'; \
 		echo "add_group_and_user"; \
 		echo "default_postinst"; \
-		[ ! -f $$(ADIR_$(1))/postinst-pkg ] || sed '/^\s*#!/d' "$$(ADIR_$(1))/postinst-pkg"; \
+		[ ! -f $$(ADIR_$(1))/postinst-pkg ] || sed -z 's/^\s*#!/#!/' "$$(ADIR_$(1))/postinst-pkg"; \
 	) > $$(ADIR_$(1))/post-install;
 
     ifdef Package/$(1)/preinst
 	( \
 		echo "#!/bin/sh"; \
 		echo 'export PKG_UPGRADE=1'; \
-		[ ! -f $$(ADIR_$(1))/preinst ] || sed '/^\s*#!/d' "$$(ADIR_$(1))/preinst"; \
+		[ ! -f $$(ADIR_$(1))/preinst ] || sed -z 's/^\s*#!/#!/' "$$(ADIR_$(1))/preinst"; \
 	) > $$(ADIR_$(1))/pre-upgrade;
     endif
 
 	( \
 		echo "#!/bin/sh"; \
 		echo 'export PKG_UPGRADE=1'; \
-		[ ! -f $$(ADIR_$(1))/post-install ] || sed '/^\s*#!/d' "$$(ADIR_$(1))/post-install"; \
+		[ ! -f $$(ADIR_$(1))/post-install ] || sed -z 's/^\s*#!/#!/' "$$(ADIR_$(1))/post-install"; \
 	) > $$(ADIR_$(1))/post-upgrade;
 
 	( \
@@ -551,34 +345,34 @@ else
 		echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \
 		echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
 		echo 'export root="$$$${IPKG_INSTROOT}"'; \
-		echo 'export pkgname="$(1)$$(ABIV_$(1))"'; \
+		echo 'export pkgname="$(1)"'; \
 		echo "default_prerm"; \
-		[ ! -f $$(ADIR_$(1))/prerm-pkg ] || sed '/^\s*#!/d' "$$(ADIR_$(1))/prerm-pkg"; \
+		[ ! -f $$(ADIR_$(1))/prerm-pkg ] || sed -z 's/^\s*#!/#!/' "$$(ADIR_$(1))/prerm-pkg"; \
 	) > $$(ADIR_$(1))/pre-deinstall;
 
 	[ ! -f $$(ADIR_$(1))/postrm ] || sed -zi 's/^\s*#!/#!/' "$$(ADIR_$(1))/postrm";
 
-	if [ -n "$(USERID)" ]; then echo $(USERID) > $$(IDIR_$(1))/lib/apk/packages/$(1)$$(ABIV_$(1)).rusers; fi;
-	if [ -n "$(ALTERNATIVES)" ]; then echo $(ALTERNATIVES) > $$(IDIR_$(1))/lib/apk/packages/$(1)$$(ABIV_$(1)).alternatives; fi;
-	(cd $$(IDIR_$(1)) && find . -type f,l -printf "/%P\n" | sort > $(TMP_DIR)/$(1).list && mv $(TMP_DIR)/$(1).list $$(IDIR_$(1))/lib/apk/packages/$(1)$$(ABIV_$(1)).list)
+	if [ -n "$(USERID)" ]; then echo $(USERID) > $$(IDIR_$(1))/lib/apk/packages/$(1).rusers; fi;
+	if [ -n "$(ALTERNATIVES)" ]; then echo $(ALTERNATIVES) > $$(IDIR_$(1))/lib/apk/packages/$(1).alternatives; fi;
+	(cd $$(IDIR_$(1)) && find . -type f,l -printf "/%P\n" | sort > $(TMP_DIR)/$(1).list && mv $(TMP_DIR)/$(1).list $$(IDIR_$(1))/lib/apk/packages/$(1).list)
 	# Move conffiles to IDIR and build conffiles_static with csums
 	if [ -f $$(ADIR_$(1))/conffiles ]; then \
-		mv -f $$(ADIR_$(1))/conffiles $$(IDIR_$(1))/lib/apk/packages/$(1)$$(ABIV_$(1)).conffiles; \
-		for file in $$$$(cat $$(IDIR_$(1))/lib/apk/packages/$(1)$$(ABIV_$(1)).conffiles); do \
+		mv -f $$(ADIR_$(1))/conffiles $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles; \
+		for file in $$$$(cat $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles); do \
 			[ -f $$(IDIR_$(1))/$$$$file ] || continue; \
 			csum=$$$$($(MKHASH) sha256 $$(IDIR_$(1))/$$$$file); \
-			echo $$$$file $$$$csum >> $$(IDIR_$(1))/lib/apk/packages/$(1)$$(ABIV_$(1)).conffiles_static; \
+			echo $$$$file $$$$csum >> $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles_static; \
 		done; \
 	fi
 
 	# Some package (base-files) manually append stuff to conffiles
 	# Append stuff from it and delete the CONTROL directory since everything else should be migrated
 	if [ -f $$(IDIR_$(1))/CONTROL/conffiles ]; then \
-		echo $$$$(IDIR_$(1))/CONTROL/conffiles >> $$(IDIR_$(1))/lib/apk/packages/$(1)$$(ABIV_$(1)).conffiles; \
+		echo $$$$(IDIR_$(1))/CONTROL/conffiles >> $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles; \
 		for file in $$$$(cat $$(IDIR_$(1))/CONTROL/conffiles); do \
 			[ -f $$(IDIR_$(1))/$$$$file ] || continue; \
 			csum=$$$$($(MKHASH) sha256 $$(IDIR_$(1))/$$$$file); \
-			echo $$$$file $$$$csum >> $$(IDIR_$(1))/lib/apk/packages/$(1)$$(ABIV_$(1)).conffiles_static; \
+			echo $$$$file $$$$csum >> $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles_static; \
 		done; \
 		rm -rf $$(IDIR_$(1))/CONTROL/conffiles; \
 	fi
@@ -600,8 +394,17 @@ else
 	  --info "origin:$(SOURCE)" \
 	  --info "url:$(URL)" \
 	  --info "maintainer:$(MAINTAINER)" \
-	  $$(if $$(Package/$(1)/PROVIDES),--info "provides:$$(Package/$(1)/PROVIDES)") \
-	  $$(if $$(Package/$(1)/PRIORITY),--info "provider-priority:$$(Package/$(1)/PRIORITY)") \
+	  --info "provides:$$(foreach prov,\
+			$$(filter-out $(1)$$(ABIV_$(1)), \
+			$(PROVIDES)$$(if $$(ABIV_$(1)), \
+				$(1)=$(VERSION) $(foreach provide, \
+					$(PROVIDES), \
+					$(provide)$$(ABIV_$(1))=$(VERSION) \
+				) \
+			) \
+		), \
+		$$(prov) )" \
+	  $(if $(DEFAULT_VARIANT),--info "provider-priority:100",$(if $(PROVIDES),--info "provider-priority:1")) \
 	  $$(APK_SCRIPTS_$(1)) \
 	  --info "depends:$$(foreach depends,$$(subst $$(comma),$$(space),$$(subst $$(space),,$$(subst $$(paren_right),,$$(subst $$(paren_left),,$$(Package/$(1)/DEPENDS))))),$$(depends))" \
 	  --files "$$(IDIR_$(1))" \

include/package.mk

@@ -332,13 +332,6 @@ define BuildPackage
   $(eval $(Package/Default))
   $(eval $(Package/$(1)))
 
-  # Add an implicit self-provide. apk can't handle self provides, be it
-  # versioned or virtual, so opt for a suffix instead. This allows several
-  # variants to provide the same virtual package without adding extra provides
-  # to the default one, e.g. wget implicitly provides wget-any and is marked as
-  # default, so wget-ssl can explicitly provide @wget-any as well.
-  $(eval PROVIDES:=$(strip @$(1)-any $(PROVIDES)))
-
 ifdef DESCRIPTION
 $$(error DESCRIPTION:= is obsolete, use Package/PKG_NAME/description)
 endif

include/quilt.mk

@@ -103,7 +103,6 @@ define Kernel/Patch/Default
 	$(call PatchDir,$(LINUX_DIR),$(GENERIC_PATCH_DIR),generic/)
 	$(call PatchDir,$(LINUX_DIR),$(GENERIC_HACK_DIR),generic-hack/)
 	$(call PatchDir,$(LINUX_DIR),$(PATCH_DIR),platform/)
-	$(if $(QUILT),touch $(LINUX_DIR)/.quilt_used)
 endef
 
 define Quilt/RefreshDir

include/rootfs.mk

@@ -78,7 +78,6 @@ define prepare_rootfs
 		cd $(1); \
 		if [ -n "$(CONFIG_USE_APK)" ]; then \
 			IPKG_POSTINST_PATH=./lib/apk/db/*.post-install; \
-			$(STAGING_DIR_HOST)/bin/gzip -d ./lib/apk/db/scripts.tar; \
 			$(STAGING_DIR_HOST)/bin/tar -C ./lib/apk/db/ -xf ./lib/apk/db/scripts.tar --wildcards "*.post-install"; \
 		else \
 			IPKG_POSTINST_PATH=./usr/lib/opkg/info/*.postinst; \
@@ -92,7 +91,6 @@ define prepare_rootfs
 			fi; \
 			[ -n "$(CONFIG_USE_APK)" ] && $(STAGING_DIR_HOST)/bin/tar --delete -f ./lib/apk/db/scripts.tar $$(basename $$script); \
 		done; \
-		[ -n "$(CONFIG_USE_APK)" ] && $(STAGING_DIR_HOST)/bin/gzip -f -9n -S ".gz" ./lib/apk/db/scripts.tar; \
 		if [ -z "$(CONFIG_USE_APK)" ]; then \
 			$(if $(IB),,awk -i inplace \
 				'/^Status:/ { \

include/toplevel.mk

@@ -201,7 +201,7 @@ else
   DOWNLOAD_DIRS = package/download
 endif
 
-download: .config FORCE $(if $(wildcard $(STAGING_DIR_HOST)/bin/flock),,tools/flock/compile) $(if $(wildcard $(STAGING_DIR_HOST)/bin/zstd),,tools/zstd/compile)
+download: .config FORCE $(if $(wildcard $(STAGING_DIR_HOST)/bin/flock),,tools/flock/compile)
 	@+$(foreach dir,$(DOWNLOAD_DIRS),$(SUBMAKE) $(dir);)
 
 clean dirclean: .config

include/version.mk

@@ -27,13 +27,13 @@ PKG_CONFIG_DEPENDS += \
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),25.12-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
 VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/25.12-SNAPSHOT)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/snapshots)
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)

package/Makefile

@@ -129,7 +129,6 @@ $(curdir)/index: FORCE
 	@echo Generating package index...
 ifneq ($(CONFIG_USE_APK),)
 	@for d in $(PACKAGE_SUBDIRS); do \
-		set -e; \
 		mkdir -p $$d; \
 		cd $$d || continue; \
 		ls *.apk >/dev/null 2>&1 || continue; \

package/base-files/files/bin/board_detect

@@ -1,22 +1,14 @@
 #!/bin/sh
 
-REAL_CFG=$1
+CFG=$1
 
-[ -n "$REAL_CFG" ] || REAL_CFG=/etc/board.json
+[ -n "$CFG" ] || CFG=/etc/board.json
 
-if [ -d "/etc/board.d/" ] && [ ! -s "$REAL_CFG" ]; then
-	# Use temp file to prevent incomplete file on power-cut, CFG is used by the sourced script to read/write the file
-	CFG="$(dirname "$REAL_CFG")/.$(basename "$REAL_CFG").tmp"
-	rm -f "$CFG" || exit
+[ -d "/etc/board.d/" -a ! -s "$CFG" ] && {
 	for a in $(ls /etc/board.d/*); do
-		[ -s "$a" ] || continue
-		(. "$a")
+		[ -s $a ] || continue;
+		$(. $a)
 	done
-fi
+}
 
-if [ -s "$CFG" ]; then
-	mv "$CFG" "$REAL_CFG" || exit
-else
-	rm -f "$CFG"
-	exit 1
-fi
+[ -s "$CFG" ] || return 1

package/base-files/files/etc/profile

@@ -1,39 +1,61 @@
-unset FAILSAFE
 [ -e /tmp/.failsafe ] && export FAILSAFE=1
 
 [ -f /etc/banner ] && cat /etc/banner
-[ -n "$FAILSAFE" ] && [ -f /etc/banner.failsafe ] && cat /etc/banner.failsafe
+[ -n "$FAILSAFE" ] && cat /etc/banner.failsafe
 
-if grep -Fsq '/ overlay ro,' /proc/mounts ; then
-cat << EOF
-
- === WARNING! ======================================
- Your JFFS2-partition seems full and overlayfs is
- mounted as READ-ONLY!
- Please try to remove files from /overlay/upper/...
- and reboot!
- ---------------------------------------------------
-
-EOF
-fi
+grep -Fsq '/ overlay ro,' /proc/mounts && {
+	echo 'Your JFFS2-partition seems full and overlayfs is mounted read-only.'
+	echo 'Please try to remove files from /overlay/upper/... and reboot!'
+}
 
 export PATH="%PATH%"
-HOME=$(grep -E "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6)
-HOME=${HOME:-/root}
-export HOME
+export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6)
+export HOME=${HOME:-/root}
 export PS1='\u@\h:\w\$ '
 export ENV=/etc/shinit
 
 case "$TERM" in
 	xterm*|rxvt*)
-		export PS1='\[\e]0;\u@\h: \w\a\]'"$PS1"
-	;;
+		export PS1='\[\e]0;\u@\h: \w\a\]'$PS1
+		;;
 esac
 
-if [ -z "$FAILSAFE" ] ; then
-	for FILE in /etc/profile.d/*.sh ; do
-		[ -f "${FILE%.sh}.hush" ] && continue
-		[ -f "$FILE" ] && . "$FILE"
+[ -n "$FAILSAFE" ] || {
+	for FILE in /etc/profile.d/*.sh; do
+		[ -e "$FILE" ] && . "$FILE"
 	done
 	unset FILE
+}
+
+if ( grep -qs '^root::' /etc/shadow && \
+     [ -z "$FAILSAFE" ] )
+then
+cat << EOF
+=== WARNING! =====================================
+There is no root password defined on this device!
+Use the "passwd" command to set up a new password
+in order to prevent unauthorized SSH logins.
+--------------------------------------------------
+EOF
+fi
+
+if [ -x /usr/bin/apk ]; then
+cat << EOF
+
+ OpenWrt recently switched to the "apk" package manager!
+
+ OPKG Command           APK Equivalent      Description
+ ------------------------------------------------------------------
+ opkg install <pkg>     apk add <pkg>       Install a package
+ opkg remove <pkg>      apk del <pkg>       Remove a package
+ opkg upgrade           apk upgrade         Upgrade all packages
+ opkg files <pkg>       apk info -L <pkg>   List package contents
+ opkg list-installed    apk info            List installed packages
+ opkg update            apk update          Update package lists
+ opkg search <pkg>      apk search <pkg>    Search for packages
+ ------------------------------------------------------------------
+
+For more https://openwrt.org/docs/guide-user/additional-software/opkg-to-apk-cheatsheet
+
+EOF
 fi

package/base-files/files/etc/profile.d/00-passwordless-root.sh

@@ -1,11 +0,0 @@
-if grep -Esq '^root::' /etc/shadow ; then
-cat << EOF
-
- === WARNING! =====================================
- There is no root password defined on this device!
- Use the "passwd" command to set up a new password
- in order to prevent unauthorized SSH logins.
- --------------------------------------------------
-
-EOF
-fi

package/base-files/files/etc/profile.d/apk-cheatsheet.sh

@@ -1,21 +0,0 @@
-if [ -x /usr/bin/apk ] ; then
-cat << EOF
-
- OpenWrt recently switched to the "apk" package manager!
-
- OPKG Command           APK Equivalent      Description
- ------------------------------------------------------------------
- opkg install <pkg>     apk add <pkg>       Install a package
- opkg remove <pkg>      apk del <pkg>       Remove a package
- opkg upgrade           apk upgrade         Upgrade all packages
- opkg files <pkg>       apk info -L <pkg>   List package contents
- opkg list-installed    apk info            List installed packages
- opkg update            apk update          Update package lists
- opkg search <pkg>      apk search <pkg>    Search for packages
- ------------------------------------------------------------------
-
-For more information visit:
-https://openwrt.org/docs/guide-user/additional-software/opkg-to-apk-cheatsheet
-
-EOF
-fi

package/base-files/files/etc/uci-defaults/14_network-generate-clientid

@@ -1,4 +1,4 @@
-[ "$(uci -q get network.globals.dhcp_default_duid || echo "auto")" != "auto" ] && exit 0
+[ "$(uci -q get network.globals.dhcp_default_duid)" != "auto" ] && exit 0
 
 uci -q batch <<-EOF >/dev/null
 	# DUID-UUID - RFC6355

package/base-files/files/etc/uci-defaults/15_migrate-time-zonename

@@ -1,6 +0,0 @@
-zonename="$(uci -q get system.@system[0].zonename)"
-case "$zonename" in
-        *[[:space:]]*) uci set system.@system[0].zonename="${zonename// /_}" ;;
-esac
-
-exit 0

package/base-files/files/lib/functions.sh

@@ -382,7 +382,7 @@ default_postinst() {
 			uci commit
 		fi
 
-		rm -f /tmp/luci-indexcache.*
+		rm -f /tmp/luci-indexcache
 	fi
 
 	if [ -f "$root/usr/lib/opkg/info/${pkgname}.postinst-pkg" ]; then

package/base-files/files/lib/functions/network.sh

@@ -24,17 +24,6 @@ __network_ifstatus() {
 	eval "$__tmp"
 }
 
-# determine the IAID of the given logical interface
-# 1: destination variable
-# 2: interface
-network_generate_iface_iaid() {
-	local __iaid
-
-	__iaid=$(printf '%s' "$2" | md5sum | cut -c 1-8)
-
-	export "$1=$__iaid"
-}
-
 # determine first IPv4 address of given logical interface
 # 1: destination variable
 # 2: interface

package/base-files/image-config.in

@@ -5,14 +5,6 @@
 # See /LICENSE for more information.
 #
 
-config EXTRA_IMAGE_NAME
-	string
-	prompt "Extra image filename" if IMAGEOPT
-	default ""
-	help
-		Add this to the output image filenames, to distinguish between
-		different builds for the same hardware type.
-
 config TARGET_DEFAULT_LAN_IP_FROM_PREINIT
 	bool "Use preinit IP configuration as default LAN IP" if IMAGEOPT
 	default n
@@ -198,7 +190,7 @@ if VERSIONOPT
 	config VERSION_REPO
 		string
 		prompt "Release repository"
-		default "https://downloads.openwrt.org/releases/25.12-SNAPSHOT"
+		default "https://downloads.openwrt.org/snapshots"
 		help
 			This is the repository address embedded in the image, it defaults
 			to the trunk snapshot repo; the url may contain the following placeholders:

package/boot/arm-trusted-firmware-mediatek/Makefile

@@ -30,7 +30,6 @@ define Trusted-Firmware-A/Default
   BOOT_DEVICE:=
   DDR3_FLYBY:=
   DDR3_FREQ_1866:=
-  DDR4_4BG_MODE:=
   DDR_TYPE:=
   NAND_TYPE:=
   BOARD_QFN:=
@@ -140,14 +139,6 @@ define Trusted-Firmware-A/mt7622-sdmmc-2ddr
   DDR3_FLYBY:=1
 endef
 
-define Trusted-Firmware-A/mt7981-nor-ddr4
-  NAME:=MediaTek MT7981 (SPI-NOR, DDR4)
-  BOOT_DEVICE:=nor
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7981
-  DDR_TYPE:=ddr4
-endef
-
 define Trusted-Firmware-A/mt7981-ram-ddr4
   NAME:=MediaTek MT7981 (RAM, DDR4)
   BOOT_DEVICE:=ram
@@ -167,14 +158,6 @@ define Trusted-Firmware-A/mt7981-emmc-ddr4
   DDR_TYPE:=ddr4
 endef
 
-define Trusted-Firmware-A/mt7981-sdmmc-ddr4
-  NAME:=MediaTek MT7981 (SD card, DDR4)
-  BOOT_DEVICE:=sdmmc
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7981
-  DDR_TYPE:=ddr4
-endef
-
 define Trusted-Firmware-A/mt7981-spim-nand-ddr4
   NAME:=MediaTek MT7981 (SPI-NAND via SPIM, DDR4)
   BOOT_DEVICE:=spim-nand
@@ -203,6 +186,14 @@ define Trusted-Firmware-A/mt7981-ram-ddr3
   DEFAULT:=TARGET_mediatek_filogic
 endef
 
+define Trusted-Firmware-A/mt7981-nor-ddr4
+  NAME:=MediaTek MT7981 (SPI-NOR, DDR4)
+  BOOT_DEVICE:=nor
+  BUILD_SUBTARGET:=filogic
+  PLAT:=mt7981
+  DDR_TYPE:=ddr4
+endef
+
 define Trusted-Firmware-A/mt7981-emmc-ddr3
   NAME:=MediaTek MT7981 (eMMC, DDR3)
   BOOT_DEVICE:=emmc
@@ -253,17 +244,8 @@ define Trusted-Firmware-A/mt7981-spim-nand-ddr3-1866mhz
   DDR3_FREQ_1866:=1
 endef
 
-define Trusted-Firmware-A/mt7981-spim-nand-ubi-ddr4
-  NAME:=MediaTek MT7981 (SPI-NAND via SPIM, DDR4)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7981
-  DDR_TYPE:=ddr4
-  USE_UBI:=1
-endef
-
-define Trusted-Firmware-A/mt7981-cudy-ddr3
-  NAME:=Cudy (SPI-NAND via SPIM, DDR3)
+define Trusted-Firmware-A/mt7981-cudy-tr3000-v1
+  NAME:=Cudy TR3000 v1 (SPI-NAND via SPIM, DDR3)
   BOOT_DEVICE:=spim-nand
   BUILD_SUBTARGET:=filogic
   PLAT:=mt7981
@@ -283,6 +265,15 @@ define Trusted-Firmware-A/mt7986-ram-ddr4
   DEFAULT:=TARGET_mediatek_filogic
 endef
 
+define Trusted-Firmware-A/mt7981-spim-nand-ubi-ddr4
+  NAME:=MediaTek MT7981 (SPI-NAND via SPIM, DDR4)
+  BOOT_DEVICE:=spim-nand
+  BUILD_SUBTARGET:=filogic
+  PLAT:=mt7981
+  DDR_TYPE:=ddr4
+  USE_UBI:=1
+endef
+
 define Trusted-Firmware-A/mt7986-nor-ddr4
   NAME:=MediaTek MT7986 (SPI-NOR, DDR4)
   BOOT_DEVICE:=nor
@@ -408,14 +399,7 @@ define Trusted-Firmware-A/mt7987-emmc-comb
   BOOT_DEVICE:=emmc
   BUILD_SUBTARGET:=filogic
   PLAT:=mt7987
-endef
-
-define Trusted-Firmware-A/mt7987-emmc-ddr4-4bg
-  NAME:=MediaTek MT7987 (eMMC, DDR4 4GB)
-  BOOT_DEVICE:=emmc
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7987
-  DDR4_4BG_MODE:=1
+  DRAM_USE_COMB:=1
 endef
 
 define Trusted-Firmware-A/mt7987-nor-comb
@@ -423,6 +407,7 @@ define Trusted-Firmware-A/mt7987-nor-comb
   BOOT_DEVICE:=nor
   BUILD_SUBTARGET:=filogic
   PLAT:=mt7987
+  DRAM_USE_COMB:=1
 endef
 
 define Trusted-Firmware-A/mt7987-sdmmc-comb
@@ -430,22 +415,7 @@ define Trusted-Firmware-A/mt7987-sdmmc-comb
   BOOT_DEVICE:=sdmmc
   BUILD_SUBTARGET:=filogic
   PLAT:=mt7987
-endef
-
-define Trusted-Firmware-A/mt7987-sdmmc-ddr4-4bg
-  NAME:=MediaTek MT7987 (SD card, DDR4 4GB)
-  BOOT_DEVICE:=sdmmc
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7987
-  DDR4_4BG_MODE:=1
-endef
-
-define Trusted-Firmware-A/mt7987-spim-nand0
-  NAME:=MediaTek MT7987 (SPI-NAND via SPIM)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7987
-  SPIM_CTRL:=0
+  DRAM_USE_COMB:=1
 endef
 
 define Trusted-Firmware-A/mt7987-spim-nand0-ubi-comb
@@ -453,6 +423,7 @@ define Trusted-Firmware-A/mt7987-spim-nand0-ubi-comb
   BOOT_DEVICE:=spim-nand
   BUILD_SUBTARGET:=filogic
   PLAT:=mt7987
+  DRAM_USE_COMB:=1
   USE_UBI:=1
   SPIM_CTRL:=0
 endef
@@ -462,6 +433,7 @@ define Trusted-Firmware-A/mt7987-spim-nand2-ubi-comb
   BOOT_DEVICE:=spim-nand
   BUILD_SUBTARGET:=filogic
   PLAT:=mt7987
+  DRAM_USE_COMB:=1
   USE_UBI:=1
   SPIM_CTRL:=2
 endef
@@ -471,6 +443,7 @@ define Trusted-Firmware-A/mt7987-ram-comb
   BOOT_DEVICE:=ram
   BUILD_SUBTARGET:=filogic
   PLAT:=mt7987
+  DRAM_USE_COMB:=1
   RAM_BOOT_UART_DL:=1
   HIDDEN:=
   DEFAULT:=TARGET_mediatek_filogic
@@ -670,9 +643,8 @@ TFA_TARGETS:= \
 	mt7981-spim-nand-ubi-ddr4 \
 	mt7981-ram-ddr4 \
 	mt7981-emmc-ddr4 \
-	mt7981-sdmmc-ddr4 \
 	mt7981-spim-nand-ddr4 \
-	mt7981-cudy-ddr3 \
+	mt7981-cudy-tr3000-v1 \
 	mt7986-ram-ddr3 \
 	mt7986-emmc-ddr3 \
 	mt7986-nor-ddr3 \
@@ -689,11 +661,8 @@ TFA_TARGETS:= \
 	mt7986-spim-nand-ubi-ddr4 \
 	mt7986-spim-nand-4k-ddr4 \
 	mt7987-emmc-comb \
-	mt7987-emmc-ddr4-4bg \
 	mt7987-nor-comb \
 	mt7987-sdmmc-comb \
-	mt7987-sdmmc-ddr4-4bg \
-	mt7987-spim-nand0 \
 	mt7987-spim-nand0-ubi-comb \
 	mt7987-spim-nand2-ubi-comb \
 	mt7987-ram-comb \
@@ -727,7 +696,6 @@ TFA_MAKE_FLAGS += \
 	HAVE_DRAM_OBJ_FILE=yes \
 	$(if $(DDR3_FLYBY),DDR3_FLYBY=1) \
 	$(if $(DDR3_FREQ_1866),DDR3_FREQ_1866=1) \
-	$(if $(DDR4_4BG_MODE),DDR4_4BG_MODE=1) \
 	$(if $(DRAM_USE_COMB),DRAM_USE_COMB=1) \
 	$(if $(RAM_BOOT_UART_DL),RAM_BOOT_UART_DL=1) \
 	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7622,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x80000)) \

package/boot/arm-trusted-firmware-microchipsw/Makefile

@@ -1,78 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=arm-trusted-firmware-microchipsw
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=https://github.com/microchip-ung/arm-trusted-firmware.git
-PKG_SOURCE_DATE:=2026-01-07
-PKG_SOURCE_VERSION:=7696c9aaaae7c677f4c373a61a1289cba7f824aa
-PKG_MIRROR_HASH:=331548d7c73896bd5e4438c0ec9c71bbe58d3bf9a29350496ad94c382e922b9c
-
-PKG_BUILD_DEPENDS:=ruby/host
-PKG_MAINTAINER:=Robert Marko <robert.marko@sartura.hr>
-
-include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/trusted-firmware-a.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Trusted-Firmware-A/Default
-  BUILD_TARGET:=microchipsw
-  TFA_IMAGE:=fip.bin fwu_fip.bin fwu.html
-endef
-
-define Trusted-Firmware-A/ev23x71a
-  NAME:=Microchip EV23X71A
-  BUILD_SUBTARGET:=lan969x
-  BUILD_DEVICES:=microchip_ev23x71a
-  PLAT:=lan969x_a0
-  DEPENDS:=+u-boot-ev23x71a
-endef
-
-define Trusted-Firmware-A/tactical-1000
-  NAME:=Novarq Tactical 1000
-  BUILD_SUBTARGET:=lan969x
-  BUILD_DEVICES:=novarq_tactical-1000
-  PLAT:=novarq_tactical_1000_v3
-  DEPENDS:=+u-boot-tactical-1000
-endef
-
-TFA_TARGETS:= \
-	ev23x71a \
-	tactical-1000
-
-MBEDTLS_NAME:=mbedtls
-MBEDTLS_RELEASE:=2.28.10
-MBEDTLS_SOURCE:=$(MBEDTLS_NAME)-$(MBEDTLS_RELEASE).tar.zst
-
-define Download/mbedtls
-  FILE:=$(MBEDTLS_SOURCE)
-  PROTO:=git
-  URL:=https://github.com/Mbed-TLS/mbedtls.git
-  SOURCE_VERSION:=2fc8413bfcb51354c8e679141b17b3f1a5942561
-  MIRROR_HASH:=40b94a76572ad1ca89738929ab81d6024f678f22691eb3bd633c076ac18a334a
-  SUBDIR:=$(MBEDTLS_NAME)
-endef
-
-define Build/Prepare
-	# Download mbedtls
-	$(eval $(call Download,mbedtls))
-
-	$(call Build/Prepare/Default,)
-
-	$(TAR) -C $(PKG_BUILD_DIR) -xf $(DL_DIR)/$(MBEDTLS_SOURCE)
-endef
-
-TFA_MAKE_FLAGS += \
-	MBEDTLS_DIR=$(PKG_BUILD_DIR)/$(MBEDTLS_NAME) \
-	BL33=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-u-boot.bin \
-	KEY_ALG=ecdsa GENERATE_COT=1 TRUSTED_BOARD_BOOT=1 \
-	all fip fwu_fip
-
-define Package/trusted-firmware-a/install
-	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/$(PLAT)/release/fip.bin $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-fip.bin
-	$(CP) $(patsubst %,$(PKG_BUILD_DIR)/build/$(PLAT)/release/%,$(TFA_IMAGE)) $(1)/
-endef
-
-$(eval $(call BuildPackage/Trusted-Firmware-A))

package/boot/arm-trusted-firmware-microchipsw/patches/0001-microchip-lan969x-add-Novarq-Tactical-1000-v3.patch

@@ -1,171 +0,0 @@
-From 190202583edb9dcab5ca49638169d08a332f0fdf Mon Sep 17 00:00:00 2001
-From: Robert Marko <robert.marko@sartura.hr>
-Date: Sun, 2 Nov 2025 16:57:45 +0100
-Subject: [PATCH] microchip: lan969x: add Novarq Tactical 1000 v3
-
-Add support for Novarq Tactical 1000 v3 board as a separate platform since
-it uses 2GB of RAM and requires a different RAM configuration.
-
-Signed-off-by: Robert Marko <robert.marko@sartura.hr>
----
- .../fdts/lan969x-tactical-1000-v3-ddr.dtsi    | 90 +++++++++++++++++++
- .../novarq_tactical_1000_v3_tb_fw_config.dts  | 30 +++++++
- .../novarq_tactical_1000_v3/platform.mk       | 12 +++
- scripts/fwu/fwu.js                            |  2 +-
- 4 files changed, 133 insertions(+), 1 deletion(-)
- create mode 100644 plat/microchip/lan969x/fdts/lan969x-tactical-1000-v3-ddr.dtsi
- create mode 100644 plat/microchip/lan969x/novarq_tactical_1000_v3/fdts/novarq_tactical_1000_v3_tb_fw_config.dts
- create mode 100644 plat/microchip/lan969x/novarq_tactical_1000_v3/platform.mk
-
---- /dev/null
-+++ b/plat/microchip/lan969x/fdts/lan969x-tactical-1000-v3-ddr.dtsi
-@@ -0,0 +1,90 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (C) 2022 Microchip Technology Inc. and its subsidiaries.
-+ *
-+ */
-+
-+&ddr {
-+	microchip,mem-name = "lan969x_tactical_1000_2gb 2025-11-02-13:03:23 7391dfb-dirty";
-+	microchip,mem-speed = <2400>;
-+	microchip,mem-size = <0x80000000>;
-+	microchip,mem-bus-width = <16>;
-+
-+	microchip,main-reg = <
-+		0x00001091	/* crcparctl1 */
-+		0x00000001	/* dbictl */
-+		0x00000040	/* dfimisc */
-+		0x0391820f	/* dfitmg0 */
-+		0x00040201	/* dfitmg1 */
-+		0x40400003	/* dfiupd0 */
-+		0x004000ff	/* dfiupd1 */
-+		0x003f7f40	/* ecccfg0 */
-+		0x00020248	/* init0 */
-+		0x00e80000	/* init1 */
-+		0x0c340101	/* init3 */
-+		0x10180200	/* init4 */
-+		0x00110000	/* init5 */
-+		0x00000402	/* init6 */
-+		0x00000c19	/* init7 */
-+		0x81040010	/* mstr */
-+		0x00000000	/* pccfg */
-+		0x00000000	/* pwrctl */
-+		0x00210020	/* rfshctl0 */
-+		0x00000000	/* rfshctl3 */
-+	>;
-+
-+	microchip,timing-reg = <
-+		0x17131413	/* dramtmg0 */
-+		0x0007051b	/* dramtmg1 */
-+		0x1a000010	/* dramtmg12 */
-+		0x090b0512	/* dramtmg2 */
-+		0x0000400c	/* dramtmg3 */
-+		0x08040409	/* dramtmg4 */
-+		0x07070404	/* dramtmg5 */
-+		0x07060c0b	/* dramtmg8 */
-+		0x0003040d	/* dramtmg9 */
-+		0x07000610	/* odtcfg */
-+		0x0049014b	/* rfshtmg */
-+	>;
-+
-+	microchip,mapping-reg = <
-+		0x0000001f	/* addrmap0 */
-+		0x003f0909	/* addrmap1 */
-+		0x00000700	/* addrmap2 */
-+		0x00000000	/* addrmap3 */
-+		0x00001f1f	/* addrmap4 */
-+		0x07070707	/* addrmap5 */
-+		0x07070707	/* addrmap6 */
-+		0x00000f07	/* addrmap7 */
-+		0x00003f01	/* addrmap8 */
-+	>;
-+
-+	microchip,phy-reg = <
-+		0x0000040c	/* dcr */
-+		0x0064401b	/* dsgcr */
-+		0x8000b0cf	/* dtcr0 */
-+		0x00010a37	/* dtcr1 */
-+		0x00c01884	/* dxccr */
-+		0x000010ba	/* pgcr2 */
-+		0x00000000	/* schcr1 */
-+		0x00079900	/* zq0pr */
-+		0x10077900	/* zq1pr */
-+		0x00000000	/* zq2pr */
-+		0x00058f00	/* zqcr */
-+	>;
-+
-+	microchip,phy_timing-reg = <
-+		0x0827100a	/* dtpr0 */
-+		0x28250018	/* dtpr1 */
-+		0x000702a1	/* dtpr2 */
-+		0x03000101	/* dtpr3 */
-+		0x02950808	/* dtpr4 */
-+		0x00361009	/* dtpr5 */
-+		0x4ae25710	/* ptr0 */
-+		0x74f4950e	/* ptr1 */
-+		0x00083def	/* ptr2 */
-+		0x2a192000	/* ptr3 */
-+		0x1003a000	/* ptr4 */
-+	>;
-+
-+};
---- /dev/null
-+++ b/plat/microchip/lan969x/novarq_tactical_1000_v3/fdts/novarq_tactical_1000_v3_tb_fw_config.dts
-@@ -0,0 +1,30 @@
-+/*
-+ * Copyright (c) 2022, Microchip Technology Inc. and its subsidiaries.
-+ *
-+ * SPDX-License-Identifier: BSD-3-Clause
-+ */
-+
-+/dts-v1/;
-+
-+#include "lan969x.dtsi"
-+#include "lan969x-tactical-1000-v3-ddr.dtsi"
-+
-+&emmc_clk {
-+	clock-frequency = <100000000>;
-+};
-+
-+&sdmmc0 {
-+	status = "okay";
-+	bus-width = <8>;
-+};
-+
-+&qspi0 {
-+	status = "okay";
-+	spi-flash@0 {
-+		compatible = "jedec,spi-nor";
-+		reg = <0>;
-+		spi-max-frequency = <100000000>;
-+		spi-tx-bus-width = <4>;
-+		spi-rx-bus-width = <4>;
-+	};
-+};
---- /dev/null
-+++ b/plat/microchip/lan969x/novarq_tactical_1000_v3/platform.mk
-@@ -0,0 +1,12 @@
-+#
-+# Copyright (c) 2021, Microchip Technology Inc. and its subsidiaries.
-+#
-+# SPDX-License-Identifier: BSD-3-Clause
-+#
-+
-+include plat/microchip/lan969x/common/common.mk
-+
-+# This is used in lan969x code
-+$(eval $(call add_define,LAN969X_ASIC))
-+# This is used in common drivers
-+$(eval $(call add_define,LAN966X_ASIC))
---- a/scripts/fwu/fwu.js
-+++ b/scripts/fwu/fwu.js
-@@ -91,7 +91,7 @@ const platforms = [
- 	"ddr_diag":	ddr_diag_regs_lan969x,
- 	"ddr_regs":	ddr_regs_lan969x,
- 	"ddr_speed":	lan969x_speeds,
--	"bl2u_compat":	["lan969x_a0", "lan969x_svb"],
-+	"bl2u_compat":	["lan969x_a0", "lan969x_svb", "novarq_tactical_1000_v3"],
-     },
- ];
- 

package/boot/arm-trusted-firmware-microchipsw/patches/0002-cert_create-add-LibreSSL-3.9-compatibility.patch

@@ -1,95 +0,0 @@
-From 40166fd8d88f33c621d3cca0b936f31816f3fe2e Mon Sep 17 00:00:00 2001
-From: Robert Marko <robert.marko@sartura.hr>
-Date: Mon, 12 Jan 2026 14:40:23 +0100
-Subject: [PATCH] cert_create: add LibreSSL 3.9+ compatibility
-
-LibreSSL 3.9+ has dropped the whole support for X509V3 extensions.
-
-Generated by Gemini 3 Pro.
-
-Signed-off-by: Robert Marko <robert.marko@sartura.hr>
----
- tools/cert_create/src/ext.c | 26 ++++++++++++++++++++++----
- 1 file changed, 22 insertions(+), 4 deletions(-)
-
---- a/tools/cert_create/src/ext.c
-+++ b/tools/cert_create/src/ext.c
-@@ -51,15 +51,18 @@ int ext_init(void)
- {
- 	cmd_opt_t cmd_opt;
- 	ext_t *ext;
-+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x40200000L
- 	X509V3_EXT_METHOD *m;
--	int nid, ret;
-+	int ret, nid;
-+#endif
- 	unsigned int i;
- 
- 	extensions = malloc((num_def_extensions * sizeof(def_extensions[0]))
- #ifdef PDEF_EXTS
- 			    + (num_pdef_extensions * sizeof(pdef_extensions[0]))
- #endif
--			    );
-+		);
-+
- 	if (extensions == NULL) {
- 		ERROR("%s:%d Failed to allocate memory.\n", __func__, __LINE__);
- 		return 1;
-@@ -69,7 +72,7 @@ int ext_init(void)
- 	       (num_def_extensions * sizeof(def_extensions[0])));
- #ifdef PDEF_EXTS
- 	memcpy(&extensions[num_def_extensions], &pdef_extensions[0],
--		(num_pdef_extensions * sizeof(pdef_extensions[0])));
-+	       (num_pdef_extensions * sizeof(pdef_extensions[0])));
- 	num_extensions = num_def_extensions + num_pdef_extensions;
- #else
- 	num_extensions = num_def_extensions;
-@@ -86,11 +89,15 @@ int ext_init(void)
- 			cmd_opt.help_msg = ext->help_msg;
- 			cmd_opt_add(&cmd_opt);
- 		}
-+
- 		/* Register the extension OID in OpenSSL */
- 		if (ext->oid == NULL) {
- 			continue;
- 		}
-+
-+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x40200000L
- 		nid = OBJ_create(ext->oid, ext->sn, ext->ln);
-+
- 		if (ext->alias) {
- 			X509V3_EXT_add_alias(nid, ext->alias);
- 		} else {
-@@ -117,7 +124,16 @@ int ext_init(void)
- 				return 1;
- 			}
- 		}
-+#else
-+		/*
-+		 * LibreSSL 4.2.0+ removed X509V3_EXT_add/alias.
-+		 * We still register the OID, but ignore the returned NID
-+		 * as we skip method registration.
-+		 */
-+		OBJ_create(ext->oid, ext->sn, ext->ln);
-+#endif
- 	}
-+
- 	return 0;
- }
- 
-@@ -323,12 +339,14 @@ void ext_cleanup(void)
- 	for (i = 0; i < num_extensions; i++) {
- 		if (extensions[i].arg != NULL) {
- 			void *ptr = (void *)extensions[i].arg;
--
- 			extensions[i].arg = NULL;
- 			free(ptr);
- 		}
- 	}
- 	free(extensions);
-+
-+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x40200000L
- 	X509V3_EXT_cleanup();
-+#endif
- }
- 

package/boot/arm-trusted-firmware-microchipsw/patches/0003-cert_create-pass-pthread-in-LDFLAGS.patch

@@ -1,36 +0,0 @@
-From 11ff8b5e67830d5a09f39e8c1f000b0ddcf8e88f Mon Sep 17 00:00:00 2001
-From: Robert Marko <robert.marko@sartura.hr>
-Date: Mon, 12 Jan 2026 15:16:07 +0100
-Subject: [PATCH] cert_create: pass pthread in LDFLAGS
-
-OpenWrt-s LibreSSL is linked against pthread, so we have to make sure to
-pass -lpthread in LDFLAGS to avoid:
-/usr/bin/ld: /openwrt/staging_dir/host/lib/libcrypto.a(libcrypto_la-crypto_init.o): in function `OPENSSL_init_crypto':
-crypto_init.c:(.text+0x67): undefined reference to `pthread_once'
-/usr/bin/ld: /openwrt/staging_dir/host/lib/libcrypto.a(libcrypto_la-err.o): in function `ERR_load_ERR_strings':
-err.c:(.text+0x812): undefined reference to `pthread_once'
-/usr/bin/ld: /openwrt/staging_dir/host/lib/libcrypto.a(libcrypto_la-conf_sap.o): in function `OpenSSL_config':
-conf_sap.c:(.text+0xc0): undefined reference to `pthread_once'
-/usr/bin/ld: /openwrt/staging_dir/host/lib/libcrypto.a(libcrypto_la-conf_sap.o): in function `OpenSSL_no_config':
-conf_sap.c:(.text+0x107): undefined reference to `pthread_once'
-/usr/bin/ld: /openwrt/staging_dir/host/lib/libcrypto.a(libcrypto_la-err_all.o): in function `ERR_load_crypto_strings':
-err_all.c:(.text+0xa3): undefined reference to `pthread_once'
-collect2: error: ld returned 1 exit status
-make[4]: *** [Makefile:93: cert_create] Error 1
-
-Signed-off-by: Robert Marko <robert.marko@sartura.hr>
----
- tools/cert_create/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/tools/cert_create/Makefile
-+++ b/tools/cert_create/Makefile
-@@ -79,7 +79,7 @@ INC_DIR += -I ./include -I ${PLAT_INCLUD
- # located under the main project directory (i.e.: ${OPENSSL_DIR}, not
- # ${OPENSSL_DIR}/lib/).
- LIB_DIR := -L ${OPENSSL_DIR}/lib -L ${OPENSSL_DIR}
--LIB := -lssl -lcrypto
-+LIB := -lssl -lcrypto -pthread
- 
- HOSTCC ?= gcc
- 

package/boot/arm-trusted-firmware-microchipsw/patches/0004-microchip-lan969x-do-not-rely-on-Ruby-shebang.patch

@@ -1,29 +0,0 @@
-From f78f934710394822a36bd74043ed93a812c1c690 Mon Sep 17 00:00:00 2001
-From: Robert Marko <robert.marko@sartura.hr>
-Date: Mon, 12 Jan 2026 15:36:35 +0100
-Subject: [PATCH] microchip: lan969x: do not rely on Ruby shebang
-
-Host Ruby build in the staging dir must be used, so we cannot rely on the
-shebang as that will fail.
-
-So, call the script via Ruby executable instead.
-
-Signed-off-by: Robert Marko <robert.marko@sartura.hr>
----
- plat/microchip/lan969x/common/common.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/plat/microchip/lan969x/common/common.mk
-+++ b/plat/microchip/lan969x/common/common.mk
-@@ -218,9 +218,9 @@ FWU_HTML := ${BUILD_PLAT}/fwu.html
- FWU_JS   := ${BUILD_PLAT}/fwu_app.js
- 
- ${FWU_JS}: ${BUILD_PLAT}/${FWU_FIP_NAME}
--	./plat/microchip/scripts/mkjs.rb -p ${PLAT} -o ${FWU_JS} $<
-+	$(Q)ruby ./plat/microchip/scripts/mkjs.rb -p ${PLAT} -o ${FWU_JS} $<
- 
- ${FWU_HTML}: ${FWU_JS}
--	./plat/microchip/scripts/html_inline.rb -i ${BUILD_PLAT} ./scripts/fwu/serial.html > ${FWU_HTML}
-+	$(Q)ruby ./plat/microchip/scripts/html_inline.rb -i ${BUILD_PLAT} ./scripts/fwu/serial.html > ${FWU_HTML}
- 
- all: ${FWU_HTML}

package/boot/arm-trusted-firmware-stm32/Makefile

@@ -7,10 +7,10 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=2.13
-PKG_RELEASE:=1
+PKG_VERSION:=2.12
+PKG_RELEASE:=2
 
-PKG_HASH:=afb5c408392fcec840bd30de9b02a236b0108142024f9853b542b596b0d894e3
+PKG_HASH:=b4c047493cac1152203e1ba121ae57267e4899b7bf56eb365e22a933342d31c9
 PKG_MAINTAINER:=Thomas Richard <thomas.richard@bootlin.com>
 
 include $(INCLUDE_DIR)/kernel.mk

package/boot/arm-trusted-firmware-stm32/patches/0001-fix-stm32mp1-fdts-re-enable-RTC-clock.patch

@@ -0,0 +1,51 @@
+From 33573ea6842198cfdb5b3fdd320db9e2045855e9 Mon Sep 17 00:00:00 2001
+From: Valentin Caron <valentin.caron@foss.st.com>
+Date: Wed, 11 Dec 2024 11:20:04 +0100
+Subject: [PATCH] fix(stm32mp1-fdts): re-enable RTC clock
+
+On STM32MP15 ST boards, RTC clock configuration by OPTEE is not ready
+yet. Re-enable it temporary to get LSE as clock source of RTC.
+
+Signed-off-by: Valentin Caron <valentin.caron@foss.st.com>
+Change-Id: Ib6071229552e456faffb4fdfc8db9808140d54a7
+---
+ fdts/stm32mp157c-ed1.dts  | 2 ++
+ fdts/stm32mp15xx-dkx.dtsi | 2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/fdts/stm32mp157c-ed1.dts
++++ b/fdts/stm32mp157c-ed1.dts
+@@ -194,6 +194,7 @@
+ 		CLK_MPU_PLL1P
+ 		CLK_AXI_PLL2P
+ 		CLK_MCU_PLL3P
++		CLK_RTC_LSE
+ 		CLK_MCO1_DISABLED
+ 		CLK_MCO2_DISABLED
+ 		CLK_CKPER_HSE
+@@ -242,6 +243,7 @@
+ 		DIV(DIV_APB3, 1)
+ 		DIV(DIV_APB4, 1)
+ 		DIV(DIV_APB5, 2)
++		DIV(DIV_RTC, 23)
+ 		DIV(DIV_MCO1, 0)
+ 		DIV(DIV_MCO2, 0)
+ 	>;
+--- a/fdts/stm32mp15xx-dkx.dtsi
++++ b/fdts/stm32mp15xx-dkx.dtsi
+@@ -198,6 +198,7 @@
+ 		CLK_MPU_PLL1P
+ 		CLK_AXI_PLL2P
+ 		CLK_MCU_PLL3P
++		CLK_RTC_LSE
+ 		CLK_MCO1_DISABLED
+ 		CLK_MCO2_DISABLED
+ 		CLK_CKPER_HSE
+@@ -246,6 +247,7 @@
+ 		DIV(DIV_APB3, 1)
+ 		DIV(DIV_APB4, 1)
+ 		DIV(DIV_APB5, 2)
++		DIV(DIV_RTC, 23)
+ 		DIV(DIV_MCO1, 0)
+ 		DIV(DIV_MCO2, 0)
+ 	>;

package/boot/optee-os-stm32/Makefile

@@ -7,10 +7,10 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=4.8.0
+PKG_VERSION:=4.7.0
 PKG_RELEASE:=1
 
-PKG_HASH:=5222cd553f5edb69ae4ec7cb99b2bfec2c47a47c0be1865b49744701918e8b4d
+PKG_HASH:=976b9c184678516038d4e79766608e81d10bf136f76fd0db2dc48f90f994fbd9
 PKG_MAINTAINER:=Thomas Richard <thomas.richard@bootlin.com>
 
 OPTEE_USE_INTREE_DTC:=1

package/boot/uboot-airoha/Makefile

@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-PKG_VERSION:=2025.10
-PKG_HASH:=b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a
+PKG_VERSION:=2025.07
+PKG_HASH:=0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7
 PKG_BUILD_DEPENDS:=arm-trusted-firmware-tools/host
 
 UBOOT_USE_INTREE_DTC:=1

package/boot/uboot-airoha/patches/200-linux-bitfield.h-import-FIELD_PREP_CONST-macro-from-.patch

@@ -0,0 +1,55 @@
+From 4f1fcf5281ee4e22b1e89a62bd0417878bcbeca5 Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Tue, 3 Jun 2025 10:41:18 +0200
+Subject: [PATCH 1/2] linux/bitfield.h: import FIELD_PREP_CONST macro from
+ Linux Kernel
+
+Import FIELD_PREP_CONST macro from Linux Kernel to permit usage of
+FIELD_PREP with scenario where a constant value is needed.
+
+Refer to commit e2192de59e45 ("bitfield: add FIELD_PREP_CONST()") in
+Linux kernel for extensive explaination of why this is useful.
+
+This is also to better align with the Linux Kernel for easier porting of
+driver.
+
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+---
+ include/linux/bitfield.h | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+--- a/include/linux/bitfield.h
++++ b/include/linux/bitfield.h
+@@ -90,6 +90,32 @@
+ 		((typeof(_mask))(_val) << __bf_shf(_mask)) & (_mask);	\
+ 	})
+ 
++#define __BF_CHECK_POW2(n)	BUILD_BUG_ON_ZERO(((n) & ((n) - 1)) != 0)
++
++/**
++ * FIELD_PREP_CONST() - prepare a constant bitfield element
++ * @_mask: shifted mask defining the field's length and position
++ * @_val:  value to put in the field
++ *
++ * FIELD_PREP_CONST() masks and shifts up the value.  The result should
++ * be combined with other fields of the bitfield using logical OR.
++ *
++ * Unlike FIELD_PREP() this is a constant expression and can therefore
++ * be used in initializers. Error checking is less comfortable for this
++ * version, and non-constant masks cannot be used.
++ */
++#define FIELD_PREP_CONST(_mask, _val)					\
++	(								\
++		/* mask must be non-zero */				\
++		BUILD_BUG_ON_ZERO((_mask) == 0) +			\
++		/* check if value fits */				\
++		BUILD_BUG_ON_ZERO(~((_mask) >> __bf_shf(_mask)) & (_val)) + \
++		/* check if mask is contiguous */			\
++		__BF_CHECK_POW2((_mask) + (1ULL << __bf_shf(_mask))) +	\
++		/* and create the value */				\
++		(((typeof(_mask))(_val) << __bf_shf(_mask)) & (_mask))	\
++	)
++
+ /**
+  * FIELD_GET() - extract a bitfield element
+  * @_mask: shifted mask defining the field's length and position

package/boot/uboot-airoha/patches/201-mtd-spinand-winbond-add-Winbond-W25N04KV-flash-suppo.patch

@@ -0,0 +1,56 @@
+From 00e8038b8be74d599f7bc8078731cc2505832f57 Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Tue, 3 Jun 2025 10:47:15 +0200
+Subject: [PATCH 2/2] mtd: spinand: winbond: add Winbond W25N04KV flash support
+
+Add Winbond W25N04KV flash support that use a different value to detect
+ECC bitflip.
+
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+---
+ drivers/mtd/nand/spi/winbond.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/drivers/mtd/nand/spi/winbond.c
++++ b/drivers/mtd/nand/spi/winbond.c
+@@ -11,6 +11,7 @@
+ #include <linux/device.h>
+ #include <linux/kernel.h>
+ #endif
++#include <linux/bitfield.h>
+ #include <linux/bug.h>
+ #include <linux/mtd/spinand.h>
+ 
+@@ -18,6 +19,8 @@
+ 
+ #define WINBOND_CFG_BUF_READ		BIT(3)
+ 
++#define W25N04KV_STATUS_ECC_5_8_BITFLIPS FIELD_PREP_CONST(STATUS_ECC_MASK, 0x3)
++
+ static SPINAND_OP_VARIANTS(read_cache_variants,
+ 		SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
+ 		SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
+@@ -121,6 +124,7 @@ static int w25n02kv_ecc_get_status(struc
+ 		return -EBADMSG;
+ 
+ 	case STATUS_ECC_HAS_BITFLIPS:
++	case W25N04KV_STATUS_ECC_5_8_BITFLIPS:
+ 		/*
+ 		 * Let's try to retrieve the real maximum number of bitflips
+ 		 * in order to avoid forcing the wear-leveling layer to move
+@@ -169,6 +173,15 @@ static const struct spinand_info winbond
+ 		     NAND_ECCREQ(8, 512),
+ 		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
+ 					      &write_cache_variants,
++					      &update_cache_variants),
++		     0,
++		     SPINAND_ECCINFO(&w25n02kv_ooblayout, w25n02kv_ecc_get_status)),
++	SPINAND_INFO("W25N04KV",
++		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x23),
++		     NAND_MEMORG(1, 2048, 128, 64, 4096, 40, 2, 1, 1),
++		     NAND_ECCREQ(8, 512),
++		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
++					      &write_cache_variants,
+ 					      &update_cache_variants),
+ 		     0,
+ 		     SPINAND_ECCINFO(&w25n02kv_ooblayout, w25n02kv_ecc_get_status)),

package/boot/uboot-airoha/patches/202-mtd-spinand-Use-the-spi-mem-dirmap-API.patch

@@ -17,6 +17,8 @@ Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>
  include/linux/mtd/spinand.h |   7 ++
  2 files changed, 95 insertions(+), 97 deletions(-)
 
+diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
+index f5ddfbf4b83..ea00cd7dcf0 100644
 --- a/drivers/mtd/nand/spi/core.c
 +++ b/drivers/mtd/nand/spi/core.c
 @@ -41,21 +41,6 @@ struct spinand_plat {
@@ -273,7 +275,7 @@ Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>
  static const struct nand_ops spinand_ops = {
  	.erase = spinand_erase,
  	.markbad = spinand_markbad,
-@@ -1134,6 +1117,14 @@ static int spinand_init(struct spinand_device *spinand)
+@@ -1116,6 +1099,14 @@ static int spinand_init(struct spinand_device *spinand)
  		goto err_free_bufs;
  	}
  
@@ -313,3 +315,6 @@ index 6fe6fd520a4..163269313f6 100644
  	int (*select_target)(struct spinand_device *spinand,
  			     unsigned int target);
  	unsigned int cur_target;
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/203-spi-airoha-remove-unnecessary-operation-adjust_op_si.patch

@@ -12,6 +12,8 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  drivers/spi/airoha_snfi_spi.c | 16 ----------------
  1 file changed, 16 deletions(-)
 
+diff --git a/drivers/spi/airoha_snfi_spi.c b/drivers/spi/airoha_snfi_spi.c
+index 3ea25b293d1..4eb01038404 100644
 --- a/drivers/spi/airoha_snfi_spi.c
 +++ b/drivers/spi/airoha_snfi_spi.c
 @@ -525,21 +525,6 @@ static int airoha_snand_nfi_config(struct airoha_snand_priv *priv)
@@ -44,3 +46,6 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  	.supports_op = airoha_snand_supports_op,
  	.exec_op = airoha_snand_exec_op,
  };
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/204-spi-airoha-add-support-of-dual-quad-wires-spi-modes-.patch

@@ -32,6 +32,8 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  drivers/spi/airoha_snfi_spi.c | 143 +++++++++++++++++++++++++++-------
  1 file changed, 117 insertions(+), 26 deletions(-)
 
+diff --git a/drivers/spi/airoha_snfi_spi.c b/drivers/spi/airoha_snfi_spi.c
+index 4eb01038404..7cd409ba44a 100644
 --- a/drivers/spi/airoha_snfi_spi.c
 +++ b/drivers/spi/airoha_snfi_spi.c
 @@ -186,6 +186,14 @@
@@ -255,3 +257,6 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  		if (err)
  			return err;
  	}
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/205-spi-airoha-add-dma-support.patch

@@ -19,6 +19,8 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  drivers/spi/airoha_snfi_spi.c | 309 ++++++++++++++++++++++++++++++++++
  1 file changed, 309 insertions(+)
 
+diff --git a/drivers/spi/airoha_snfi_spi.c b/drivers/spi/airoha_snfi_spi.c
+index 7cd409ba44a..f72d11f5b19 100644
 --- a/drivers/spi/airoha_snfi_spi.c
 +++ b/drivers/spi/airoha_snfi_spi.c
 @@ -141,12 +141,14 @@
@@ -371,3 +373,6 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  };
  
  static const struct dm_spi_ops airoha_snfi_spi_ops = {
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/206-spi-airoha-support-of-dualio-quadio-flash-reading-co.patch

@@ -15,6 +15,8 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  drivers/spi/airoha_snfi_spi.c | 27 +++++++++++++++++++++------
  1 file changed, 21 insertions(+), 6 deletions(-)
 
+diff --git a/drivers/spi/airoha_snfi_spi.c b/drivers/spi/airoha_snfi_spi.c
+index f72d11f5b19..7cafa900bbc 100644
 --- a/drivers/spi/airoha_snfi_spi.c
 +++ b/drivers/spi/airoha_snfi_spi.c
 @@ -141,6 +141,7 @@
@@ -87,3 +89,6 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  	if (err)
  		goto error_dma_unmap;
  
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/207-spi-airoha-avoid-setting-of-page-oob-sizes-in-REG_SP.patch

@@ -13,6 +13,8 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  drivers/spi/airoha_snfi_spi.c | 38 -----------------------------------
  1 file changed, 38 deletions(-)
 
+diff --git a/drivers/spi/airoha_snfi_spi.c b/drivers/spi/airoha_snfi_spi.c
+index 7cafa900bbc..71e4fc13924 100644
 --- a/drivers/spi/airoha_snfi_spi.c
 +++ b/drivers/spi/airoha_snfi_spi.c
 @@ -514,44 +514,6 @@ static int airoha_snand_nfi_config(struct airoha_snand_priv *priv)
@@ -60,3 +62,6 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  	/* sec num */
  	val = FIELD_PREP(SPI_NFI_SEC_NUM, priv->nfi_cfg.sec_num);
  	err = regmap_update_bits(priv->regmap_nfi, REG_SPI_NFI_CON,
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/208-spi-airoha-reduce-the-number-of-modification-of-REG_.patch

@@ -15,6 +15,8 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  drivers/spi/airoha_snfi_spi.c | 134 +++++++++++++++++++++++++---------
  1 file changed, 101 insertions(+), 33 deletions(-)
 
+diff --git a/drivers/spi/airoha_snfi_spi.c b/drivers/spi/airoha_snfi_spi.c
+index 71e4fc13924..1fcf5dd89e9 100644
 --- a/drivers/spi/airoha_snfi_spi.c
 +++ b/drivers/spi/airoha_snfi_spi.c
 @@ -641,7 +641,47 @@ static ssize_t airoha_snand_dirmap_read(struct spi_mem_dirmap_desc *desc,
@@ -193,3 +195,6 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  	err = regmap_write(priv->regmap_nfi, REG_SPI_NFI_CMD, 0x80);
  	if (err)
  		goto error_dma_unmap;
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/209-spi-airoha-set-custom-sector-size-equal-to-flash-pag.patch

@@ -16,6 +16,8 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  drivers/spi/airoha_snfi_spi.c | 35 +++++++++++++++++++----------------
  1 file changed, 19 insertions(+), 16 deletions(-)
 
+diff --git a/drivers/spi/airoha_snfi_spi.c b/drivers/spi/airoha_snfi_spi.c
+index 1fcf5dd89e9..c9feef83f89 100644
 --- a/drivers/spi/airoha_snfi_spi.c
 +++ b/drivers/spi/airoha_snfi_spi.c
 @@ -515,7 +515,7 @@ static int airoha_snand_nfi_config(struct airoha_snand_priv *priv)
@@ -133,3 +135,6 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  	if (err)
  		goto error_dma_unmap;
  
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/210-spi-airoha-avoid-usage-of-flash-specific-parameters.patch

@@ -30,6 +30,8 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  drivers/spi/airoha_snfi_spi.c | 94 ++---------------------------------
  1 file changed, 4 insertions(+), 90 deletions(-)
 
+diff --git a/drivers/spi/airoha_snfi_spi.c b/drivers/spi/airoha_snfi_spi.c
+index c9feef83f89..37fee0c6655 100644
 --- a/drivers/spi/airoha_snfi_spi.c
 +++ b/drivers/spi/airoha_snfi_spi.c
 @@ -218,13 +218,6 @@ struct airoha_snand_priv {
@@ -168,3 +170,6 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  };
  
  static const struct udevice_id airoha_snand_ids[] = {
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/300-airoha-add-support-for-Airoha-AN7583-SoC.patch

@@ -19,9 +19,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  board/airoha/an7583/MAINTAINERS      |   5 +
  board/airoha/an7583/Makefile         |   3 +
  board/airoha/an7583/an7583_rfb.c     |  16 ++
- configs/an7583_evb_defconfig         |  81 ++++++
+ configs/an7583_evb_defconfig         |  83 ++++++
  include/configs/an7583.h             |  19 ++
- 11 files changed, 643 insertions(+)
+ 11 files changed, 645 insertions(+)
  create mode 100644 arch/arm/dts/an7583-evb.dts
  create mode 100644 arch/arm/dts/an7583.dtsi
  create mode 100644 arch/arm/mach-airoha/an7583/Makefile
@@ -667,7 +667,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 +CONFIG_CMD_LOG=y
 +CONFIG_ENV_OVERWRITE=y
 +CONFIG_ENV_IS_IN_MMC=y
-+CONFIG_ENV_RELOC_GD_ENV_ADDR=y
++CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 +CONFIG_NET_RANDOM_ETHADDR=y
 +CONFIG_REGMAP=y

package/boot/uboot-airoha/patches/303-reset-airoha-Add-support-for-Airoha-AN7583-reset.patch

@@ -96,7 +96,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  static int airoha_reset_update(struct airoha_reset_priv *priv,
  			       unsigned long id, bool assert)
  {
-@@ -135,7 +191,7 @@ static int airoha_reset_xlate(struct reset_ctl *reset_ctl,
+@@ -135,7 +191,7 @@ static int airoha_reset_xlate(struct res
  {
  	struct airoha_reset_priv *priv = dev_get_priv(reset_ctl->dev);
  
@@ -105,7 +105,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  		return -EINVAL;
  
  	reset_ctl->id = priv->idx_map[args->args[0]];
-@@ -150,7 +206,7 @@ static struct reset_ops airoha_reset_ops = {
+@@ -150,7 +206,7 @@ static struct reset_ops airoha_reset_ops
  	.rst_status = airoha_reset_status,
  };
  
@@ -114,15 +114,15 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  {
  	struct airoha_reset_priv *priv = dev_get_priv(dev);
  	int ret;
-@@ -161,10 +217,44 @@ static int airoha_reset_probe(struct udevice *dev)
+@@ -161,10 +217,44 @@ static int airoha_reset_probe(struct ude
  
  	priv->bank_ofs = en7581_rst_ofs;
  	priv->idx_map = en7581_rst_map;
 +	priv->num_rsts = ARRAY_SIZE(en7581_rst_map);
-+
-+	return 0;
-+}
-+
+ 
+ 	return 0;
+ }
+ 
 +static int an7583_reset_probe(struct udevice *dev)
 +{
 +	struct airoha_reset_priv *priv = dev_get_priv(dev);
@@ -139,10 +139,10 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 +	priv->bank_ofs = en7581_rst_ofs;
 +	priv->idx_map = an7583_rst_map;
 +	priv->num_rsts = ARRAY_SIZE(an7583_rst_map);
- 
- 	return 0;
- }
- 
++
++	return 0;
++}
++
 +static int airoha_reset_probe(struct udevice *dev)
 +{
 +	if (ofnode_device_is_compatible(dev_ofnode(dev),
@@ -223,4 +223,3 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 +#define AN7583_XPON_MAC_RST		47
 +
 +#endif /* __DT_BINDINGS_RESET_CONTROLLER_AIROHA_AN7583_H_ */
-

package/boot/uboot-airoha/patches/304-net-airoha-add-support-for-Airoha-AN7583.patch

@@ -1,7 +1,7 @@
-From dfdc7309ba22f6a6b6c581acfe95a222108bd760 Mon Sep 17 00:00:00 2001
+From 289503869e5580658035e82d91b02a43c775f1a1 Mon Sep 17 00:00:00 2001
 From: Christian Marangi <ansuelsmth@gmail.com>
 Date: Mon, 19 May 2025 14:29:53 +0200
-Subject: [PATCH] net: airoha: add support for Airoha AN7583
+Subject: [PATCH 1/4] net: airoha: add support for Airoha AN7583
 
 Add support for Ethernet controller present in Airoha AN7583. This
 follow the same implementation of Airoha AN7581 with the only difference
@@ -61,7 +61,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  
  /* FE */
  #define PSE_BASE			0x0100
-@@ -312,6 +331,26 @@ struct airoha_eth {
+@@ -311,6 +330,26 @@ struct airoha_eth {
  	struct airoha_gdm_port *ports[AIROHA_MAX_NUM_GDM_PORTS];
  };
  
@@ -88,7 +88,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  static u32 airoha_rr(void __iomem *base, u32 offset)
  {
  	return readl(base + offset);
-@@ -352,8 +391,12 @@ static u32 airoha_rmw(void __iomem *base, u32 offset, u32 mask, u32 val)
+@@ -351,8 +390,12 @@ static u32 airoha_rmw(void __iomem *base
  #define airoha_qdma_clear(qdma, offset, val)			\
  	airoha_rmw((qdma)->regs, (offset), (val), 0)
  
@@ -99,9 +99,9 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 +#define airoha_switch_rmw(eth, offset, mask, val)		\
 +	airoha_rmw((eth)->switch_regs, (offset), (mask), (val))
  
- static inline dma_addr_t dma_map_unaligned(void *vaddr, size_t len,
- 					   enum dma_data_direction dir)
-@@ -682,10 +725,12 @@ static int airoha_hw_init(struct udevice *dev,
+ static void airoha_fe_maccr_init(struct airoha_eth *eth)
+ {
+@@ -652,10 +695,12 @@ static int airoha_hw_init(struct udevice
  
  static int airoha_switch_init(struct udevice *dev, struct airoha_eth *eth)
  {
@@ -115,7 +115,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  	if (!ofnode_valid(switch_node))
  		return -EINVAL;
  
-@@ -717,17 +762,71 @@ static int airoha_switch_init(struct udevice *dev, struct airoha_eth *eth)
+@@ -687,17 +732,71 @@ static int airoha_switch_init(struct ude
  			 FIELD_PREP(SWITCH_PHY_END_ADDR, 0xc) |
  			 FIELD_PREP(SWITCH_PHY_ST_ADDR, 0x8));
  
@@ -189,7 +189,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  	if (!ofnode_valid(scu_node))
  		return -EINVAL;
  
-@@ -751,11 +850,11 @@ static int airoha_eth_probe(struct udevice *dev)
+@@ -721,11 +820,11 @@ static int airoha_eth_probe(struct udevi
  		return -ENOMEM;
  	eth->rsts.count = AIROHA_MAX_NUM_RSTS;
  
@@ -203,7 +203,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  
  	ret = reset_get_by_name(dev, "fe", &eth->rsts.resets[0]);
  	if (ret)
-@@ -769,21 +868,12 @@ static int airoha_eth_probe(struct udevice *dev)
+@@ -739,21 +838,12 @@ static int airoha_eth_probe(struct udevi
  	if (ret)
  		return ret;
  
@@ -231,10 +231,11 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  
  	ret = airoha_hw_init(dev, eth);
  	if (ret)
-@@ -971,8 +1061,43 @@ static int arht_eth_write_hwaddr(struct udevice *dev)
+@@ -924,8 +1014,44 @@ static int arht_eth_write_hwaddr(struct
  	return 0;
  }
  
++
 +static ofnode en7581_get_scu_node(struct udevice *dev)
 +{
 +	return ofnode_by_compatible(ofnode_null(), "airoha,en7581-scu");
@@ -273,6 +274,6 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 +	{ .compatible = "airoha,an7583-eth",
 +	  .data = (ulong)&an7583_data,
 +	},
- 	{ }
  };
  
+ static const struct eth_ops airoha_eth_ops = {

package/boot/uboot-airoha/patches/500-drivers-net-airoha_eth-add-missing-terminator-for-co.patch

@@ -0,0 +1,32 @@
+From a11420dac873fbd5b8a81192571d914f01bee26d Mon Sep 17 00:00:00 2001
+From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
+Date: Wed, 9 Jul 2025 12:28:07 +0300
+Subject: [PATCH 1/5] drivers/net/airoha_eth: add missing terminator for
+ compatible devices list
+
+Compatible device list must have a terminator. If terminator is missed
+the u-boot driver subsystem will access random data placed after the
+list in the memory.
+
+The issue can be observed with the "dm compat" command.
+
+Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
+---
+ drivers/net/airoha_eth.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/net/airoha_eth.c b/drivers/net/airoha_eth.c
+index b3fd1ab9064..db34ec48c81 100644
+--- a/drivers/net/airoha_eth.c
++++ b/drivers/net/airoha_eth.c
+@@ -1052,6 +1052,7 @@ static const struct udevice_id airoha_eth_ids[] = {
+ 	{ .compatible = "airoha,an7583-eth",
+ 	  .data = (ulong)&an7583_data,
+ 	},
++	{ }
+ };
+ 
+ static const struct eth_ops airoha_eth_ops = {
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/500-net-airoha-simplify-rx-free-packet-logic-a-bit.patch

@@ -1,93 +0,0 @@
-From e7b7bd119b68fe9106a1c9a45a7eba811fc40ce0 Mon Sep 17 00:00:00 2001
-From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
-Date: Fri, 3 Oct 2025 20:12:06 +0300
-Subject: [PATCH v2 1/2] net: airoha: simplify rx/free packet logic a bit
-
-The commit 997786bbf473 ("drivers/net/airoha_eth: fix stalling in package
-receiving") can be improved. Instead of returning previous descriptor
-it's possible:
- * do nothing in even descriptor case
- * return 2 descriptor to the queue (current and previous) in the odd
-   descriptor case.
-
-This patch:
- * implements above approach
- * remove logic not required within new approach
- * adds note that PKTBUFSRX must be even and larger than 7
-   for reliable driver operations
-
-Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
----
- drivers/net/airoha_eth.c | 40 +++++++++++++++++++++-------------------
- 1 file changed, 21 insertions(+), 19 deletions(-)
-
---- a/drivers/net/airoha_eth.c
-+++ b/drivers/net/airoha_eth.c
-@@ -492,14 +492,10 @@ static int airoha_qdma_init_rx_queue(struct airoha_queue *q,
- 			RX_RING_SIZE_MASK,
- 			FIELD_PREP(RX_RING_SIZE_MASK, ndesc));
- 
--	/*
--	 * See arht_eth_free_pkt() for the reasons used to fill
--	 * REG_RX_CPU_IDX(qid) register.
--	 */
- 	airoha_qdma_rmw(qdma, REG_RX_RING_SIZE(qid), RX_RING_THR_MASK,
- 			FIELD_PREP(RX_RING_THR_MASK, 0));
- 	airoha_qdma_rmw(qdma, REG_RX_CPU_IDX(qid), RX_RING_CPU_IDX_MASK,
--			FIELD_PREP(RX_RING_CPU_IDX_MASK, q->ndesc - 3));
-+			FIELD_PREP(RX_RING_CPU_IDX_MASK, q->ndesc - 1));
- 	airoha_qdma_rmw(qdma, REG_RX_DMA_IDX(qid), RX_RING_DMA_IDX_MASK,
- 			FIELD_PREP(RX_RING_DMA_IDX_MASK, q->head));
- 
-@@ -1010,7 +1006,6 @@ static int arht_eth_free_pkt(struct udevice *dev, uchar *packet, int length)
- 	struct airoha_qdma *qdma = &eth->qdma[0];
- 	struct airoha_queue *q;
- 	int qid;
--	u16 prev, pprev;
- 
- 	if (!packet)
- 		return 0;
-@@ -1020,22 +1015,29 @@ static int arht_eth_free_pkt(struct udevice *dev, uchar *packet, int length)
- 
- 	/*
- 	 * Due to cpu cache issue the airoha_qdma_reset_rx_desc() function
--	 * will always touch 2 descriptors:
--	 *   - if current descriptor is even, then the previous and the one
--	 *     before previous descriptors will be touched (previous cacheline)
--	 *   - if current descriptor is odd, then only current and previous
--	 *     descriptors will be touched (current cacheline)
-+	 * will always touch 2 descriptors placed on the same cacheline:
-+	 *   - if current descriptor is even, then current and next
-+	 *     descriptors will be touched
-+	 *   - if current descriptor is odd, then current and previous
-+	 *     descriptors will be touched
- 	 *
--	 * Thus, to prevent possible destroying of rx queue, only (q->ndesc - 2)
--	 * descriptors might be used for packet receiving.
-+	 * Thus, to prevent possible destroying of rx queue, we should:
-+	 *   - do nothing in the even descriptor case,
-+	 *   - utilize 2 descriptors (current and previous one) in the
-+	 *     odd descriptor case.
-+	 *
-+	 * WARNING: Observations shows that PKTBUFSRX must be even and
-+	 *          larger than 7 for reliable driver operations.
- 	 */
--	prev  = (q->head + q->ndesc - 1) % q->ndesc;
--	pprev = (q->head + q->ndesc - 2) % q->ndesc;
--	q->head = (q->head + 1) % q->ndesc;
-+	if (q->head & 0x01) {
-+		airoha_qdma_reset_rx_desc(q, q->head - 1);
-+		airoha_qdma_reset_rx_desc(q, q->head);
- 
--	airoha_qdma_reset_rx_desc(q, prev);
--	airoha_qdma_rmw(qdma, REG_RX_CPU_IDX(qid), RX_RING_CPU_IDX_MASK,
--			FIELD_PREP(RX_RING_CPU_IDX_MASK, pprev));
-+		airoha_qdma_rmw(qdma, REG_RX_CPU_IDX(qid), RX_RING_CPU_IDX_MASK,
-+				FIELD_PREP(RX_RING_CPU_IDX_MASK, q->head));
-+	}
-+
-+	q->head = (q->head + 1) % q->ndesc;
- 
- 	return 0;
- }
-

package/boot/uboot-airoha/patches/501-drivers-net-airoha_eth-fix-packet-transmission-error.patch

@@ -0,0 +1,107 @@
+From 8fce1cfe775e1f3b5d7cecb8bdcc8271bf9f799c Mon Sep 17 00:00:00 2001
+From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
+Date: Wed, 9 Jul 2025 12:28:08 +0300
+Subject: [PATCH 2/5] drivers/net/airoha_eth: fix packet transmission errors
+
+The dma_map_single() function calls one of the functions
+  * invalidate_dcache_range(),
+  * flush_dcache_range().
+Both of them expect that 'vaddr' is aligned to the ARCH_DMA_MINALIGN
+boundary. Unfortunately, RX/TX descriptors are 32-byte long. Thus they
+might not be aligned to the ARCH_DMA_MINALIGN boundary. Data flushing
+(or invalidating) might do nothing in this case.
+
+The same applies to dma_unmap_single() function.
+
+In the TX path case the issue might prevent package transmission (filled
+TX descriptor was not flushed).
+
+To fix an issue a special wrappers for
+  * dma_map_single(),
+  * dma_unmap_single()
+functions were created. The patch fix flushing/invalidatiog for the
+RX path as well.
+
+The bug appears on 32-bit airoha platform, but should be present on
+64-bit as well.
+
+The code was tested both on 32-bit and 64-bit airoha boards.
+
+Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
+---
+ drivers/net/airoha_eth.c | 33 +++++++++++++++++++++++++++------
+ 1 file changed, 27 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/net/airoha_eth.c b/drivers/net/airoha_eth.c
+index db34ec48c81..aae6922f3c7 100644
+--- a/drivers/net/airoha_eth.c
++++ b/drivers/net/airoha_eth.c
+@@ -397,6 +397,27 @@ static u32 airoha_rmw(void __iomem *base, u32 offset, u32 mask, u32 val)
+ #define airoha_switch_rmw(eth, offset, mask, val)		\
+ 	airoha_rmw((eth)->switch_regs, (offset), (mask), (val))
+ 
++static inline dma_addr_t dma_map_unaligned(void *vaddr, size_t len,
++					   enum dma_data_direction dir)
++{
++	uintptr_t start, end;
++
++	start = ALIGN_DOWN((uintptr_t)vaddr, ARCH_DMA_MINALIGN);
++	end = ALIGN((uintptr_t)(vaddr + len), ARCH_DMA_MINALIGN);
++
++	return dma_map_single((void *)start, end - start, dir);
++}
++
++static inline void dma_unmap_unaligned(dma_addr_t addr, size_t len,
++				       enum dma_data_direction dir)
++{
++	uintptr_t start, end;
++
++	start = ALIGN_DOWN((uintptr_t)addr, ARCH_DMA_MINALIGN);
++	end = ALIGN((uintptr_t)(addr + len), ARCH_DMA_MINALIGN);
++	dma_unmap_single(start, end - start, dir);
++}
++
+ static void airoha_fe_maccr_init(struct airoha_eth *eth)
+ {
+ 	int p;
+@@ -434,7 +455,7 @@ static void airoha_qdma_reset_rx_desc(struct airoha_queue *q, int index,
+ 	val = FIELD_PREP(QDMA_DESC_LEN_MASK, PKTSIZE_ALIGN);
+ 	WRITE_ONCE(desc->ctrl, cpu_to_le32(val));
+ 
+-	dma_map_single(desc, sizeof(*desc), DMA_TO_DEVICE);
++	dma_map_unaligned(desc, sizeof(*desc), DMA_TO_DEVICE);
+ }
+ 
+ static void airoha_qdma_init_rx_desc(struct airoha_queue *q)
+@@ -916,14 +937,14 @@ static int airoha_eth_send(struct udevice *dev, void *packet, int length)
+ 	WRITE_ONCE(desc->msg1, cpu_to_le32(msg1));
+ 	WRITE_ONCE(desc->msg2, cpu_to_le32(0xffff));
+ 
+-	dma_map_single(desc, sizeof(*desc), DMA_TO_DEVICE);
++	dma_map_unaligned(desc, sizeof(*desc), DMA_TO_DEVICE);
+ 
+ 	airoha_qdma_rmw(qdma, REG_TX_CPU_IDX(qid), TX_RING_CPU_IDX_MASK,
+ 			FIELD_PREP(TX_RING_CPU_IDX_MASK, index));
+ 
+ 	for (i = 0; i < 100; i++) {
+-		dma_unmap_single(virt_to_phys(desc), sizeof(*desc),
+-				 DMA_FROM_DEVICE);
++		dma_unmap_unaligned(virt_to_phys(desc), sizeof(*desc),
++				    DMA_FROM_DEVICE);
+ 		if (desc->ctrl & QDMA_DESC_DONE_MASK)
+ 			break;
+ 
+@@ -954,8 +975,8 @@ static int airoha_eth_recv(struct udevice *dev, int flags, uchar **packetp)
+ 	q = &qdma->q_rx[qid];
+ 	desc = &q->desc[q->head];
+ 
+-	dma_unmap_single(virt_to_phys(desc), sizeof(*desc),
+-			 DMA_FROM_DEVICE);
++	dma_unmap_unaligned(virt_to_phys(desc), sizeof(*desc),
++			    DMA_FROM_DEVICE);
+ 
+ 	if (!(desc->ctrl & QDMA_DESC_DONE_MASK))
+ 		return -EAGAIN;
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/502-drivers-net-airoha_eth-fix-stalling-in-package-recei.patch

@@ -0,0 +1,135 @@
+From 352c071bc18855238565cc6417a4c15a4e24bad8 Mon Sep 17 00:00:00 2001
+From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
+Date: Wed, 9 Jul 2025 12:28:09 +0300
+Subject: [PATCH 3/5] drivers/net/airoha_eth: fix stalling in package
+ receiving
+
+ARCH_DMA_MINALIGN is 64 for ARMv7a/ARMv8a architectures, but RX/TX
+descriptors are 32 bytes long. So they may not be aligned on an
+ARCH_DMA_MINALIGN boundary. In case of RX path, this may cause the
+following problem
+
+1) Assume that a packet has arrived and the EVEN rx descriptor has been
+   updated with the incoming data. The driver will invalidate and check
+   the corresponding rx descriptor.
+
+2) Now suppose the next descriptor (ODD) has not yet completed.
+
+   Please note that all even descriptors starts on 64-byte boundary,
+   and the odd ones are NOT aligned on 64-byte boundary.
+
+   Inspecting even descriptor, we will read the entire CPU cache line
+   (64 bytes). So we read and sore in CPU cache also the next (odd)
+   descriptor.
+
+3) Now suppose the next packet (for the odd rx descriptor) arrived
+   while the first packet was being processed. So we have new data
+   in memory but old data in cache.
+
+4) After packet processing (in arht_eth_free_pkt() function) we will
+   cleanup the descriptor and put it back to rx queue.
+
+   This will call flush_dcache_range() function for the even descriptor,
+   so the odd one will be flushed as well (it is in the same cache line).
+   So the old data will be written to the next rx descriptor.
+
+5) We get a freeze. The next descriptor is empty (so the driver is
+   waiting for packets), but the hardware will continue to receive
+   packets on other available descriptors. This will continue until
+   the last available rx descriptor is full. Then the hardware will
+   also freeze.
+
+The problem will be solved if:
+  * do nothing in even descriptor case,
+  * return 2 descriptor to the queue (current and previous) in the odd
+    descriptor case.
+
+If the current descriptor is even nothing will be done, so no issue
+will arrise.
+
+If the current descriptor is odd, then the previous descriptor is on
+the same cache line. Both (current and previous) descriptors are not
+currently in use, so issue will not arrise as well.
+
+WARNING: The following restrictions on PKTBUFSRX must be held:
+  * PKTBUFSRX is even,
+  * PKTBUFSRX >= 4. Observations shows that PKTBUFSRX must be at least 8.
+
+The bug appears on 32-bit airoha platform, but should be present on
+64-bit as well.
+
+The code was tested both on 32-bit and 64-bit airoha boards.
+
+Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
+---
+ drivers/net/airoha_eth.c | 33 ++++++++++++++++++++++++++-------
+ 1 file changed, 26 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/net/airoha_eth.c b/drivers/net/airoha_eth.c
+index aae6922f3c7..44d4773bc5d 100644
+--- a/drivers/net/airoha_eth.c
++++ b/drivers/net/airoha_eth.c
+@@ -435,13 +435,14 @@ static int airoha_fe_init(struct airoha_eth *eth)
+ 	return 0;
+ }
+ 
+-static void airoha_qdma_reset_rx_desc(struct airoha_queue *q, int index,
+-				      uchar *rx_packet)
++static void airoha_qdma_reset_rx_desc(struct airoha_queue *q, int index)
+ {
+ 	struct airoha_qdma_desc *desc;
++	uchar *rx_packet;
+ 	u32 val;
+ 
+ 	desc = &q->desc[index];
++	rx_packet = net_rx_packets[index];
+ 	index = (index + 1) % q->ndesc;
+ 
+ 	dma_map_single(rx_packet, PKTSIZE_ALIGN, DMA_TO_DEVICE);
+@@ -463,7 +464,7 @@ static void airoha_qdma_init_rx_desc(struct airoha_queue *q)
+ 	int i;
+ 
+ 	for (i = 0; i < q->ndesc; i++)
+-		airoha_qdma_reset_rx_desc(q, i, net_rx_packets[i]);
++		airoha_qdma_reset_rx_desc(q, i);
+ }
+ 
+ static int airoha_qdma_init_rx_queue(struct airoha_queue *q,
+@@ -1003,12 +1004,30 @@ static int arht_eth_free_pkt(struct udevice *dev, uchar *packet, int length)
+ 	qid = 0;
+ 	q = &qdma->q_rx[qid];
+ 
+-	dma_map_single(packet, length, DMA_TO_DEVICE);
++	/*
++	 * Due to cpu cache issue the airoha_qdma_reset_rx_desc() function
++	 * will always touch 2 descriptors placed on the same cacheline:
++	 *   - if current descriptor is even, then current and next
++	 *     descriptors will be touched
++	 *   - if current descriptor is odd, then current and previous
++	 *     descriptors will be touched
++	 *
++	 * Thus, to prevent possible destroying of rx queue, we should:
++	 *   - do nothing in the even descriptor case,
++	 *   - utilize 2 descriptors (current and previous one) in the
++	 *     odd descriptor case.
++	 *
++	 * WARNING: Observations shows that PKTBUFSRX must be even and
++	 *          larger than 7 for reliable driver operations.
++	 */
++	if (q->head & 0x01) {
++		airoha_qdma_reset_rx_desc(q, q->head - 1);
++		airoha_qdma_reset_rx_desc(q, q->head);
+ 
+-	airoha_qdma_reset_rx_desc(q, q->head, packet);
++		airoha_qdma_rmw(qdma, REG_RX_CPU_IDX(qid), RX_RING_CPU_IDX_MASK,
++				FIELD_PREP(RX_RING_CPU_IDX_MASK, q->head));
++	}
+ 
+-	airoha_qdma_rmw(qdma, REG_RX_CPU_IDX(qid), RX_RING_CPU_IDX_MASK,
+-			FIELD_PREP(RX_RING_CPU_IDX_MASK, q->head));
+ 	q->head = (q->head + 1) % q->ndesc;
+ 
+ 	return 0;
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/503-drivers-net-airoha_eth-enable-hw-padding-of-short-tx.patch

@@ -0,0 +1,64 @@
+From dc0ae3455f4344403e293c9b385653ad3fddb0b1 Mon Sep 17 00:00:00 2001
+From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
+Date: Wed, 9 Jul 2025 12:28:10 +0300
+Subject: [PATCH 4/5] drivers/net/airoha_eth: enable hw padding of short tx
+ packets
+
+Transmission of short packets does not work good for XFI (GDM2) and
+HSGMII (GDM3) interfaces. The issue can be solved with:
+
+ - padding of short packets to 60 bytes
+ - setting of PAD_EN bit in the corresponding REG_GDM_FWD_CFG(n)
+   register.
+
+The issue should present for the lan switch (GDM1) as well, but it does
+does not appear due to unknown reason.
+
+This patch set PAD_EN bit for the used GDM.
+
+Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
+---
+ drivers/net/airoha_eth.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/airoha_eth.c b/drivers/net/airoha_eth.c
+index 53c722379c9..b2f73c7dbb7 100644
+--- a/drivers/net/airoha_eth.c
++++ b/drivers/net/airoha_eth.c
+@@ -116,6 +116,7 @@
+ 	 (_n) == 2 ? GDM2_BASE : GDM1_BASE)
+ 
+ #define REG_GDM_FWD_CFG(_n)		GDM_BASE(_n)
++#define GDM_PAD_EN			BIT(28)
+ #define GDM_DROP_CRC_ERR		BIT(23)
+ #define GDM_IP4_CKSUM			BIT(22)
+ #define GDM_TCP_CKSUM			BIT(21)
+@@ -423,8 +424,11 @@ static void airoha_fe_maccr_init(struct airoha_eth *eth)
+ 	int p;
+ 
+ 	for (p = 1; p <= ARRAY_SIZE(eth->ports); p++) {
+-		/* Disable any kind of CRC drop or offload */
+-		airoha_fe_wr(eth, REG_GDM_FWD_CFG(p), 0);
++		/*
++		 * Disable any kind of CRC drop or offload.
++		 * Enable padding of short TX packets to 60 bytes.
++		 */
++		airoha_fe_wr(eth, REG_GDM_FWD_CFG(p), GDM_PAD_EN);
+ 	}
+ }
+ 
+@@ -920,6 +924,11 @@ static int airoha_eth_send(struct udevice *dev, void *packet, int length)
+ 	u32 val;
+ 	int i;
+ 
++	/*
++	 * There is no need to pad short TX packets to 60 bytes since the
++	 * GDM_PAD_EN bit set in the corresponding REG_GDM_FWD_CFG(n) register.
++	 */
++
+ 	dma_addr = dma_map_single(packet, length, DMA_TO_DEVICE);
+ 
+ 	qid = 0;
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/504-net-airoha-increase-the-number-of-rx-network-buffers.patch

@@ -13,23 +13,30 @@ Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
  configs/an7583_evb_defconfig | 1 +
  2 files changed, 2 insertions(+)
 
+diff --git a/configs/an7581_evb_defconfig b/configs/an7581_evb_defconfig
+index c74247e13db..aa1a30aad6a 100644
 --- a/configs/an7581_evb_defconfig
 +++ b/configs/an7581_evb_defconfig
-@@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_MMC=y
- CONFIG_ENV_RELOC_GD_ENV_ADDR=y
+@@ -44,6 +44,7 @@ CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_NET_RANDOM_ETHADDR=y
 +CONFIG_SYS_RX_ETH_BUFFER=8
  CONFIG_REGMAP=y
  CONFIG_SYSCON=y
  CONFIG_CLK=y
+diff --git a/configs/an7583_evb_defconfig b/configs/an7583_evb_defconfig
+index 057104b93af..c67444ae8bf 100644
 --- a/configs/an7583_evb_defconfig
 +++ b/configs/an7583_evb_defconfig
 @@ -44,6 +44,7 @@ CONFIG_ENV_IS_IN_MMC=y
- CONFIG_ENV_RELOC_GD_ENV_ADDR=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_NET_RANDOM_ETHADDR=y
 +CONFIG_SYS_RX_ETH_BUFFER=8
  CONFIG_REGMAP=y
  CONFIG_SYSCON=y
  CONFIG_CLK=y
+-- 
+2.51.0
+

package/boot/uboot-airoha/patches/900-airoha-enable-UBI-support-and-define-default-partiti.patch

@@ -38,10 +38,14 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  
 --- a/arch/arm/dts/an7583-evb.dts
 +++ b/arch/arm/dts/an7583-evb.dts
-@@ -46,6 +46,24 @@
+@@ -46,6 +46,28 @@
  	};
  };
  
++&snfi {
++	status = "okay";
++};
++
 +&spi_nand {
 +	partitions {
 +		compatible = "fixed-partitions";
@@ -65,7 +69,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  	pinctrl-0 = <&pcie0_rst_pins>;
 --- a/configs/an7581_evb_defconfig
 +++ b/configs/an7581_evb_defconfig
-@@ -78,3 +78,19 @@ CONFIG_SPI=y
+@@ -77,3 +77,19 @@ CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_AIROHA_SNFI_SPI=y
  CONFIG_SHA512=y
@@ -87,7 +91,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 +# CONFIG_UBIFS_SILENCE_DEBUG_DUMP is not set
 --- a/configs/an7583_evb_defconfig
 +++ b/configs/an7583_evb_defconfig
-@@ -80,3 +80,19 @@ CONFIG_SHA512=y
+@@ -79,3 +79,19 @@ CONFIG_SHA512=y
  CONFIG_AIROHA_ETH=y
  CONFIG_MMC_MTK=y
  CONFIG_AIROHA_SNFI_SPI=y

package/boot/uboot-airoha/patches/901-airoha-add-default-configuration.patch

@@ -7,28 +7,28 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 ---
  configs/an7581_evb_defconfig | 2 ++
  configs/an7583_evb_defconfig | 2 ++
- defenvs/an7581_rfb_env       | 4 ++++
- defenvs/an7583_rfb_env       | 4 ++++
- 4 files changed, 12 insertions(+)
+ defenvs/an7581_rfb_env       | 3 +++
+ defenvs/an7583_rfb_env       | 3 +++
+ 4 files changed, 10 insertions(+)
  create mode 100644 defenvs/an7581_rfb_env
  create mode 100644 defenvs/an7583_rfb_env
 
 --- a/configs/an7581_evb_defconfig
 +++ b/configs/an7581_evb_defconfig
-@@ -94,3 +94,5 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
+@@ -93,3 +93,5 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
  CONFIG_UBI_BLOCK=y
  # CONFIG_UBIFS_SILENCE_MSG is not set
  # CONFIG_UBIFS_SILENCE_DEBUG_DUMP is not set
-+CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y
-+CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/an7581_rfb_env"
++CONFIG_USE_DEFAULT_ENV_FILE=y
++CONFIG_DEFAULT_ENV_FILE="defenvs/an7581_rfb_env"
 --- a/configs/an7583_evb_defconfig
 +++ b/configs/an7583_evb_defconfig
-@@ -96,3 +96,5 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
+@@ -95,3 +95,5 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
  CONFIG_UBI_BLOCK=y
  # CONFIG_UBIFS_SILENCE_MSG is not set
  # CONFIG_UBIFS_SILENCE_DEBUG_DUMP is not set
-+CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y
-+CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/an7583_rfb_env"
++CONFIG_USE_DEFAULT_ENV_FILE=y
++CONFIG_DEFAULT_ENV_FILE="defenvs/an7583_rfb_env"
 --- /dev/null
 +++ b/defenvs/an7581_rfb_env
 @@ -0,0 +1,4 @@

package/boot/uboot-airoha/patches/902-arm-airoha-disable-environment-inside-mtd-partition.patch

@@ -1,40 +0,0 @@
-From 10bd131a6a365965ce868419933fd7936e91c635 Mon Sep 17 00:00:00 2001
-From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
-Date: Mon, 13 Oct 2025 20:48:00 +0300
-Subject: [PATCH 2/3] arm: airoha: disable environment inside mtd partition
-
-When booting on en7581_evb board equipped with spinand flash, a u-boot
-panic occurs. The panic is caused by the absence any available mtd
-partition.
-
-Disable CONFIG_ENV_IS_IN_MTD to avoid an issue. The environment will
-be stored in the EMMC or in UBI, so actually CONFIG_ENV_IS_IN_MTD is
-not needed.
-
-Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
----
- configs/an7581_evb_defconfig | 1 +
- configs/an7583_evb_defconfig | 1 +
- 2 files changed, 2 insertions(+)
-
---- a/configs/an7581_evb_defconfig
-+++ b/configs/an7581_evb_defconfig
-@@ -40,6 +40,7 @@ CONFIG_CMD_LOG=y
- CONFIG_OF_UPSTREAM=y
- CONFIG_ENV_OVERWRITE=y
- CONFIG_ENV_IS_IN_MMC=y
-+# CONFIG_ENV_IS_IN_MTD is not set
- CONFIG_ENV_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
- CONFIG_NET_RANDOM_ETHADDR=y
---- a/configs/an7583_evb_defconfig
-+++ b/configs/an7583_evb_defconfig
-@@ -41,6 +41,7 @@ CONFIG_CMD_MTDPARTS=y
- CONFIG_CMD_LOG=y
- CONFIG_ENV_OVERWRITE=y
- CONFIG_ENV_IS_IN_MMC=y
-+# CONFIG_ENV_IS_IN_MTD is not set
- CONFIG_ENV_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
- CONFIG_NET_RANDOM_ETHADDR=y
-

package/boot/uboot-airoha/patches/903-arm-airoha-dts-enable-spi-support-for-en7581_evb-boa.patch

@@ -1,23 +0,0 @@
-From 6c4a07ecf211b56eb28fe2dbd8e324b2fdecb84a Mon Sep 17 00:00:00 2001
-From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
-Date: Mon, 13 Oct 2025 20:44:24 +0300
-Subject: [PATCH 1/3] arm: airoha: dts: enable spi support for en7581_evb board
-
-spinand flashes are inaccessible without this patch
-
-Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
----
- arch/arm/dts/en7581-evb-u-boot.dtsi | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/arm/dts/en7581-evb-u-boot.dtsi
-+++ b/arch/arm/dts/en7581-evb-u-boot.dtsi
-@@ -9,3 +9,7 @@
- };
- 
- #include "an7581-u-boot.dtsi"
-+
-+&snfi {
-+	status = "okay";
-+};
-

package/boot/uboot-airoha/patches/904-arm-airoha-enable-position-independent-code.patch

@@ -1,32 +0,0 @@
-From bee36b6f42792556e123f331ece80f8d5a40e8cd Mon Sep 17 00:00:00 2001
-From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
-Date: Mon, 13 Oct 2025 20:56:31 +0300
-Subject: [PATCH 3/3] arm: airoha: enable position independent code
-
-This slightly increase the code, but makes debugging a bit easy
-
-Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
----
- configs/an7581_evb_defconfig | 1 +
- configs/an7583_evb_defconfig | 1 +
- 2 files changed, 2 insertions(+)
-
---- a/configs/an7581_evb_defconfig
-+++ b/configs/an7581_evb_defconfig
-@@ -1,5 +1,6 @@
- CONFIG_ARM=y
- CONFIG_ARCH_AIROHA=y
-+CONFIG_POSITION_INDEPENDENT=y
- CONFIG_TEXT_BASE=0x81E00000
- CONFIG_SYS_MALLOC_F_LEN=0x4000
- CONFIG_NR_DRAM_BANKS=1
---- a/configs/an7583_evb_defconfig
-+++ b/configs/an7583_evb_defconfig
-@@ -1,5 +1,6 @@
- CONFIG_ARM=y
- CONFIG_ARCH_AIROHA=y
-+CONFIG_POSITION_INDEPENDENT=y
- CONFIG_TARGET_AN7583=y
- CONFIG_TEXT_BASE=0x81E00000
- CONFIG_SYS_MALLOC_F_LEN=0x4000
-

package/boot/uboot-ath79/Makefile

@@ -19,19 +19,12 @@ define U-Boot/Default
 endef
 
 define U-Boot/ar9344_nec_aterm
-  NAME:=NEC Aterm series (AR9344, GbE)
+  NAME:=NEC Aterm series (AR9344)
   BUILD_SUBTARGET:= tiny
   BUILD_DEVICES:=nec_wg600hp nec_wr8750n nec_wr9500n
   UBOOT_CONFIG:=nec_ar9344_aterm
 endef
 
-define U-Boot/ar9344_nec_aterm_fe
-  NAME:=NEC Aterm series (AR9344, FE)
-  BUILD_SUBTARGET:= tiny
-  BUILD_DEVICES:=nec_wf1200hp nec_wf1200hp2
-  UBOOT_CONFIG:=nec_ar9344_aterm_fe
-endef
-
 define U-Boot/qca9558_nec_aterm
   NAME:=NEC Aterm series (QCA9558)
   BUILD_SUBTARGET:= generic
@@ -39,7 +32,7 @@ define U-Boot/qca9558_nec_aterm
   UBOOT_CONFIG:=nec_qca9558_aterm
 endef
 
-UBOOT_TARGETS := ar9344_nec_aterm ar9344_nec_aterm_fe qca9558_nec_aterm
+UBOOT_TARGETS := ar9344_nec_aterm qca9558_nec_aterm
 
 # don't stage files to bindir, let target/linux/ath79/image/*.mk do that
 define Package/u-boot/install

package/boot/uboot-ath79/patches/400-ath79-add-support-for-NEC-AR9344-Aterm-series.patch

@@ -5,21 +5,19 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
 
 ---
  arch/mips/dts/Makefile                |  1 +
- arch/mips/dts/nec,ar9344-aterm.dts    | 35 ++++++++++++++
- arch/mips/mach-ath79/Kconfig          |  5 ++
- board/nec/ar9344_aterm/Kconfig        | 33 +++++++++++++
+ arch/mips/dts/nec,ar9344-aterm.dts    | 35 +++++++++++++++
+ arch/mips/mach-ath79/Kconfig          |  5 +++
+ board/nec/ar9344_aterm/Kconfig        | 30 +++++++++++++
  board/nec/ar9344_aterm/Makefile       |  3 ++
- board/nec/ar9344_aterm/ar9344_aterm.c | 70 +++++++++++++++++++++++++++
- configs/nec_ar9344_aterm_defconfig    | 61 +++++++++++++++++++++++
- configs/nec_ar9344_aterm_fe_defconfig | 62 ++++++++++++++++++++++++
- include/configs/nec_ar9344_aterm.h    | 28 +++++++++++
- 9 files changed, 298 insertions(+)
+ board/nec/ar9344_aterm/ar9344_aterm.c | 59 ++++++++++++++++++++++++++
+ configs/nec_ar9344_aterm_defconfig    | 61 +++++++++++++++++++++++++++
+ include/configs/nec_ar9344_aterm.h    | 28 ++++++++++++
+ 8 files changed, 222 insertions(+)
  create mode 100644 arch/mips/dts/nec,ar9344-aterm.dts
  create mode 100644 board/nec/ar9344_aterm/Kconfig
  create mode 100644 board/nec/ar9344_aterm/Makefile
  create mode 100644 board/nec/ar9344_aterm/ar9344_aterm.c
  create mode 100644 configs/nec_ar9344_aterm_defconfig
- create mode 100644 configs/nec_ar9344_aterm_fe_defconfig
  create mode 100644 include/configs/nec_ar9344_aterm.h
 
 --- a/arch/mips/dts/Makefile
@@ -93,7 +91,7 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
  endmenu
 --- /dev/null
 +++ b/board/nec/ar9344_aterm/Kconfig
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,30 @@
 +if BOARD_NEC_AR9344_ATERM
 +
 +config SYS_VENDOR
@@ -123,9 +121,6 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
 +config SYS_ICACHE_LINE_SIZE
 +	default 32
 +
-+config BOARD_NEC_AR9344_ATERM_FE
-+	bool "Aterm devices based on AR9344 with FE ports"
-+
 +endif
 --- /dev/null
 +++ b/board/nec/ar9344_aterm/Makefile
@@ -135,7 +130,7 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
 +obj-y	= ar9344_aterm.o
 --- /dev/null
 +++ b/board/nec/ar9344_aterm/ar9344_aterm.c
-@@ -0,0 +1,70 @@
+@@ -0,0 +1,59 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Copyright (C) 2024 INAGAKI Hiroshi <musashino.open@gmail.com>
@@ -161,27 +156,16 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
 +	writel(0x2, regs + AR934X_GPIO_REG_FUNC);
 +
 +	/* Configure default GPIO OE/SET regs */
-+#if defined(CONFIG_BOARD_NEC_AR9344_ATERM_FE)
-+	writel(0x39b1f, regs + AR71XX_GPIO_REG_OE);
-+	writel(0x040000, regs + AR71XX_GPIO_REG_SET);
-+#else
 +	writel(0x3db1f, regs + AR71XX_GPIO_REG_OE);
 +	writel(0x142000, regs + AR71XX_GPIO_REG_SET);
-+#endif
 +
 +	/* Configure pin multiplexing */
 +	writel(0x00000000, regs + AR934X_GPIO_REG_OUT_FUNC0);
 +	writel(0x0b0a0900, regs + AR934X_GPIO_REG_OUT_FUNC1);
 +	writel(0x00180000, regs + AR934X_GPIO_REG_OUT_FUNC2);
-+	writel(0x2f2e0000, regs + AR934X_GPIO_REG_OUT_FUNC4);
-+
-+#if defined(CONFIG_BOARD_NEC_AR9344_ATERM_FE)
-+	writel(0x002b2a00, regs + AR934X_GPIO_REG_OUT_FUNC3);
-+	writel(0x002c2d00, regs + AR934X_GPIO_REG_OUT_FUNC5);
-+#else
 +	writel(0x00000000, regs + AR934X_GPIO_REG_OUT_FUNC3);
++	writel(0x2f2e0000, regs + AR934X_GPIO_REG_OUT_FUNC4);
 +	writel(0x00000000, regs + AR934X_GPIO_REG_OUT_FUNC5);
-+#endif
 +}
 +
 +#ifdef CONFIG_DEBUG_UART_BOARD_INIT
@@ -271,71 +255,6 @@ Subject: [PATCH] ath79: add support for NEC AR9344 Aterm series
 +CONFIG_SYS_NS16550=y
 +# CONFIG_GZIP is not set
 --- /dev/null
-+++ b/configs/nec_ar9344_aterm_fe_defconfig
-@@ -0,0 +1,62 @@
-+CONFIG_MIPS=y
-+CONFIG_SYS_MALLOC_LEN=0x40000
-+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xbd007fff
-+CONFIG_ENV_SIZE=0x1000
-+CONFIG_DEFAULT_DEVICE_TREE="nec,ar9344-aterm"
-+CONFIG_SYS_LOAD_ADDR=0x83000000
-+CONFIG_ARCH_ATH79=y
-+CONFIG_BOARD_NEC_AR9344_ATERM=y
-+CONFIG_BOARD_NEC_AR9344_ATERM_FE=y
-+CONFIG_SYS_MIPS_TIMER_FREQ=280000000
-+CONFIG_MIPS_RELOCATION_TABLE_SIZE=0x4000
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_TIMESTAMP=y
-+CONFIG_BOOTDELAY=3
-+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
-+CONFIG_USE_BOOTARGS=y
-+CONFIG_BOOTARGS="console=ttyS0,115200"
-+CONFIG_USE_BOOTCOMMAND=y
-+CONFIG_BOOTCOMMAND="bootm 0x9f040000"
-+# CONFIG_DISPLAY_BOARDINFO is not set
-+CONFIG_BOARD_EARLY_INIT_F=y
-+CONFIG_SYS_MALLOC_BOOTPARAMS=y
-+# CONFIG_CMDLINE_EDITING is not set
-+# CONFIG_AUTO_COMPLETE is not set
-+# CONFIG_SYS_LONGHELP is not set
-+CONFIG_SYS_MAXARGS=32
-+# CONFIG_SYS_XTRACE is not set
-+# CONFIG_CMD_BDI is not set
-+# CONFIG_CMD_CONSOLE is not set
-+# CONFIG_BOOTM_PLAN9 is not set
-+# CONFIG_BOOTM_RTEMS is not set
-+# CONFIG_BOOTM_VXWORKS is not set
-+# CONFIG_CMD_ELF is not set
-+# CONFIG_CMD_FDT is not set
-+# CONFIG_CMD_RUN is not set
-+# CONFIG_CMD_XIMG is not set
-+# CONFIG_CMD_EXPORTENV is not set
-+# CONFIG_CMD_IMPORTENV is not set
-+# CONFIG_CMD_EDITENV is not set
-+# CONFIG_CMD_SAVEENV is not set
-+# CONFIG_CMD_ENV_EXISTS is not set
-+# CONFIG_CMD_CRC32 is not set
-+# CONFIG_CMD_DM is not set
-+# CONFIG_CMD_LOADS is not set
-+# CONFIG_CMD_ECHO is not set
-+# CONFIG_CMD_ITEST is not set
-+# CONFIG_CMD_SOURCE is not set
-+# CONFIG_CMD_SETEXPR is not set
-+# CONFIG_CMD_SLEEP is not set
-+# CONFIG_ISO_PARTITION is not set
-+# CONFIG_OF_TAG_MIGRATE is not set
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_NO_NET=y
-+CONFIG_CLK=y
-+# CONFIG_GPIO is not set
-+# CONFIG_I2C is not set
-+# CONFIG_INPUT is not set
-+# CONFIG_POWER is not set
-+CONFIG_DM_SERIAL=y
-+CONFIG_SYS_NS16550=y
-+# CONFIG_GZIP is not set
---- /dev/null
 +++ b/include/configs/nec_ar9344_aterm.h
 @@ -0,0 +1,28 @@
 +/* SPDX-License-Identifier: GPL-2.0+ */

package/boot/uboot-kirkwood/Makefile

@@ -25,11 +25,6 @@ define U-Boot/dns320l
   BUILD_DEVICES:=dlink_dns320l
 endef
 
-define U-Boot/dns325
-  NAME:=D-Link DNS-325 A1
-  BUILD_DEVICES:=dlink_dns-325-a1
-endef
-
 define U-Boot/dockstar
   NAME:=Seagate DockStar
   BUILD_DEVICES:=seagate_dockstar
@@ -117,7 +112,6 @@ endef
 
 UBOOT_TARGETS := \
 	dns320l \
-	dns325 \
 	dockstar dockstar_second_stage \
 	goflexhome \
 	ib62x0 ib62x0_second_stage \

package/boot/uboot-kirkwood/patches/011-arm-kirkwood-dns325-Correct-CONFIG_NR_DRAM_BANKS-parameter.patch

@@ -1,27 +0,0 @@
-From e7e650e8bdb09ac46da017250394f8c589df10bb Mon Sep 17 00:00:00 2001
-From: Tom Rini <trini@konsulko.com>
-Date: Mon, 14 Sep 2020 15:48:47 -0400
-Subject: [PATCH] arm: kirkwood: dns325: Correct CONFIG_NR_DRAM_BANKS parameter
-
-Testing on a DNS-325 NAS has shown that in order for the device to work
-we need to set CONFIG_NR_DRAM_BANKS to 1 and not 2.
-
-Tested-by: Dmitry N. Kolesnikov <dk.diklab@gmail.com>
-Reported-by: Dmitry N. Kolesnikov <dk.diklab@gmail.com>
-Cc: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
-Signed-off-by: Tom Rini <trini@konsulko.com>
----
- configs/dns325_defconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/configs/dns325_defconfig
-+++ b/configs/dns325_defconfig
-@@ -6,7 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
- CONFIG_TARGET_DNS325=y
- CONFIG_ENV_SIZE=0x20000
- CONFIG_ENV_OFFSET=0xE0000
--CONFIG_NR_DRAM_BANKS=2
-+CONFIG_NR_DRAM_BANKS=1
- CONFIG_IDENT_STRING="\nD-Link DNS-325"
- # CONFIG_SYS_MALLOC_F is not set
- CONFIG_BOOTDELAY=3

package/boot/uboot-kirkwood/patches/100-dns325.patch

@@ -1,65 +0,0 @@
---- a/configs/dns325_defconfig
-+++ b/configs/dns325_defconfig
-@@ -27,7 +27,7 @@ CONFIG_CMD_FAT=y
- CONFIG_CMD_JFFS2=y
- CONFIG_CMD_MTDPARTS=y
- CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
--CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:896k(u-boot),128k(u-boot-env),5m(kernel),-(rootfs)"
-+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(u-boot),0x20000@0xe0000(u-boot-env),-@0x100000(ubi)"
- CONFIG_CMD_UBI=y
- CONFIG_ISO_PARTITION=y
- CONFIG_OF_CONTROL=y
---- a/include/configs/dns325.h
-+++ b/include/configs/dns325.h
-@@ -66,46 +66,12 @@
-  */
- 
- #define CONFIG_EXTRA_ENV_SETTINGS \
--	"stdin=serial\0" \
--	"stdout=serial\0" \
--	"stderr=serial\0" \
--	"loadaddr=0x800000\0" \
--	"autoload=no\0" \
--	"console=ttyS0,115200\0" \
--	"mtdparts="CONFIG_MTDPARTS_DEFAULT \
--	"optargs=\0" \
--	"bootenv=uEnv.txt\0" \
--	"importbootenv=echo Importing environment ...; " \
--		"env import -t ${loadaddr} ${filesize}\0" \
--	"loadbootenv=fatload usb 0 ${loadaddr} ${bootenv}\0" \
--	"setbootargs=setenv bootargs console=${console} " \
--		"${optargs} " \
--		"${mtdparts} " \
--		"root=${bootenvroot} " \
--		"rootfstype=${bootenvrootfstype}\0" \
--	"subbootcmd=run setbootargs; " \
--		"if run bootenvloadimage; then " \
--			"bootm ${loadaddr};" \
--		"fi;\0" \
--	"nandroot=ubi0:rootfs ubi.mtd=rootfs\0" \
--	"nandrootfstype=ubifs\0" \
--	"nandloadimage=nand read ${loadaddr} kernel\0" \
--	"setnandbootenv=echo Booting from nand ...; " \
--		"setenv bootenvroot ${nandroot}; " \
--		"setenv bootenvrootfstype ${nandrootfstype}; " \
--		"setenv bootenvloadimage ${nandloadimage}\0"
-+	"mtdids="CONFIG_MTDIDS_DEFAULT "\0" \
-+	"mtdparts="CONFIG_MTDPARTS_DEFAULT "\0"
- 
- #define CONFIG_BOOTCOMMAND \
--	"if test -n ${bootenv} && usb start; then " \
--		"if run loadbootenv; then " \
--			"echo Loaded environment ${bootenv} from usb;" \
--			"run importbootenv;" \
--		"fi;" \
--		"if test -n ${bootenvcmd}; then " \
--			"echo Running bootenvcmd ...;" \
--			"run bootenvcmd;" \
--		"fi;" \
--	"fi;" \
--	"run setnandbootenv subbootcmd;"
-+	"ubi part ubi; " \
-+	"ubi read 0x800000 kernel; " \
-+	"bootm 0x800000"
- 
- #endif /* _CONFIG_DNS325_H */

package/boot/uboot-kirkwood/patches/200-openwrt-config.patch

@@ -214,23 +214,3 @@
 +CONFIG_FIT_VERBOSE=y
  CONFIG_LZMA=y
 +CONFIG_LZO=y
---- a/configs/dns325_defconfig
-+++ b/configs/dns325_defconfig
-@@ -48,3 +48,8 @@ CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_STORAGE=y
-+CONFIG_CMD_BOOTZ=y
-+CONFIG_FIT=y
-+CONFIG_FIT_VERBOSE=y
-+CONFIG_LZMA=y
-+CONFIG_LZO=y
---- a/include/configs/dns325.h
-+++ b/include/configs/dns325.h
-@@ -74,4 +74,6 @@
- 	"ubi read 0x800000 kernel; " \
- 	"bootm 0x800000"
- 
-+#include "openwrt-kirkwood-common.h"
-+
- #endif /* _CONFIG_DNS325_H */

package/boot/uboot-mediatek/Makefile

@@ -231,18 +231,6 @@ define U-Boot/mt7981_abt_asr3000
   DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
 endef
 
-define U-Boot/mt7981_bazis-ax3000wm
-  NAME:=BAZIS AX3000WM
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=bazis_ax3000wm
-  UBOOT_CONFIG:=mt7981_bazis_ax3000wm
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
-endef
-
 define U-Boot/mt7981_cmcc_a10
   NAME:=CMCC A10
   BUILD_SUBTARGET:=filogic
@@ -321,20 +309,9 @@ define U-Boot/mt7981_cudy_tr3000-v1
   BUILD_DEVICES:=cudy_tr3000-v1-ubootmod
   UBOOT_CONFIG:=mt7981_cudy_tr3000-v1
   UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=cudy-ddr3
+  BL2_BOOTDEV:=cudy-tr3000-v1
   BL2_SOC:=mt7981
-  DEPENDS:=+trusted-firmware-a-mt7981-cudy-ddr3
-endef
-
-define U-Boot/mt7981_cudy_wbr3000uax-v1
-  NAME:=Cudy WBR3000UAX v1
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=cudy_wbr3000uax-v1-ubootmod
-  UBOOT_CONFIG:=mt7981_cudy_wbr3000uax-v1
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=cudy-ddr3
-  BL2_SOC:=mt7981
-  DEPENDS:=+trusted-firmware-a-mt7981-cudy-ddr3
+  DEPENDS:=+trusted-firmware-a-mt7981-cudy-tr3000-v1
 endef
 
 define U-Boot/mt7981_glinet_gl-mt2500
@@ -385,18 +362,6 @@ define U-Boot/mt7981_h3c_magic-nx30-pro
   DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
 endef
 
-define U-Boot/mt7981_imou_hx21
-  NAME:=Imou HX21
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=imou_hx21
-  UBOOT_CONFIG:=mt7981_imou_hx21
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
-endef
-
 define U-Boot/mt7981_jcg_q30-pro
   NAME:=JCG Q30 PRO
   BUILD_SUBTARGET:=filogic
@@ -421,18 +386,6 @@ define U-Boot/mt7981_konka_komi-a31
   DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
 endef
 
-define U-Boot/mt7981_netis_nx30v2
-  NAME:=Netis NX30V2
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=netis_nx30v2
-  UBOOT_CONFIG:=mt7981_netis_nx30v2
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
-endef
-
 define U-Boot/mt7981_netis_nx31
   NAME:=netis NX31
   BUILD_SUBTARGET:=filogic
@@ -445,18 +398,6 @@ define U-Boot/mt7981_netis_nx31
   DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
 endef
 
-define U-Boot/mt7981_netis_nx32u
-  NAME:=netis NX32U
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=netis_nx32u
-  UBOOT_CONFIG:=mt7981_netis_nx32u
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7981
-  BL2_DDRTYPE:=ddr3
-  DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
-endef
-
 define U-Boot/mt7981_nokia_ea0326gmp
   NAME:=Nokia EA0326GMP
   BUILD_SUBTARGET:=filogic
@@ -905,17 +846,6 @@ define U-Boot/mt7987_bananapi_bpi-r4-lite-nor
   FIP_COMPRESS:=1
 endef
 
-define U-Boot/mt7987_routerich_be7200
-  NAME:=Routerich BE7200
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=routerich_be7200
-  UBOOT_CONFIG:=mt7987a_routerich_be7200
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand0
-  BL2_SOC:=mt7987
-  DEPENDS:=+trusted-firmware-a-mt7987-spim-nand0
-endef
-
 define U-Boot/mt7988_arcadyan_mozart
   NAME:=Arcadyan Mozart
   BUILD_SUBTARGET:=filogic
@@ -1130,7 +1060,6 @@ UBOOT_TARGETS := \
 	mt7628_ravpower_rp-wd009 \
 	mt7629_rfb \
 	mt7981_abt_asr3000 \
-	mt7981_bazis-ax3000wm \
 	mt7981_cmcc_a10 \
 	mt7981_cmcc_rax3000m-emmc-ddr3 \
 	mt7981_cmcc_rax3000m-emmc-ddr4 \
@@ -1138,18 +1067,14 @@ UBOOT_TARGETS := \
 	mt7981_cmcc_rax3000m-nand-ddr4 \
 	mt7981_comfast_cf-wr632ax \
 	mt7981_cudy_tr3000-v1 \
-	mt7981_cudy_wbr3000uax-v1 \
 	mt7981_gatonetworks_gdsp \
 	mt7981_glinet_gl-mt2500 \
 	mt7981_glinet_gl-x3000 \
 	mt7981_glinet_gl-xe3000 \
 	mt7981_h3c_magic-nx30-pro \
-	mt7981_imou_hx21 \
 	mt7981_jcg_q30-pro \
 	mt7981_konka_komi-a31 \
-	mt7981_netis_nx30v2 \
 	mt7981_netis_nx31 \
-	mt7981_netis_nx32u \
 	mt7981_nokia_ea0326gmp \
 	mt7981_openwrt_one-snand \
 	mt7981_openwrt_one-nor \
@@ -1189,7 +1114,6 @@ UBOOT_TARGETS := \
 	mt7987_rfb-emmc \
 	mt7987_rfb-sd \
 	mt7987_rfb-spim-nand \
-	mt7987_routerich_be7200 \
 	mt7988_arcadyan_mozart \
 	mt7988_asus_zenwifi-bt8 \
 	mt7988_bananapi_bpi-r4-emmc \

package/boot/uboot-mediatek/patches/102-mtd-spinand-esmt-add-support-for-F50L1G41LC.patch

@@ -1,68 +0,0 @@
-Subject: [PATCH] mtd: spinand: esmt: add support for F50L1G41LC
-
-This adds support for ESMT F50L1G41LC, which appears to be an updated
-version of the already supported F50L1G41LB.
-Add esmt_8c SPI_NAND manufacturer to account for the newly used vendor
-ID with support for the ESMT F50L1G41LC chip.
-
---- a/drivers/mtd/nand/spi/core.c
-+++ b/drivers/mtd/nand/spi/core.c
-@@ -895,6 +895,7 @@ static const struct spinand_manufacturer
- 	&toshiba_spinand_manufacturer,
- 	&winbond_spinand_manufacturer,
- 	&esmt_c8_spinand_manufacturer,
-+	&esmt_8c_spinand_manufacturer,
- 	&foresee_spinand_manufacturer,
- 	&xtx_spinand_manufacturer,
- };
---- a/drivers/mtd/nand/spi/esmt.c
-+++ b/drivers/mtd/nand/spi/esmt.c
-@@ -13,6 +13,7 @@
- 
- /* ESMT uses GigaDevice 0xc8 JECDEC ID on some SPI NANDs */
- #define SPINAND_MFR_ESMT_C8			0xc8
-+#define SPINAND_MFR_ESMT_8C			0x8c
- 
- static SPINAND_OP_VARIANTS(read_cache_variants,
- 			   SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
-@@ -104,6 +105,18 @@ static const struct mtd_ooblayout_ops f5
- 	.rfree = f50l1g41lb_ooblayout_free,
- };
- 
-+static const struct spinand_info esmt_8c_spinand_table[] = {
-+	SPINAND_INFO("F50L1G41LC",
-+		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0x2C),
-+		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),
-+		     NAND_ECCREQ(1, 512),
-+		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
-+					      &write_cache_variants,
-+					      &update_cache_variants),
-+		     0,
-+		     SPINAND_ECCINFO(&f50l1g41lb_ooblayout, NULL)),
-+};
-+
- static const struct spinand_info esmt_c8_spinand_table[] = {
- 	SPINAND_INFO("F50L1G41LB",
- 		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0x01),
-@@ -135,3 +148,11 @@ const struct spinand_manufacturer esmt_c
- 	.nchips = ARRAY_SIZE(esmt_c8_spinand_table),
- 	.ops = &esmt_spinand_manuf_ops,
- };
-+
-+const struct spinand_manufacturer esmt_8c_spinand_manufacturer = {
-+	.id = SPINAND_MFR_ESMT_8C,
-+	.name = "ESMT",
-+	.chips = esmt_8c_spinand_table,
-+	.nchips = ARRAY_SIZE(esmt_8c_spinand_table),
-+	.ops = &esmt_spinand_manuf_ops,
-+};
---- a/include/linux/mtd/spinand.h
-+++ b/include/linux/mtd/spinand.h
-@@ -306,6 +306,7 @@ extern const struct spinand_manufacturer
- extern const struct spinand_manufacturer toshiba_spinand_manufacturer;
- extern const struct spinand_manufacturer winbond_spinand_manufacturer;
- extern const struct spinand_manufacturer esmt_c8_spinand_manufacturer;
-+extern const struct spinand_manufacturer esmt_8c_spinand_manufacturer;
- extern const struct spinand_manufacturer foresee_spinand_manufacturer;
- extern const struct spinand_manufacturer xtx_spinand_manufacturer;
- 

package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch

@@ -104,7 +104,7 @@
 +U_BOOT_CMD_COMPLETE(
 +	readmem,	CONFIG_SYS_MAXARGS,	3,	do_env_readmem,
 +	"get environment variable from memory address",
-+	"[-b] name address size\n"
++	"name [-b] address size\n"
 +	"    - store memory address to env variable\n"
 +	"      \"-b\": read binary ethaddr",
 +	var_complete

package/boot/uboot-mediatek/patches/445-add-netis-nx32u.patch

@@ -1,341 +0,0 @@
---- /dev/null
-+++ b/configs/mt7981_netis_nx32u_defconfig
-@@ -0,0 +1,108 @@
-+CONFIG_ARM=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981-netis_nx32u"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_FIT=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981-netis_nx32u.dtb"
-+CONFIG_LOGLEVEL=7
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_LOG=y
-+# CONFIG_BOARD_INIT is not set
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_LINK_LOCAL=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_UUID=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_REDUNDANT=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-+CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y
-+CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/netis_nx32u_env"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_CLK=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+# CONFIG_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_DM_MTD=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PHY=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_SERIAL_RX_BUFFER=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
---- /dev/null
-+++ b/arch/arm/dts/mt7981-netis_nx32u.dts
-@@ -0,0 +1,167 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2026
-+ * Author: Fil Dunsky <filipp.dunsky@gmail.com>
-+ */
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "netis NX32U";
-+	compatible = "netis,nx32u", "mediatek,mt7981";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x10000000>;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		button-reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&pio 1 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		button-mesh {
-+			label = "mesh";
-+			linux,code = <BTN_0>;
-+			gpios = <&pio 0 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	gpio-leds {
-+		compatible = "gpio-leds";
-+
-+		led_internet {
-+			label = "green:internet";
-+			gpios = <&pio 9 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_wps {
-+			label = "green:wps";
-+			gpios = <&pio 5 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_wifi2g {
-+			label = "green:wifi2g";
-+			gpios = <&pio 34 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_wifi5g {
-+			label = "green:wifi5g";
-+			gpios = <&pio 35 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_usb {
-+			label = "green:usb";
-+			gpios = <&pio 13 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pio {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+	};
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "BL2";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "u-boot-env";
-+				reg = <0x100000 0x80000>;
-+			};
-+
-+			partition@160000 {
-+				label = "Factory";
-+				reg = <0x180000 0x200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "FIP";
-+				reg = <0x380000 0x200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "ubi";
-+				reg = <0x580000 0x7a80000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/defenvs/netis_nx32u_env
-@@ -0,0 +1,57 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=run check_buttons ; if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-netis_nx32u-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-netis_nx32u-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-netis_nx32u-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-netis_nx32u-squashfs-sysupgrade.itb
-+bootled_status=green:wps
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_status on ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_status on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led bootled_status off
-+boot_recovery=led $bootled_status on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led bootled_status off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_status on ; while true ; do run boot_tftp ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+check_buttons=if button reset ; then run boot_tftp ; fi
-+ethaddr_factory=mtd read Factory 0x40080000 0x1e0000 0x20000 && env readmem -b ethaddr 0x4009ef20 0x6 ; setenv ethaddr_factory
-+part_default=production
-+part_recovery=recovery
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase FIP && mtd write FIP $loadaddr
-+mtd_write_bl2=mtd erase BL2 && mtd write BL2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run ethaddr_factory ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"

package/boot/uboot-mediatek/patches/448-add-comfast_cf-wr632ax.patch

@@ -283,7 +283,7 @@
 +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
 +bootmenu_default=0
 +bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
++bootmenu_title=      [0;34m( ( ( [1;39mOpenWrt[0;34m ) ) )
 +bootmenu_0=Initialize environment.=run _firstboot
 +bootmenu_0d=Run default boot command.=run boot_default
 +bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
@@ -291,8 +291,8 @@
 +bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
 +bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
 +bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
++bootmenu_6=[31mLoad BL31+U-Boot FIP via TFTP then write to NAND.[0m=run boot_tftp_write_fip ; run bootmenu_confirm_return
++bootmenu_7=[31mLoad BL2 preloader via TFTP then write to NAND.[0m=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
 +bootmenu_8=Reboot.=reset
 +bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
 +boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
@@ -320,4 +320,4 @@
 +_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
 +_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
 +_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
++_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       [33m$ver[0m"

package/boot/uboot-mediatek/patches/449-add-cudy_wbr3000uax-v1.patch

@@ -1,355 +0,0 @@
---- /dev/null
-+++ b/configs/mt7981_cudy_wbr3000uax-v1_defconfig
-@@ -0,0 +1,108 @@
-+CONFIG_ARM=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981-cudy-wbr3000uax-v1"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_FIT=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981-cudy-wbr3000uax-v1.dtb"
-+CONFIG_LOGLEVEL=7
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_LOG=y
-+# CONFIG_BOARD_INIT is not set
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_LINK_LOCAL=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_UUID=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_REDUNDANT=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-+CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y
-+CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/cudy_wbr3000uax-v1_env"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_CLK=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+# CONFIG_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_DM_MTD=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PHY=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_SERIAL_RX_BUFFER=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
---- /dev/null
-+++ b/arch/arm/dts/mt7981-cudy-wbr3000uax-v1.dts
-@@ -0,0 +1,184 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "Cudy WBR3000UAX v1";
-+	compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x20000000>;
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+		button-reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&pio 1 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		button-wps {
-+			label = "wps";
-+			linux,code = <KEY_WPS_BUTTON>;
-+			gpios = <&pio 0 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	gpio-leds {
-+		compatible = "gpio-leds";
-+
-+		led_status: led_power {
-+			label = "blue:power";
-+			gpios = <&pio 8 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_wan_blue {
-+			label = "blue:wan";
-+			gpios = <&pio 10 GPIO_ACTIVE_LOW>;
-+		};
-+		
-+		led_wan_red {
-+			label = "red:wan";
-+			gpios = <&pio 4 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_lan {
-+			label = "blue:lan";
-+			gpios = <&pio 11 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_wps_blue {
-+			label = "blue:wps";
-+			gpios = <&pio 9 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_wps_red {
-+			label = "red:wps";
-+			gpios = <&pio 5 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_wifi2g {
-+			label = "blue:wifi2g";
-+			gpios = <&pio 6 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_wifi5g {
-+			label = "blue:wifi5g";
-+			gpios = <&pio 7 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pio {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+	};
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "u-boot-env";
-+				reg = <0x100000 0x80000>;
-+			};
-+
-+			partition@180000 {
-+				label = "factory";
-+				reg = <0x180000 0x200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "bdinfo";
-+				reg = <0x380000 0x40000>;
-+			};
-+
-+			partition@3c0000 {
-+				label = "fip";
-+				reg = <0x3c0000 0x200000>;
-+			};
-+
-+			partition@5c0000 {
-+				label = "ubi";
-+				reg = <0x5c0000 0x7a40000>;
-+				compatible = "linux,ubi";
-+			};
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/defenvs/cudy_wbr3000uax-v1_env
-@@ -0,0 +1,54 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-cudy_wbr3000uax-v1-ubootmod-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-cudy_wbr3000uax-v1-ubootmod-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-cudy_wbr3000uax-v1-ubootmod-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-cudy_wbr3000uax-v1-ubootmod-squashfs-sysupgrade.itb
-+bootled_pwr=blue:power
-+bootled_rec=red:wan
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"

package/boot/uboot-mediatek/patches/461-add-netis-nx30v2.patch

@@ -1,390 +0,0 @@
---- /dev/null
-+++ b/arch/arm/dts/mt7981-netis-nx30v2.dts
-@@ -0,0 +1,160@@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	model = "Netis NX30V2";
-+	compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x10000000>;
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+		reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&pio 1 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wps {
-+			label = "wps";
-+			linux,code = <KEY_WPS_BUTTON>;
-+			gpios = <&pio 0 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		internet {
-+			label = "internet";
-+			gpios = <&pio 7 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		power {
-+			label = "power";
-+			gpios = <&pio 4 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wifi {
-+			label = "wifi";
-+			gpios = <&pio 34 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wps {
-+			label = "wps";
-+			gpios = <&pio 5 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wan {
-+			label = "wan";
-+			gpios = <&pio 8 GPIO_ACTIVE_LOW>;
-+		};
-+
-+	};
-+
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "auto";
-+	reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pio {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+	};
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "BL2";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "u-boot-env";
-+				reg = <0x100000 0x80000>;
-+			};
-+
-+			partition@180000 {
-+				label = "Factory";
-+				reg = <0x180000 0x200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "FIP";
-+				reg = <0x380000 0x200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "ubi";
-+				reg = <0x580000 0x7280000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/configs/mt7981_netis_nx30v2_defconfig
-@@ -0,0 +1,156 @@
-+CONFIG_ARM=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981-netis-nx30v2"
-+CONFIG_TARGET_MT7981=y
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_SMBIOS_PRODUCT_NAME=""
-+CONFIG_CFB_CONSOLE_ANSI=y
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_BUTTON_CMD=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_FIT=y
-+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_SW_BLINK=y
-+CONFIG_LED_GPIO=y
-+CONFIG_SPI_BOOT=y
-+CONFIG_BOOTSTD_DEFAULTS=y
-+CONFIG_BOOTSTD_FULL=y
-+CONFIG_USE_PREBOOT=y
-+CONFIG_SYS_CBSIZE=512
-+CONFIG_SYS_PBSIZE=1049
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_LOGLEVEL=7
-+CONFIG_LOG=y
-+# CONFIG_BOARD_INIT is not set
-+CONFIG_SYS_PROMPT="MT7981> "
-+# CONFIG_BOOTM_NETBSD is not set
-+# CONFIG_BOOTM_PLAN9 is not set
-+# CONFIG_BOOTM_RTEMS is not set
-+# CONFIG_BOOTM_VXWORKS is not set
-+# CONFIG_CMD_UNLZ4 is not set
-+# CONFIG_CMD_UNZIP is not set
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_BOOTP=y
-+CONFIG_CMD_BUTTON=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DFU=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_ELF=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_ECHO=y
-+CONFIG_CMD_ENV_READMEM=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_FDT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_ITEST=y
-+CONFIG_CMD_LED=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_LINK_LOCAL=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_NAND=y
-+# CONFIG_MTD_RAW_NAND is not set
-+CONFIG_CMD_NAND_TRIMFFS=y
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_SF=y
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_CMD_UBIFS=y
-+CONFIG_CMD_TFTPBOOT=y
-+CONFIG_CMD_TFTPPUT=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_SETEXPR=y
-+CONFIG_CMD_SLEEP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_SOURCE=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_UUID=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_ENV_SIZE_REDUND=0x1f000
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_UBI_VOLUME_CREATE=y
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y
-+CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/netis_nx30v2.env"
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
-+CONFIG_REGEX=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_CLK=y
-+# CONFIG_MMC is not set
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+CONFIG_MTD=y
-+CONFIG_DM_MTD=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_DM_SPI_FLASH=y
-+CONFIG_SPI_FLASH_SFDP_SUPPORT=y
-+CONFIG_SPI_FLASH_EON=y
-+CONFIG_SPI_FLASH_GIGADEVICE=y
-+CONFIG_SPI_FLASH_ISSI=y
-+CONFIG_SPI_FLASH_MACRONIX=y
-+CONFIG_SPI_FLASH_SPANSION=y
-+CONFIG_SPI_FLASH_STMICRO=y
-+CONFIG_SPI_FLASH_WINBOND=y
-+CONFIG_SPI_FLASH_XMC=y
-+CONFIG_SPI_FLASH_XTX=y
-+CONFIG_SPI_FLASH_MTD=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_SERIAL_RX_BUFFER=y
-+CONFIG_SERIAL_RX_BUFFER_SIZE=256
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_HEXDUMP=y
-+# CONFIG_EFI_LOADER is not set
-+CONFIG_LMB_MAX_REGIONS=64
-+CONFIG_OF_SYSTEM_SETUP=y
-+CONFIG_UPDATE_COMMON=y
-+CONFIG_UPDATE_FIT=y
-+CONFIG_CONSOLE_MUX=y
---- /dev/null
-+++ b/defenvs/netis_nx30v2.env
-@@ -0,0 +1,64 @@
-+#misc settings
-+serverip=192.168.1.254
-+ipaddr=192.168.1.1
-+ncip=192.168.1.254
-+loadaddr=0x46000000
-+return_bootmenu=askenv - Press ENTER to return to menu ; bootmenu 60
-+
-+#file name defines
-+bootfile_bl2=openwrt-mediatek-filogic-netis_nx30v2-spim-nand-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-netis_nx30v2-spim-nand-bl31-uboot.fip
-+bootfile_rec=openwrt-mediatek-filogic-netis_nx30v2-initramfs.itb
-+bootfile_fw=openwrt-mediatek-filogic-netis_nx30v2-squashfs-sysupgrade.itb
-+
-+#boot commands
-+bootconf=config-1
-+boot_recovery=tftpboot $bootfile_rec && iminfo && bootm $loadaddr#$bootconf
-+boot_nand=ubi read $loadaddr fit;bootm $loadaddr#$bootconf
-+bootcmd=run boot_nand; while true; do run boot_recovery; done
-+
-+#bootmenu
-+bootmenu_default=0
-+bootmenu_0=Startup system (Default)=run bootcmd
-+bootmenu_1=Upgrade firmware via TFTP=run upgrade_fw ; run return_bootmenu
-+bootmenu_2=Startup recovery image via TFTP=run boot_recovery ; run return_bootmenu
-+bootmenu_3=Upgrade BL2 preloader via TFTP=run upgrade_bl2 ; run return_bootmenu
-+bootmenu_4=Upgrade BL31+U-Boot FIP via TFTP=run upgrade_fip ; run return_bootmenu
-+bootmenu_5=Reset all settings to factory default.=run reset_all; reset
-+bootmenu_6=Reboot.=reset
-+
-+#upgrade commands
-+upgrade_bl2=run led_blink_downloading && tftpboot $bootfile_bl2 && run led_blink_writing && nand erase BL2 && nand write $loadaddr BL2; run led_on
-+upgrade_fip=run led_blink_downloading && tftpboot $bootfile_fip && run led_blink_writing && nand erase FIP && nand write $loadaddr FIP; run led_on
-+upgrade_fw=run led_blink_downloading && tftpboot $bootfile_fw && iminfo && run led_blink_writing && if ubi check fit; then ubi remove fit; else true; fi && ubi create fit $filesize && ubi write $loadaddr fit $filesize; run led_on
-+
-+#restore offical bootloader
-+offical_download=run led_blink_downloading; setenv failed 1; while test $failed -eq 1; do setenv bl2addr 0x46000000 && tftpboot $bl2addr bl2.img && setenv fipaddr 0x46380000 && tftpboot $fipaddr fip.bin && setenv failed 0; done; setenv customer 0; setenv customeraddr 0x46580000 && tftpboot $customeraddr customer && setenv customer 1; test $failed -eq 0
-+offical_write=run led_blink_writing; nand erase BL2 && nand write $bl2addr BL2 && nand erase FIP && nand write $fipaddr FIP; ubi detach; mtd erase ubi; ubi part ubi; if test $customer -eq 1; then ubi create customer $filesize; ubi write $customeraddr customer $filesize; fi; true
-+offical_upgrade=run offical_download offical_write led_on; echo upgrade offical bootloader done; while true; do sleep 10; done
-+
-+#factory default
-+reset_env=env default -a && saveenv
-+reset_usr=ubi check rootfs_data && ubi remove rootfs_data; run create_rootfs_data
-+reset_all=run reset_env reset_usr
-+
-+#prepare ethaddr and rootfs_data at preload
-+rootfs_data_max=0x5300000
-+create_rootfs_data=if env exists rootfs_data_max; then ubi create rootfs_data $rootfs_data_max; else ubi create rootfs_data -; fi
-+set_ethaddr=mtd read Factory $loadaddr 0x1fe000 0x1000 && setexpr tmpaddr $loadaddr + 0xf20 && mw.b $loadaddr 0 6 && cmp.b $loadaddr $tmpaddr 6 || readmem -b ethaddr $tmpaddr 0x6
-+preboot=run set_ethaddr; if ubi part; then else mtd erase ubi; ubi part ubi; fi; ubi check rootfs_data || run create_rootfs_data
-+
-+#led
-+led_blink_downloading=led internet blink 100; led wifi blink 100; led wps blink 100
-+led_blink_writing=led internet blink 1000; led wifi blink 1000; led wps blink 1000
-+led_on=led internet on; led wifi on; led wps on
-+
-+#netconsole
-+netconsole=setenv stdout serial,nc;setenv stdin serial,nc
-+nonetconcole=setenv stdout serial;setenv stdin serial
-+
-+# button commands
-+button_cmd_0=run netconsole led_on; sleep 5; if button wps; then run nonetconcole offical_upgrade; fi
-+button_cmd_0_name=wps
-+button_cmd_1=run netconsole led_on reset_all; sleep 5; if button reset; then run nonetconcole; while true; do run upgrade_fw && run boot_nand; done; fi
-+button_cmd_1_name=reset

package/boot/uboot-mediatek/patches/466-add-imou-hx21.patch

@@ -1,342 +0,0 @@
---- /dev/null
-+++ b/configs/mt7981_imou_hx21_defconfig
-@@ -0,0 +1,108 @@
-+CONFIG_ARM=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981-imou-hx21"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_FIT=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981-imou-hx21.dtb"
-+CONFIG_LOGLEVEL=7
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_LOG=y
-+# CONFIG_BOARD_INIT is not set
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_LINK_LOCAL=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_UUID=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_REDUNDANT=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-+CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y
-+CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/imou_hx21_env"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_CLK=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+# CONFIG_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_DM_MTD=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PHY=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_SERIAL_RX_BUFFER=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
---- /dev/null
-+++ b/arch/arm/dts/mt7981-imou-hx21.dts
-@@ -0,0 +1,171 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "Imou HX21";
-+	compatible = "imou,hx21", "mediatek,mt7981", "mediatek,mt7981-rfb";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x10000000>;
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+
-+		button-reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&pio 1 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		button-mesh {
-+			label = "mesh";
-+			linux,code = <BTN_9>;
-+			linux,input-type = <EV_SW>;
-+			gpios = <&pio 0 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	gpio-leds {
-+		compatible = "gpio-leds";
-+
-+		power_led: led-0 {
-+			label = "green:power";
-+			gpios = <&pio 4 GPIO_ACTIVE_LOW>;
-+			default-state = "on";
-+		};
-+
-+		led-1 {
-+			label = "green:wan";
-+			gpios = <&pio 5 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+		};
-+
-+		led-2 {
-+			label = "red:wan";
-+			gpios = <&pio 6 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+		};
-+
-+		led-3 {
-+			label = "green:lan";
-+			gpios = <&pio 7 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+		};
-+
-+		led-4 {
-+			label = "green:wlan";
-+			gpios = <&pio 8 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+		};
-+	};
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <0>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "mt7531";
-+	reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+	};
-+};
-+
-+&pio {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_8mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
-+		};
-+	};
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "bl2";
-+				reg = <0x00000 0x0100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "u-boot-env";
-+				reg = <0x0100000 0x0080000>;
-+			};
-+
-+			partition@180000 {
-+				label = "factory";
-+				reg = <0x180000 0x0200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "fip";
-+				reg = <0x380000 0x0200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "ubi";
-+				reg = <0x580000 0x7a80000>;
-+				compatible = "linux,ubi";
-+			};
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/defenvs/imou_hx21_env
-@@ -0,0 +1,54 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-imou_hx21-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-imou_hx21-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-imou_hx21-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-imou_hx21-squashfs-sysupgrade.itb
-+bootled_pwr=green:power
-+bootled_rec=green:power
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"

package/boot/uboot-mediatek/patches/467-add-routerich-be7200.patch

@@ -1,373 +0,0 @@
---- /dev/null
-+++ b/configs/mt7987a_routerich_be7200_defconfig
-@@ -0,0 +1,133 @@
-+CONFIG_ARM=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7987a-routerich_be7200"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_TARGET_MT7987=y
-+CONFIG_CPU_ARMV8=y
-+CONFIG_SYS_BOOTM_LEN=0x6000000
-+CONFIG_SYS_LOAD_ADDR=0x48000000
-+CONFIG_PRE_CON_BUF_ADDR=0x4007ef00
-+CONFIG_DEBUG_UART_BASE=0x11000000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_FIT=y
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_DEFAULT_FDT_FILE="mt7987a-routerich_be7200"
-+CONFIG_SYS_CBSIZE=512
-+CONFIG_SYS_PBSIZE=1049
-+CONFIG_LOGLEVEL=7
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_LOG=y
-+# CONFIG_BOARD_INIT is not set
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_PROMPT="MT7987> "
-+# CONFIG_BOOTM_NETBSD is not set
-+# CONFIG_BOOTM_PLAN9 is not set
-+# CONFIG_BOOTM_RTEMS is not set
-+# CONFIG_BOOTM_VXWORKS is not set
-+# CONFIG_CMD_BOOTEFI_BOOTMGR is not set
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_PWM=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_I2C=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_LINK_LOCAL=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_UUID=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_EXT4=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FS_GENERIC=y
-+CONFIG_CMD_FS_UUID=y
-+CONFIG_CMD_SF_TEST=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+# CONFIG_CMD_XIMG is not set
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_REDUNDANT=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y
-+CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/routerich_be7200_env"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_NETMASK=y
-+CONFIG_NETMASK="255.255.255.0"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_CLK=y
-+CONFIG_DM_I2C=y
-+CONFIG_SYS_I2C_MTK=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+# CONFIG_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_DM_MTD=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_PHY_ETHERNET_ID=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7987=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_DM_PWM=y
-+CONFIG_PWM_MTK=y
-+CONFIG_SCSI=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_SERIAL_RX_BUFFER=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_USB=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_MTK=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
---- /dev/null
-+++ b/defenvs/routerich_be7200_env
-@@ -0,0 +1,57 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x48000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=run check_buttons ; if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-routerich_be7200-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-routerich_be7200-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-routerich_be7200-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-routerich_be7200-squashfs-sysupgrade.itb
-+bootled_status=blue:status
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_status on ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_status on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led bootled_status off
-+boot_recovery=led $bootled_status on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led bootled_status off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_status on ; while true ; do run boot_tftp ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+check_buttons=if button reset ; then run boot_tftp ; fi
-+ethaddr_factory=mtd read Factory 0x40080000 0x0 0x20000 && env readmem -b ethaddr 0x40080004 0x6 ; setenv ethaddr_factory
-+part_default=production
-+part_recovery=recovery
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase FIP && mtd write FIP $loadaddr
-+mtd_write_bl2=mtd erase BL2 && mtd write BL2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run ethaddr_factory ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
---- /dev/null
-+++ b/arch/arm/dts/mt7987a-routerich_be7200.dts
-@@ -0,0 +1,77 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2025
-+ * Author: Mikhail Zhilkin <csharper2005@gmail.com>
-+ */
-+
-+/dts-v1/;
-+#include "mt7987a.dtsi"
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	model = "Routerich BE7200";
-+	compatible = "routerich,be7200",
-+		     "mediatek,mt7987";
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+		button-0 {
-+			label = "mesh";
-+			linux,code = <KEY_WPS_BUTTON>;
-+			gpios = <&pio 0 GPIO_ACTIVE_LOW>;
-+			debounce-interval = <10>;
-+		};
-+
-+		button-1 {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&pio 1 GPIO_ACTIVE_LOW>;
-+			debounce-interval = <10>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led-0 {
-+			label = "blue:status";
-+			gpios = <&pio 4 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led-1 {
-+			label = "blue:wlan5g";
-+			gpios = <&pio 5 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led-2 {
-+			label = "blue:mesh";
-+			gpios = <&pio 7 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led-3 {
-+			label = "red:wan";
-+			gpios = <&pio 8 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led-4 {
-+			label = "blue:wan";
-+			gpios = <&pio 9 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led-5 {
-+			label = "blue:lan3";
-+			gpios = <&pio 10 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led-6 {
-+			label = "blue:lan2";
-+			gpios = <&pio 11 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led-7 {
-+			label = "blue:lan1";
-+			gpios = <&pio 12 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
---- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -1138,6 +1138,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
- 	mt7986b-emmc-rfb.dtb \
- 	mt7987a-emmc-rfb.dtb \
- 	mt7987a-rfb.dtb \
-+	mt7987a-routerich_be7200.dtb \
- 	mt7987a-sd-rfb.dtb \
- 	mt7988-rfb.dtb \
- 	mt7988-sd-rfb.dtb \
---- /dev/null
-+++ b/arch/arm/dts/mt7987a-routerich_be7200-u-boot.dtsi
-@@ -0,0 +1,84 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2025
-+ * Author: Mikhail Zhilkin <csharper2005@gmail.com>
-+ */
-+
-+#include "mt7987a-u-boot.dtsi"
-+#include "mt7987-netsys-u-boot.dtsi"
-+
-+/ {
-+	model = "Routerich BE7200";
-+	compatible = "routerich,be7200",
-+		     "mediatek,mt7987";
-+};
-+
-+&eth0 {
-+	status = "okay";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mdio0_pins>;
-+	phy-mode = "2500base-x";
-+	mediatek,switch = "auto";
-+	reset-gpios = <&pio 42 GPIO_ACTIVE_HIGH>;
-+
-+	fixed-link {
-+		speed = <2500>;
-+		full-duplex;
-+		pause;
-+	};
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_flash_pins>;
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+		spi-rx-bus-width = <4>;
-+		spi-tx-bus-width = <4>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "BL2";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "u-boot-env (unused)";
-+				reg = <0x100000 0x80000>;
-+			};
-+
-+			partition@180000 {
-+				label = "Factory";
-+				reg = <0x180000 0x400000>;
-+			};
-+
-+			partition@580000 {
-+				label = "FIP";
-+				reg = <0x580000 0x200000>;
-+			};
-+
-+			partition@780000 {
-+				label = "ubi";
-+				reg = <0x780000 0x1f880000>;
-+				compatible = "linux,ubi";
-+			};
-+		};
-+	};
-+};

package/boot/uboot-mediatek/patches/502-add-bazis-ax3000wm.patch

@@ -1,329 +0,0 @@
---- /dev/null
-+++ b/configs/mt7981_bazis_ax3000wm_defconfig
-@@ -0,0 +1,107 @@
-+CONFIG_ARM=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_POSITION_INDEPENDENT=y
-+CONFIG_ARCH_MEDIATEK=y
-+CONFIG_TEXT_BASE=0x41e00000
-+CONFIG_SYS_MALLOC_F_LEN=0x4000
-+CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="mt7981-bazis-ax3000wm"
-+CONFIG_OF_LIBFDT_OVERLAY=y
-+CONFIG_TARGET_MT7981=y
-+CONFIG_SYS_LOAD_ADDR=0x46000000
-+CONFIG_PRE_CON_BUF_ADDR=0x4007ef00
-+CONFIG_DEBUG_UART_BASE=0x11002000
-+CONFIG_DEBUG_UART_CLOCK=40000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_FIT=y
-+CONFIG_BOOTDELAY=30
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_AUTOBOOT_MENU_SHOW=y
-+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981-bazis-ax3000wm.dtb"
-+CONFIG_LOGLEVEL=7
-+CONFIG_PRE_CONSOLE_BUFFER=y
-+CONFIG_LOG=y
-+# CONFIG_BOARD_INIT is not set
-+CONFIG_BOARD_LATE_INIT=y
-+CONFIG_HUSH_PARSER=y
-+CONFIG_SYS_PROMPT="MT7981> "
-+CONFIG_CMD_CPU=y
-+CONFIG_CMD_LICENSE=y
-+CONFIG_CMD_BOOTMENU=y
-+CONFIG_CMD_ASKENV=y
-+CONFIG_CMD_ERASEENV=y
-+CONFIG_CMD_ENV_FLAGS=y
-+CONFIG_CMD_STRINGS=y
-+CONFIG_CMD_DM=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_MTD=y
-+CONFIG_CMD_PART=y
-+CONFIG_CMD_TFTPSRV=y
-+CONFIG_CMD_RARP=y
-+CONFIG_CMD_CDP=y
-+CONFIG_CMD_SNTP=y
-+CONFIG_CMD_LINK_LOCAL=y
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_DNS=y
-+CONFIG_CMD_PING=y
-+CONFIG_CMD_PXE=y
-+CONFIG_CMD_CACHE=y
-+CONFIG_CMD_PSTORE=y
-+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
-+CONFIG_CMD_UUID=y
-+CONFIG_CMD_HASH=y
-+CONFIG_CMD_SMC=y
-+CONFIG_CMD_UBI=y
-+CONFIG_CMD_UBI_RENAME=y
-+CONFIG_OF_EMBED=y
-+CONFIG_ENV_OVERWRITE=y
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_REDUNDANT=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_UBI_VOLUME="ubootenv"
-+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
-+CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-+CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y
-+CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/bazis_ax3000wm_env"
-+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_VERSION_VARIABLE=y
-+CONFIG_NETCONSOLE=y
-+CONFIG_USE_IPADDR=y
-+CONFIG_IPADDR="192.168.1.1"
-+CONFIG_USE_SERVERIP=y
-+CONFIG_SERVERIP="192.168.1.254"
-+CONFIG_NET_RANDOM_ETHADDR=y
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_GPIO=y
-+CONFIG_CLK=y
-+CONFIG_GPIO_HOG=y
-+CONFIG_LED=y
-+CONFIG_LED_BLINK=y
-+CONFIG_LED_GPIO=y
-+# CONFIG_MMC is not set
-+CONFIG_MTD=y
-+CONFIG_DM_MTD=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_MTD_UBI_FASTMAP=y
-+CONFIG_PHY_FIXED=y
-+CONFIG_MEDIATEK_ETH=y
-+CONFIG_PHY=y
-+CONFIG_PHY_MTK_TPHY=y
-+CONFIG_PINCTRL=y
-+CONFIG_PINCONF=y
-+CONFIG_PINCTRL_MT7981=y
-+CONFIG_POWER_DOMAIN=y
-+CONFIG_MTK_POWER_DOMAIN=y
-+CONFIG_DM_REGULATOR=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_RAM=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_SERIAL_RX_BUFFER=y
-+CONFIG_MTK_SERIAL=y
-+CONFIG_SPI=y
-+CONFIG_DM_SPI=y
-+CONFIG_MTK_SPIM=y
-+CONFIG_ZSTD=y
-+CONFIG_HEXDUMP=y
---- /dev/null
-+++ b/arch/arm/dts/mt7981-bazis-ax3000wm.dts
-@@ -0,0 +1,159 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2026
-+ * Author: Fil Dunsky <filipp.dunsky@gmail.com>
-+ */
-+
-+/dts-v1/;
-+#include "mt7981.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/linux-event-codes.h>
-+
-+/ {
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+	model = "Bazis AX3000WM";
-+	compatible = "bazis,ax3000wm", "mediatek,mt7981";
-+
-+	chosen {
-+		stdout-path = &uart0;
-+		tick-timer = &timer0;
-+	};
-+
-+	memory@40000000 {
-+		device_type = "memory";
-+		reg = <0x40000000 0x10000000>;
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+
-+		reset {
-+			label = "reset";
-+			linux,code = <KEY_RESTART>;
-+			gpios = <&pio 1 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		mesh {
-+			label = "mesh";
-+			linux,code = <KEY_RFKILL>;
-+			gpios = <&pio 0 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led_status: led_power {
-+			label = "blue:power";
-+			gpios = <&pio 13 GPIO_ACTIVE_LOW>;
-+		};
-+		
-+		led_warning: led_fault {
-+			label = "red:fault";
-+			gpios = <&pio 34 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		led_status_green: led-2 {
-+			label = "green:status";
-+			gpios = <&pio 35 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	mediatek,force-highspeed;
-+	status = "okay";
-+};
-+
-+&eth {
-+	status = "okay";
-+	mediatek,gmac-id = <1>;
-+	phy-mode = "gmii";
-+	phy-handle = <&phy0>;
-+
-+	mdio {
-+		phy0: ethernet-phy@0 {
-+			compatible = "ethernet-phy-id03a2.9461";
-+			reg = <0x0>;
-+			phy-mode = "gmii";
-+		};
-+	};
-+};
-+
-+&pio {
-+	spi_flash_pins: spi0-pins-func-1 {
-+		mux {
-+			function = "flash";
-+			groups = "spi0", "spi0_wp_hold";
-+		};
-+
-+		conf-pu {
-+			pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
-+			drive-strength = <MTK_DRIVE_4mA>;
-+			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+
-+		conf-pd {
-+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
-+			drive-strength = <MTK_DRIVE_4mA>;
-+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
-+		};
-+	};
-+};
-+
-+&spi0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi_flash_pins>;
-+	status = "okay";
-+	must_tx;
-+	enhance_timing;
-+	dma_ext;
-+	ipm_design;
-+	support_quad;
-+	tick_dly = <2>;
-+	sample_sel = <0>;
-+
-+	spi_nand@0 {
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <52000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			partition@0 {
-+				label = "BL2";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			partition@100000 {
-+				label = "u-boot-env";
-+				reg = <0x100000 0x80000>;
-+			};
-+
-+			partition@180000 {
-+				label = "Factory";
-+				reg = <0x180000 0x200000>;
-+			};
-+
-+			partition@380000 {
-+				label = "FIP";
-+				reg = <0x380000 0x200000>;
-+			};
-+
-+			partition@580000 {
-+				label = "ubi";
-+				reg = <0x580000 0x7a40000>;
-+			};
-+		};
-+	};
-+};
-+
-+&watchdog {
-+	status = "disabled";
-+};
---- /dev/null
-+++ b/defenvs/bazis_ax3000wm_env
-@@ -0,0 +1,54 @@
-+ipaddr=192.168.1.1
-+serverip=192.168.1.254
-+loadaddr=0x46000000
-+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
-+bootconf=config-1
-+bootdelay=0
-+bootfile=openwrt-mediatek-filogic-bazis_ax3000wm-initramfs-recovery.itb
-+bootfile_bl2=openwrt-mediatek-filogic-bazis_ax3000wm-preloader.bin
-+bootfile_fip=openwrt-mediatek-filogic-bazis_ax3000wm-bl31-uboot.fip
-+bootfile_upg=openwrt-mediatek-filogic-bazis_ax3000wm-squashfs-sysupgrade.itb
-+bootled_pwr=blue:power
-+bootled_rec=red:fault
-+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
-+bootmenu_default=0
-+bootmenu_delay=0
-+bootmenu_title=      ( ( ( OpenWrt ) ) )
-+bootmenu_0=Initialize environment.=run _firstboot
-+bootmenu_0d=Run default boot command.=run boot_default
-+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
-+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
-+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
-+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
-+bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
-+bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
-+bootmenu_8=Reboot.=reset
-+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
-+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
-+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
-+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
-+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
-+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
-+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
-+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
-+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
-+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
-+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
-+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
-+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
-+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
-+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic || run ubi_format
-+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
-+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
-+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
-+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
-+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
-+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic && ubi write $loadaddr fit $filesize
-+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic && ubi write $loadaddr recovery $filesize
-+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
-+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
-+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
-+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"

package/boot/uboot-microchipsw/Makefile

@@ -1,46 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/microchip-ung/u-boot.git
-PKG_SOURCE_DATE:=2025-09-22
-PKG_SOURCE_VERSION:=c1abab62a00a6b8f43f663a0a30dd0a7fd6a4e95
-PKG_MIRROR_HASH:=6405c426afd8bacbb4cc985da4ca1bd04b54a0d2aa3bb3ba8f7571dbe5913055
-
-PKG_MAINTAINER:=Robert Marko <robert.marko@sartura.hr>
-
-include $(INCLUDE_DIR)/u-boot.mk
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-define U-Boot/Default
-  BUILD_TARGET:=microchipsw
-  HIDDEN:=1
-  UBOOT_IMAGE:=u-boot.bin
-endef
-
-define U-Boot/ev23x71a
-  NAME:=Microchip EV23X71A
-  BUILD_DEVICES:=microchip_ev23x71a
-  BUILD_SUBTARGET:=lan969x
-  UBOOT_CONFIG:=mchp_lan969x
-endef
-
-define U-Boot/tactical-1000
-  NAME:=Novarq Tactical 1000
-  BUILD_DEVICES:=novarq_tactical-1000
-  BUILD_SUBTARGET:=lan969x
-  UBOOT_CONFIG:=mchp_lan969x
-endef
-
-UBOOT_TARGETS:= \
-	ev23x71a \
-	tactical-1000
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(CP) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE)
-endef
-
-$(eval $(call BuildPackage/U-Boot))

package/boot/uboot-microchipsw/patches/200-cmd-add-imsz-and-imszb.patch

@@ -1,139 +0,0 @@
---- a/cmd/bootm.c
-+++ b/cmd/bootm.c
-@@ -260,6 +260,76 @@ U_BOOT_CMD(
- /* iminfo - print header info for a requested image */
- /*******************************************************************/
- #if defined(CONFIG_CMD_IMI)
-+#define SECTOR_SHIFT 9
-+static int image_totalsize(struct cmd_tbl *cmdtp, int flag, int argc,
-+			   char *const argv[], short int in_blocks)
-+{
-+	ulong addr;
-+	void *hdr;
-+	uint32_t bsize, tsize = 0;
-+	char buf[16];
-+
-+	if (argc >= 2)
-+		addr = simple_strtoul(argv[1], NULL, 16);
-+	else
-+		addr = image_load_addr;
-+
-+	hdr = (void *)map_sysmem(addr, 0);
-+
-+	switch (genimg_get_format(hdr)) {
-+	case IMAGE_FORMAT_LEGACY:
-+		if(CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT))
-+			tsize = image_get_image_size(hdr);
-+		break;
-+	case IMAGE_FORMAT_FIT:
-+		if(CONFIG_IS_ENABLED(FIT))
-+			tsize = fit_get_totalsize(hdr);
-+		break;
-+	}
-+
-+	unmap_sysmem(hdr);
-+	if (tsize == 0)
-+		return 1;
-+
-+	bsize = (tsize >> SECTOR_SHIFT) + ((tsize & ((1 << SECTOR_SHIFT) - 1))?1:0);
-+
-+	if (!in_blocks)
-+		snprintf(buf, sizeof(buf), "%x", tsize);
-+	else
-+		snprintf(buf, sizeof(buf), "%x", bsize);
-+
-+	if (argc >= 3)
-+		return env_set(argv[2], buf);
-+	else
-+		printf("%s\n", buf);
-+
-+	return 0;
-+}
-+
-+static int do_imsz(struct cmd_tbl *cmdtp, int flag, int argc,
-+		     char *const argv[])
-+{
-+	return image_totalsize(cmdtp, flag, argc, argv, 0);
-+}
-+
-+static int do_imszb(struct cmd_tbl *cmdtp, int flag, int argc,
-+		     char *const argv[])
-+{
-+	return image_totalsize(cmdtp, flag, argc, argv, 1);
-+}
-+
-+U_BOOT_CMD(
-+	imsz,	CONFIG_SYS_MAXARGS,	1,	do_imsz,
-+	"get image total size (in bytes)",
-+	"addr [maxhdrlen] [varname]\n"
-+);
-+
-+U_BOOT_CMD(
-+	imszb,	CONFIG_SYS_MAXARGS,	1,	do_imszb,
-+	"get image total size (in blocks)",
-+	"addr [maxhdrlen] [varname]\n"
-+);
-+
- static int do_iminfo(struct cmd_tbl *cmdtp, int flag, int argc,
- 		     char *const argv[])
- {
---- a/boot/image-fit.c
-+++ b/boot/image-fit.c
-@@ -2054,6 +2054,47 @@ static const char *fit_get_image_type_pr
- 	return "unknown";
- }
- 
-+size_t fit_get_totalsize(const void *fit)
-+{
-+	int ret, ndepth, noffset, images_noffset;
-+	size_t data_size, hdrsize, img_total, max_size = 0;
-+	const void *data;
-+
-+	ret = fdt_check_header(fit);
-+	if (ret) {
-+		debug("Wrong FIT format: not a flattened device tree (err=%d)\n",
-+			  ret);
-+		return 0;
-+	}
-+
-+	hdrsize = fdt_totalsize(fit);
-+
-+	/* take care of simple FIT with internal images */
-+	max_size = hdrsize;
-+
-+	images_noffset = fdt_path_offset(fit, FIT_IMAGES_PATH);
-+	if (images_noffset < 0)
-+		goto out;
-+
-+	for (ndepth = 0,
-+	     noffset = fdt_next_node(fit, images_noffset, &ndepth);
-+	     (noffset >= 0) && (ndepth > 0);
-+	     noffset = fdt_next_node(fit, noffset, &ndepth)) {
-+		if (ndepth == 1) {
-+			ret = fit_image_get_data(fit, noffset, &data, &data_size);
-+			if (ret)
-+				goto out;
-+
-+			img_total = data_size + (data - fit);
-+
-+			max_size = (max_size > img_total) ? max_size : img_total;
-+		}
-+	}
-+
-+out:
-+	return max_size;
-+}
-+
- int fit_image_load(struct bootm_headers *images, ulong addr,
- 		   const char **fit_unamep, const char **fit_uname_configp,
- 		   int arch, int ph_type, int bootstage_id,
---- a/include/image.h
-+++ b/include/image.h
-@@ -1113,6 +1113,7 @@ int fit_parse_subimage(const char *spec,
- 		ulong *addr, const char **image_name);
- 
- int fit_get_subimage_count(const void *fit, int images_noffset);
-+size_t fit_get_totalsize(const void *fit);
- void fit_print_contents(const void *fit);
- void fit_image_print(const void *fit, int noffset, const char *p);
- 

package/boot/uboot-microchipsw/src/board/microchip/lan969x/lan969x.env

@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-fdt_high=0xffffffff
-baudrate=115200
-bootdelay=3
-loadaddr=0x64000000
-bootargs=console=ttyAT0,115200 root=PARTLABEL=rootfs rootwait
-mmc_read_kernel=mmc read $loadaddr $part_addr 0x100 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr $part_addr $image_size
-boot_system=part start mmc 0 kernel part_addr && part size mmc 0 kernel part_size && run mmc_read_kernel && bootm
-bootcmd=run boot_system
-filesize_to_blk=setexpr cnt $filesize + 0x1ff && setexpr cnt $cnt / 0x200
-mmc_write_fip=part start mmc 0 fip part_addr && part size mmc 0 fip part_size && run filesize_to_blk && test 0x$cnt -le 0x$part_size && mmc erase fip && mmc write $loadaddr $part_addr $cnt

package/boot/uboot-mvebu/Makefile

@@ -22,13 +22,6 @@ define U-Boot/Default
   HIDDEN:=1
 endef
 
-define U-Boot/mox
-  NAME:=CZ.NIC Turris Mox
-  BUILD_DEVICES:=cznic_turris-mox
-  BUILD_SUBTARGET:=cortexa53
-  UBOOT_CONFIG:=turris_mox
-endef
-
 define U-Boot/clearfog
   NAME:=SolidRun ClearFog A1
   BUILD_DEVICES:=solidrun_clearfog-base-a1 solidrun_clearfog-pro-a1
@@ -75,20 +68,11 @@ define U-Boot/rb5009
   UBOOT_IMAGE:=u-boot.elf
 endef
 
-define U-Boot/atlas
-  NAME:=RIPE Atlas Probe v5
-  BUILD_DEVICES:=ripe_atlas-v5
-  BUILD_SUBTARGET:=cortexa53
-  UBOOT_CONFIG:=turris_mox
-endef
-
 UBOOT_TARGETS:= \
-	mox \
 	clearfog \
 	helios4 \
 	omnia \
 	espressobin \
-	atlas \
 	uDPU \
 	eDPU \
 	rb5009

package/boot/uboot-qoriq/Makefile

@@ -1,80 +0,0 @@
-#
-# Copyright (C) 2016 Jiang Yutang <jiangyutang1978@gmail.com>
-# Copyright (C) 2025 Pawel Dembicki <paweldembicki@gmail.com>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_VERSION:=2025.01
-PKG_HASH:=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f
-PKG_RELEASE:=1
-
-include $(INCLUDE_DIR)/u-boot.mk
-include $(INCLUDE_DIR)/package.mk
-
-TOOLCHAIN_NAME:=openwrt-toolchain-24.10.4-mpc85xx-p2020_gcc-13.3.0_musl.Linux-x86_64
-TOOLCHAIN_FILE:=$(TOOLCHAIN_NAME).tar.zst
-TOOLCHAIN_PATH:=$(PKG_BUILD_DIR)/$(TOOLCHAIN_NAME)/toolchain-powerpc_8548_gcc-13.3.0_musl/bin
-TOOLCHAIN_CROSS_COMPILE:=powerpc-openwrt-linux-musl-
-
-define Download/uboot-qoriq-toolchain
-  FILE:=$(TOOLCHAIN_FILE)
-  URL:=https://downloads.openwrt.org/releases/24.10.4/targets/mpc85xx/p2020/
-  URL_FILE:=$(TOOLCHAIN_FILE)
-  HASH:=c16566bb3625b6c45e4184b9d37953d4c3c1dcdec1141a45df834da626d4c08d
-endef
-
-define U-Boot/Default
-  BUILD_TARGET:=qoriq
-  BUILD_SUBTARGET:=generic
-  BUILD_DEVICES:=$(1)
-  ENV_SIZE:=0x2000
-endef
-
-define U-Boot/fsl_T4240RDB-nor
-  NAME:=NXP T4240RDB NOR Boot
-  BUILD_DEVICES:=fsl_T4240RDB
-  UBOOT_CONFIG:=T4240RDB
-  UBOOT_IMAGE:=u-boot-dtb.bin
-endef
-
-define U-Boot/fsl_T4240RDB-sdboot
-  NAME:=NXP T4240RDB SD Card Boot
-  BUILD_DEVICES:=fsl_T4240RDB
-  UBOOT_CONFIG:=T4240RDB_SDCARD
-  UBOOT_IMAGE:=u-boot-with-spl-pbl.bin
-endef
-
-UBOOT_TARGETS := \
-  fsl_T4240RDB-nor \
-  fsl_T4240RDB-sdboot
-
-define Build/Prepare
-		$(Build/Prepare/Default)
-	$(TAR) -I $(STAGING_DIR_HOST)/bin/zstd -xf $(DL_DIR)/$(TOOLCHAIN_FILE) -C $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile/U-Boot
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		CROSS_COMPILE=$(TOOLCHAIN_PATH)/$(TOOLCHAIN_CROSS_COMPILE) \
-		$(if $(DTC),DTC="$(DTC)") \
-		$(UBOOT_MAKE_FLAGS)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) \
-		$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-uboot.bin
-	$(PKG_BUILD_DIR)/tools/mkenvimage -b -s $(ENV_SIZE) \
-		-o $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-uboot-env.bin \
-		files/$(BUILD_VARIANT)-uEnv.txt
-endef
-
-define Package/u-boot/install/default
-endef
-
-$(eval $(call Download,uboot-qoriq-toolchain))
-$(eval $(call BuildPackage/U-Boot))

package/boot/uboot-qoriq/files/fsl_T4240RDB-nor-uEnv.txt

@@ -1,8 +0,0 @@
-bootm_size=0x180000000
-loadaddr=0x2000000
-fwaddr=0xe8000000
-hwconfig=fsl_ddr:ctlr_intlv=3way_4KB,bank_intlv=auto;usb1:dr_mode=host,phy_type=utmi
-nor_boot=bootm $fwaddr
-bootargs=console=ttyS0,115200
-bootcmd=echo starting OpenWrt ...;run nor_boot
-bootdelay=3

package/boot/uboot-qoriq/files/fsl_T4240RDB-sdboot-uEnv.txt

@@ -1,7 +0,0 @@
-bootm_size=0x180000000
-loadaddr=0x2000000
-hwconfig=fsl_ddr:ctlr_intlv=3way_4KB,bank_intlv=auto;usb1:dr_mode=host,phy_type=utmi
-sd_boot=ext4load mmc 0:1 $loadaddr fitImage;bootm $loadaddr
-bootargs=root=/dev/mmcblk0p2 rw rootwait rootfstype=squashfs,f2fs noinitrd console=ttyS0,115200 mtdparts=fe8000000.nor:126m(firmware-nor),1m(cortina-ucode),128k(fman),128k(u-boot-env),768k(u-boot)
-bootcmd=echo starting OpeWwrt ...;run sd_boot
-bootdelay=3

package/boot/uboot-qoriq/patches/100-mpc85xx-adjust-T4240RDB-config-for-OpenWrt.patch

@@ -1,68 +0,0 @@
-From ec36a44809e22a60fc153a4078d35c83a2bf9676 Mon Sep 17 00:00:00 2001
-From: Pawel Dembicki <paweldembicki@gmail.com>
-Date: Thu, 6 Oct 2022 15:18:38 +0200
-Subject: [PATCH] mpc85xx: adjust T4240RDB config for OpenWrt
-
-Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
----
- configs/T4240RDB_SDCARD_defconfig | 6 ++++--
- include/configs/T4240RDB.h        | 6 +++++-
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
---- a/configs/T4240RDB_SDCARD_defconfig
-+++ b/configs/T4240RDB_SDCARD_defconfig
-@@ -4,7 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
- CONFIG_SPL_LIBGENERIC_SUPPORT=y
- CONFIG_SF_DEFAULT_SPEED=10000000
- CONFIG_ENV_SIZE=0x2000
--CONFIG_ENV_OFFSET=0x100000
-+CONFIG_ENV_OFFSET=0x101000
- CONFIG_DEFAULT_DEVICE_TREE="t4240rdb"
- CONFIG_SYS_MONITOR_LEN=786432
- CONFIG_SPL_MMC=y
-@@ -35,7 +35,7 @@ CONFIG_FIT_VERBOSE=y
- CONFIG_RAMBOOT_PBL=y
- CONFIG_SYS_FSL_PBL_PBI="$(SRCTREE)/board/freescale/t4rdb/t4_pbi.cfg"
- CONFIG_SYS_FSL_PBL_RCW="$(SRCTREE)/board/freescale/t4rdb/t4_sd_rcw.cfg"
--CONFIG_BOOTDELAY=10
-+CONFIG_BOOTDELAY=1
- CONFIG_OF_BOARD_SETUP=y
- CONFIG_OF_STDOUT_VIA_ALIAS=y
- CONFIG_USE_BOOTCOMMAND=y
-@@ -71,6 +71,7 @@ CONFIG_CMD_DHCP=y
- CONFIG_CMD_MII=y
- CONFIG_CMD_PING=y
- CONFIG_CMD_EXT2=y
-+CONFIG_CMD_EXT4=y
- CONFIG_CMD_FAT=y
- CONFIG_OF_CONTROL=y
- CONFIG_ENV_OVERWRITE=y
-@@ -108,7 +109,8 @@ CONFIG_SPI_FLASH_SST=y
- CONFIG_PHYLIB=y
- CONFIG_PHYLIB_10G=y
- CONFIG_PHY_CORTINA=y
--CONFIG_CORTINA_FW_ADDR=0x77f000
-+CONFIG_SYS_CORTINA_FW_IN_MMC=y
-+CONFIG_CORTINA_FW_ADDR=0x200000
- CONFIG_PHY_TERANETICS=y
- CONFIG_PHY_VITESSE=y
- CONFIG_DM_MDIO=y
---- a/configs/T4240RDB_defconfig
-+++ b/configs/T4240RDB_defconfig
-@@ -26,7 +26,7 @@ CONFIG_SYS_FSL_NUM_CC_PLLS=5
- CONFIG_MP=y
- CONFIG_FIT=y
- CONFIG_FIT_VERBOSE=y
--CONFIG_BOOTDELAY=10
-+CONFIG_BOOTDELAY=1
- CONFIG_OF_BOARD_SETUP=y
- CONFIG_OF_STDOUT_VIA_ALIAS=y
- CONFIG_USE_BOOTCOMMAND=y
-@@ -76,6 +76,7 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
- CONFIG_SYS_FLASH_EMPTY_INFO=y
- CONFIG_SYS_FLASH_CFI=y
- CONFIG_SYS_FLASH_QUIET_TEST=y
-+CONFIG_SYS_MALLOC_F_LEN=0x1000
- CONFIG_SYS_MAX_FLASH_SECT=1024
- CONFIG_SYS_MAX_FLASH_BANKS=2
- CONFIG_DM_SPI_FLASH=y

package/boot/uboot-qoriq/patches/900-Revert-fsl-mxc-Drop-legacy-I2c.patch

@@ -1,44 +0,0 @@
-From 7041fc96942acca920699b354e956bc4966c9b00 Mon Sep 17 00:00:00 2001
-From: Pawel Dembicki <paweldembicki@gmail.com>
-Date: Wed, 19 Nov 2025 11:58:10 +0100
-Subject: [PATCH] Revert "fsl: mxc: Drop legacy I2c"
-
-This reverts commit 98dfa70f84f036c7423f1eddf00af8ea555fed8f.
-
-It broke SDCARD boot in T4240RDB.
-
-Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
----
- drivers/ddr/fsl/main.c | 3 ++-
- drivers/i2c/mxc_i2c.c  | 1 -
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/ddr/fsl/main.c
-+++ b/drivers/ddr/fsl/main.c
-@@ -111,7 +111,7 @@ static int ddr_i2c_read(DEV_TYPE *dev, u
- #if CONFIG_IS_ENABLED(DM_I2C)
- 	ret = dm_i2c_read(dev, 0, buf, len);
- #else
--	ret = 0;
-+	ret = i2c_read(dev->chip, addr, alen, buf, len);
- #endif
- 
- 	return ret;
-@@ -162,6 +162,7 @@ static void __get_spd(generic_spd_eeprom
- 	};
- 	dev = &ldev;
- 
-+	i2c_set_bus_num(CONFIG_SYS_SPD_BUS_NUM);
- #endif
- 
- #ifdef CONFIG_SYS_FSL_DDR4
---- a/drivers/i2c/mxc_i2c.c
-+++ b/drivers/i2c/mxc_i2c.c
-@@ -619,7 +619,6 @@ int enable_i2c_clk(unsigned char enable,
- 	__attribute__((weak, alias("__enable_i2c_clk")));
- 
- #if !CONFIG_IS_ENABLED(DM_I2C)
--
- /*
-  * Read data from I2C device
-  *

package/boot/uboot-rockchip/Makefile

@@ -174,13 +174,6 @@ define U-Boot/rk3528/Default
   TPL:=rk3528_ddr_1056MHz_v1.11.bin
 endef
 
-define U-Boot/hinlink-h28k-rk3528
-  $(U-Boot/rk3528/Default)
-  NAME:=HINLINK H28K
-  BUILD_DEVICES:= \
-    hinlink_h28k
-endef
-
 define U-Boot/radxa-e20c-rk3528
   $(U-Boot/rk3528/Default)
   NAME:=E20C
@@ -251,13 +244,6 @@ define U-Boot/bpi-r2-pro-rk3568
     sinovoip_bpi-r2-pro
 endef
 
-define U-Boot/easepi-r1-rk3568
-  $(U-Boot/rk3568/Default)
-  NAME:=LinkEase EasePi R1
-  BUILD_DEVICES:= \
-    linkease_easepi-r1
-endef
-
 define U-Boot/fastrhino-r66s-rk3568
   $(U-Boot/rk3568/Default)
   NAME:=FastRhino R66S
@@ -265,6 +251,13 @@ define U-Boot/fastrhino-r66s-rk3568
     lunzn_fastrhino-r66s
 endef
 
+define U-Boot/generic-rk3568
+  $(U-Boot/rk3568/Default)
+  NAME:=Generic RK3566/RK3568 board
+  BUILD_DEVICES:= \
+    linkease_easepi-r1
+endef
+
 define U-Boot/nanopi-r5c-rk3568
   $(U-Boot/rk3568/Default)
   NAME:=NanoPi R5C
@@ -427,7 +420,6 @@ UBOOT_TARGETS := \
   rock64-rk3328 \
   rock-pi-e-rk3328 \
   rock-pi-e-v3-rk3328 \
-  hinlink-h28k-rk3528 \
   radxa-e20c-rk3528 \
   rock-2-rk3528 \
   nanopi-r3s-rk3566 \
@@ -435,8 +427,8 @@ UBOOT_TARGETS := \
   radxa-zero-3-rk3566 \
   rock-3c-rk3566 \
   bpi-r2-pro-rk3568 \
-  easepi-r1-rk3568 \
   fastrhino-r66s-rk3568 \
+  generic-rk3568 \
   nanopi-r5c-rk3568 \
   nanopi-r5s-rk3568 \
   radxa-e25-rk3568 \

package/boot/uboot-rockchip/patches/105-1-arm64-dts-rockchip-add-LinkEase-EasePi-R1.patch

@@ -1,662 +0,0 @@
-From 63d60b21fd4933080ff22bdc21652f7c2a14bc52 Mon Sep 17 00:00:00 2001
-From: Liangbin Lian <jjm2473@gmail.com>
-Date: Tue, 14 Oct 2025 13:12:26 +0800
-Subject: [PATCH 1/2] arm64: dts: rockchip: add LinkEase EasePi R1
-
-LinkEase EasePi R1 [1] is a high-performance mini router.
-
-Specification:
-- Rockchip RK3568
-- 2GB/4GB LPDDR4 RAM
-- 16GB on-board eMMC
-- 1x M.2 key for 2280 NVMe (PCIe 3.0)
-- 1x USB 3.0 Type-A
-- 1x USB 2.0 Type-C (for USB flashing)
-- 2x 1000 Base-T (native, RTL8211F)
-- 2x 2500 Base-T (PCIe, RTL8125B)
-- 1x HDMI 2.0 Output
-- 12v DC Jack
-- 1x Power key connected to PMIC
-- 2x LEDs (one static power supplied, one GPIO controlled)
-
-[1] https://doc.linkease.com/zh/guide/easepi-r1/hardware.html
-
-Reviewed-by: Andrew Lunn <andrew@lunn.ch>
-Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
-Link: https://patch.msgid.link/20251014051226.64255-4-jjm2473@gmail.com
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-
-[ upstream commit: deaefeaf3df433d50935b9a85076041040f06d74 ]
-
-Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
----
- .../src/arm64/rockchip/rk3568-easepi-r1.dts   | 623 ++++++++++++++++++
- 1 file changed, 623 insertions(+)
- create mode 100644 dts/upstream/src/arm64/rockchip/rk3568-easepi-r1.dts
-
---- /dev/null
-+++ b/dts/upstream/src/arm64/rockchip/rk3568-easepi-r1.dts
-@@ -0,0 +1,623 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+
-+/dts-v1/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+#include <dt-bindings/leds/common.h>
-+#include <dt-bindings/pinctrl/rockchip.h>
-+#include <dt-bindings/soc/rockchip,vop2.h>
-+#include "rk3568.dtsi"
-+
-+/ {
-+	model = "LinkEase EasePi R1";
-+	compatible = "linkease,easepi-r1", "rockchip,rk3568";
-+
-+	aliases {
-+		ethernet0 = &gmac0;
-+		ethernet1 = &gmac1;
-+		mmc0 = &sdhci;
-+	};
-+
-+	chosen: chosen {
-+		stdout-path = "serial2:1500000n8";
-+	};
-+
-+	adc-keys {
-+		compatible = "adc-keys";
-+		io-channels = <&saradc 0>;
-+		io-channel-names = "buttons";
-+		keyup-threshold-microvolt = <1800000>;
-+
-+		button-recovery {
-+			label = "Recovery";
-+			linux,code = <KEY_VENDOR>;
-+			press-threshold-microvolt = <1750>;
-+		};
-+	};
-+
-+	gpio-leds {
-+		compatible = "gpio-leds";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&status_led_pin>;
-+
-+		status_led: led-status {
-+			color = <LED_COLOR_ID_GREEN>;
-+			function = LED_FUNCTION_STATUS;
-+			gpios = <&gpio2 RK_PD7 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger = "heartbeat";
-+		};
-+	};
-+
-+	hdmi-con {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+
-+		port {
-+			hdmi_con_in: endpoint {
-+				remote-endpoint = <&hdmi_out_con>;
-+			};
-+		};
-+	};
-+
-+	dc_12v: regulator-dc-12v {
-+		compatible = "regulator-fixed";
-+		regulator-name = "dc_12v";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <12000000>;
-+		regulator-max-microvolt = <12000000>;
-+	};
-+
-+	vcc5v0_sys: regulator-vcc5v0-sys {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc5v0_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&dc_12v>;
-+	};
-+
-+	vcc3v3_sys: regulator-vcc3v3-sys {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc3v3_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&dc_12v>;
-+	};
-+
-+	pcie30_avdd0v9: regulator-pcie30-avdd0v9 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "pcie30_avdd0v9";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <900000>;
-+		regulator-max-microvolt = <900000>;
-+		vin-supply = <&vcc3v3_sys>;
-+	};
-+
-+	pcie30_avdd1v8: regulator-pcie30-avdd1v8 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "pcie30_avdd1v8";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		vin-supply = <&vcc3v3_sys>;
-+	};
-+
-+	regulator-vdd0v95-25glan {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio3 RK_PB1 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vdd0v95_25glan_en>;
-+		regulator-name = "vdd0v95_25glan";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <950000>;
-+		regulator-max-microvolt = <950000>;
-+		vin-supply = <&vcc3v3_sys>;
-+	};
-+
-+	vcc3v3_nvme: regulator-vcc3v3-nvme {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc3v3_nvme_en>;
-+		regulator-name = "vcc3v3_nvme";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&dc_12v>;
-+	};
-+
-+};
-+
-+&combphy1 {
-+	status = "okay";
-+};
-+
-+&combphy2 {
-+	status = "okay";
-+};
-+
-+&cpu0 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&cpu1 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&cpu2 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&cpu3 {
-+	cpu-supply = <&vdd_cpu>;
-+};
-+
-+&gmac0 {
-+	assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>;
-+	assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>;
-+	assigned-clock-rates = <0>, <125000000>;
-+	phy-handle = <&rgmii_phy0>;
-+	phy-mode = "rgmii-id";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&gmac0_miim
-+		     &gmac0_tx_bus2
-+		     &gmac0_rx_bus2
-+		     &gmac0_rgmii_clk
-+		     &gmac0_rgmii_bus>;
-+	status = "okay";
-+};
-+
-+&gmac1 {
-+	assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>;
-+	assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>;
-+	assigned-clock-rates = <0>, <125000000>;
-+	phy-handle = <&rgmii_phy1>;
-+	phy-mode = "rgmii-id";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&gmac1m1_miim
-+		     &gmac1m1_tx_bus2
-+		     &gmac1m1_rx_bus2
-+		     &gmac1m1_rgmii_clk
-+		     &gmac1m1_rgmii_bus>;
-+	status = "okay";
-+};
-+
-+&gpu {
-+	mali-supply = <&vdd_gpu>;
-+	status = "okay";
-+};
-+
-+&hdmi {
-+	avdd-0v9-supply = <&vdda0v9_image>;
-+	avdd-1v8-supply = <&vcca1v8_image>;
-+	status = "okay";
-+};
-+
-+&hdmi_in {
-+	hdmi_in_vp0: endpoint {
-+		remote-endpoint = <&vp0_out_hdmi>;
-+	};
-+};
-+
-+&hdmi_out {
-+	hdmi_out_con: endpoint {
-+		remote-endpoint = <&hdmi_con_in>;
-+	};
-+};
-+
-+&hdmi_sound {
-+	status = "okay";
-+};
-+
-+&i2c0 {
-+	status = "okay";
-+
-+	vdd_cpu: regulator@1c {
-+		compatible = "tcs,tcs4525";
-+		reg = <0x1c>;
-+		fcs,suspend-voltage-selector = <1>;
-+		regulator-name = "vdd_cpu";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <800000>;
-+		regulator-max-microvolt = <1150000>;
-+		regulator-ramp-delay = <2300>;
-+		vin-supply = <&vcc5v0_sys>;
-+
-+		regulator-state-mem {
-+			regulator-off-in-suspend;
-+		};
-+	};
-+
-+	rk809: pmic@20 {
-+		compatible = "rockchip,rk809";
-+		reg = <0x20>;
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
-+		#clock-cells = <1>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pmic_int>;
-+		system-power-controller;
-+		vcc1-supply = <&vcc3v3_sys>;
-+		vcc2-supply = <&vcc3v3_sys>;
-+		vcc3-supply = <&vcc3v3_sys>;
-+		vcc4-supply = <&vcc3v3_sys>;
-+		vcc5-supply = <&vcc3v3_sys>;
-+		vcc6-supply = <&vcc3v3_sys>;
-+		vcc7-supply = <&vcc3v3_sys>;
-+		vcc8-supply = <&vcc3v3_sys>;
-+		vcc9-supply = <&vcc3v3_sys>;
-+		wakeup-source;
-+
-+		regulators {
-+			vdd_logic: DCDC_REG1 {
-+				regulator-name = "vdd_logic";
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-initial-mode = <0x2>;
-+				regulator-min-microvolt = <500000>;
-+				regulator-max-microvolt = <1350000>;
-+				regulator-ramp-delay = <6001>;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdd_gpu: DCDC_REG2 {
-+				regulator-name = "vdd_gpu";
-+				regulator-always-on;
-+				regulator-initial-mode = <0x2>;
-+				regulator-min-microvolt = <500000>;
-+				regulator-max-microvolt = <1350000>;
-+				regulator-ramp-delay = <6001>;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_ddr: DCDC_REG3 {
-+				regulator-name = "vcc_ddr";
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-initial-mode = <0x2>;
-+
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+				};
-+			};
-+
-+			vdd_npu: DCDC_REG4 {
-+				regulator-name = "vdd_npu";
-+				regulator-initial-mode = <0x2>;
-+				regulator-min-microvolt = <500000>;
-+				regulator-max-microvolt = <1350000>;
-+				regulator-ramp-delay = <6001>;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_1v8: DCDC_REG5 {
-+				regulator-name = "vcc_1v8";
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdda0v9_image: LDO_REG1 {
-+				regulator-name = "vdda0v9_image";
-+				regulator-min-microvolt = <950000>;
-+				regulator-max-microvolt = <950000>;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdda_0v9: LDO_REG2 {
-+				regulator-name = "vdda_0v9";
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <900000>;
-+				regulator-max-microvolt = <900000>;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vdda0v9_pmu: LDO_REG3 {
-+				regulator-name = "vdda0v9_pmu";
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <900000>;
-+				regulator-max-microvolt = <900000>;
-+
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <900000>;
-+				};
-+			};
-+
-+			vccio_acodec: LDO_REG4 {
-+				regulator-name = "vccio_acodec";
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vccio_sd: LDO_REG5 {
-+				regulator-name = "vccio_sd";
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <3300000>;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc3v3_pmu: LDO_REG6 {
-+				regulator-name = "vcc3v3_pmu";
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <3300000>;
-+				};
-+			};
-+
-+			vcca_1v8: LDO_REG7 {
-+				regulator-name = "vcca_1v8";
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcca1v8_pmu: LDO_REG8 {
-+				regulator-name = "vcca1v8_pmu";
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+
-+				regulator-state-mem {
-+					regulator-on-in-suspend;
-+					regulator-suspend-microvolt = <1800000>;
-+				};
-+			};
-+
-+			vcca1v8_image: LDO_REG9 {
-+				regulator-name = "vcca1v8_image";
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc_3v3: SWITCH_REG1 {
-+				regulator-name = "vcc_3v3";
-+				regulator-always-on;
-+				regulator-boot-on;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+
-+			vcc3v3_sd: SWITCH_REG2 {
-+				regulator-name = "vcc3v3_sd";
-+				regulator-always-on;
-+				regulator-boot-on;
-+
-+				regulator-state-mem {
-+					regulator-off-in-suspend;
-+				};
-+			};
-+		};
-+	};
-+};
-+
-+&i2s0_8ch {
-+	status = "okay";
-+};
-+
-+&mdio0 {
-+	rgmii_phy0: ethernet-phy@1 {
-+		compatible = "ethernet-phy-ieee802.3-c22";
-+		reg = <0x1>;
-+		pinctrl-0 = <&eth_phy0_reset_pin>;
-+		pinctrl-names = "default";
-+		reset-assert-us = <20000>;
-+		reset-deassert-us = <100000>;
-+		reset-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&mdio1 {
-+	rgmii_phy1: ethernet-phy@1 {
-+		compatible = "ethernet-phy-ieee802.3-c22";
-+		reg = <0x1>;
-+		pinctrl-0 = <&eth_phy1_reset_pin>;
-+		pinctrl-names = "default";
-+		reset-assert-us = <20000>;
-+		reset-deassert-us = <100000>;
-+		reset-gpios = <&gpio2 RK_PD1 GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+/* ETH3 */
-+&pcie2x1 {
-+	reset-gpios = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>;
-+	vpcie3v3-supply = <&vcc3v3_sys>;
-+	status = "okay";
-+};
-+
-+&pcie30phy {
-+	data-lanes = <1 2>;
-+	status = "okay";
-+};
-+
-+/* ETH2 */
-+&pcie3x1 {
-+	num-lanes = <1>;
-+	reset-gpios = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>;
-+	vpcie3v3-supply = <&vcc3v3_sys>;
-+	status = "okay";
-+};
-+
-+/* M.2 Key for 2280 NVMe */
-+&pcie3x2 {
-+	num-lanes = <1>;
-+	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
-+	vpcie3v3-supply = <&vcc3v3_nvme>;
-+	status = "okay";
-+};
-+
-+&pinctrl {
-+	gmac0 {
-+		eth_phy0_reset_pin: eth-phy0-reset-pin {
-+			rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+
-+	gmac1 {
-+		eth_phy1_reset_pin: eth-phy1-reset-pin {
-+			rockchip,pins = <2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+
-+	gpio-leds {
-+		status_led_pin: status-led-pin {
-+			rockchip,pins = <2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	nvme {
-+		vcc3v3_nvme_en: vcc3v3-nvme-en {
-+			rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	pcie-nic {
-+		vdd0v95_25glan_en: vdd0v95-25glan-en {
-+			rockchip,pins = <3 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	pmic {
-+		pmic_int: pmic-int {
-+			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+
-+};
-+
-+&pmu_io_domains {
-+	pmuio1-supply = <&vcc3v3_pmu>;
-+	pmuio2-supply = <&vcc3v3_pmu>;
-+	vccio1-supply = <&vccio_acodec>;
-+	vccio3-supply = <&vccio_sd>;
-+	vccio4-supply = <&vcc_1v8>;
-+	vccio5-supply = <&vcc_3v3>;
-+	vccio6-supply = <&vcc_1v8>;
-+	vccio7-supply = <&vcc_3v3>;
-+	status = "okay";
-+};
-+
-+&saradc {
-+	vref-supply = <&vcca_1v8>;
-+	status = "okay";
-+};
-+
-+&sdhci {
-+	bus-width = <8>;
-+	max-frequency = <200000000>;
-+	non-removable;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>;
-+	status = "okay";
-+};
-+
-+&tsadc {
-+	rockchip,hw-tshut-mode = <1>;
-+	rockchip,hw-tshut-polarity = <0>;
-+	status = "okay";
-+};
-+
-+&uart2 {
-+	status = "okay";
-+};
-+
-+/* OTG Only USB2.0, Only device mode */
-+&usb_host0_xhci {
-+	dr_mode = "peripheral";
-+	extcon = <&usb2phy0>;
-+	maximum-speed = "high-speed";
-+	phys = <&usb2phy0_otg>;
-+	phy-names = "usb2-phy";
-+	status = "okay";
-+};
-+
-+&usb_host1_xhci {
-+	status = "okay";
-+};
-+
-+&usb2phy0 {
-+	status = "okay";
-+};
-+
-+&usb2phy0_host {
-+	phy-supply = <&vcc5v0_sys>;
-+	status = "okay";
-+};
-+
-+&usb2phy0_otg {
-+	status = "okay";
-+};
-+
-+&vop {
-+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
-+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
-+	status = "okay";
-+};
-+
-+&vop_mmu {
-+	status = "okay";
-+};
-+
-+&vp0 {
-+	vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
-+		reg = <ROCKCHIP_VOP2_EP_HDMI0>;
-+		remote-endpoint = <&hdmi_in_vp0>;
-+	};
-+};

package/boot/uboot-rockchip/patches/105-2-board-rockchip-add-LinkEase-EasePi-R1.patch

@@ -1,123 +0,0 @@
-From fc0c5ce5cb2fd9dca2cad38996e8535e0bd810ba Mon Sep 17 00:00:00 2001
-From: Liangbin Lian <jjm2473@gmail.com>
-Date: Thu, 13 Nov 2025 14:51:21 +0800
-Subject: [PATCH 2/2] board: rockchip: add LinkEase EasePi R1
-
-LinkEase EasePi R1 [1] is a high-performance mini router.
-
-Specification:
-- Rockchip RK3568
-- 2GB/4GB LPDDR4 RAM
-- 16GB on-board eMMC
-- 1x M.2 key for 2280 NVMe (PCIe 3.0)
-- 1x USB 3.0 Type-A
-- 1x USB 2.0 Type-C (for USB flashing)
-- 2x 1000 Base-T (native, RTL8211F)
-- 2x 2500 Base-T (PCIe, RTL8125B)
-- 1x HDMI 2.0 Output
-- 12v DC Jack
-- 1x Power key connected to PMIC
-- 2x LEDs (one static power supplied, one GPIO controlled)
-
-[1] https://doc.linkease.com/zh/guide/easepi-r1/hardware.html
-
-Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
----
- arch/arm/dts/rk3568-easepi-r1-u-boot.dtsi |  3 +
- configs/easepi-r1-rk3568_defconfig        | 83 +++++++++++++++++++++++
- 2 files changed, 86 insertions(+)
- create mode 100644 arch/arm/dts/rk3568-easepi-r1-u-boot.dtsi
- create mode 100644 configs/easepi-r1-rk3568_defconfig
-
---- /dev/null
-+++ b/arch/arm/dts/rk3568-easepi-r1-u-boot.dtsi
-@@ -0,0 +1,3 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-+
-+#include "rk356x-u-boot.dtsi"
---- /dev/null
-+++ b/configs/easepi-r1-rk3568_defconfig
-@@ -0,0 +1,83 @@
-+CONFIG_ARM=y
-+CONFIG_SKIP_LOWLEVEL_INIT=y
-+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
-+CONFIG_COUNTER_FREQUENCY=24000000
-+CONFIG_ARCH_ROCKCHIP=y
-+CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3568-easepi-r1"
-+CONFIG_ROCKCHIP_RK3568=y
-+CONFIG_SPL_SERIAL=y
-+CONFIG_SYS_LOAD_ADDR=0xc00800
-+CONFIG_DEBUG_UART_BASE=0xFE660000
-+CONFIG_DEBUG_UART_CLOCK=24000000
-+CONFIG_PCI=y
-+CONFIG_DEBUG_UART=y
-+CONFIG_FIT=y
-+CONFIG_FIT_VERBOSE=y
-+CONFIG_SPL_FIT_SIGNATURE=y
-+CONFIG_SPL_LOAD_FIT=y
-+CONFIG_LEGACY_IMAGE_FORMAT=y
-+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-easepi-r1.dtb"
-+# CONFIG_DISPLAY_CPUINFO is not set
-+CONFIG_DISPLAY_BOARDINFO_LATE=y
-+CONFIG_SPL_MAX_SIZE=0x40000
-+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-+CONFIG_SPL_ATF=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_I2C=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_PCI=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_ROCKUSB=y
-+CONFIG_CMD_USB_MASS_STORAGE=y
-+CONFIG_CMD_PMIC=y
-+CONFIG_CMD_REGULATOR=y
-+# CONFIG_SPL_DOS_PARTITION is not set
-+CONFIG_SPL_OF_CONTROL=y
-+CONFIG_OF_LIVE=y
-+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
-+CONFIG_SPL_DM_SEQ_ALIAS=y
-+CONFIG_SPL_REGMAP=y
-+CONFIG_SPL_SYSCON=y
-+CONFIG_SPL_CLK=y
-+# CONFIG_USB_FUNCTION_FASTBOOT is not set
-+CONFIG_ROCKCHIP_GPIO=y
-+CONFIG_SYS_I2C_ROCKCHIP=y
-+CONFIG_MISC=y
-+CONFIG_SUPPORT_EMMC_RPMB=y
-+CONFIG_MMC_DW=y
-+CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
-+CONFIG_MMC_SDHCI_ROCKCHIP=y
-+CONFIG_PHY_REALTEK=y
-+CONFIG_DWC_ETH_QOS=y
-+CONFIG_DWC_ETH_QOS_ROCKCHIP=y
-+CONFIG_RTL8169=y
-+CONFIG_NVME_PCI=y
-+CONFIG_PCIE_DW_ROCKCHIP=y
-+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
-+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
-+CONFIG_SPL_PINCTRL=y
-+CONFIG_DM_PMIC=y
-+CONFIG_PMIC_RK8XX=y
-+CONFIG_REGULATOR_RK8XX=y
-+CONFIG_PWM_ROCKCHIP=y
-+CONFIG_SPL_RAM=y
-+CONFIG_BAUDRATE=1500000
-+CONFIG_DEBUG_UART_SHIFT=2
-+CONFIG_SYS_NS16550_MEM32=y
-+CONFIG_SYSRESET=y
-+CONFIG_USB=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_GENERIC=y
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_GENERIC=y
-+CONFIG_USB_DWC3=y
-+CONFIG_USB_DWC3_GENERIC=y
-+CONFIG_SPL_USB_DWC3_GENERIC=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET_DOWNLOAD=y
-+CONFIG_USB_FUNCTION_ROCKUSB=y
-+CONFIG_ERRNO_STR=y

package/boot/uboot-rockchip/patches/107-board-rockchip-add-HINLINK-H28K.patch

@@ -1,378 +0,0 @@
-From df056584b1825957ad118b6c1084aae00b1fa0b7 Mon Sep 17 00:00:00 2001
-From: Chukun Pan <amadeus@jmu.edu.cn>
-Date: Wed, 3 Dec 2025 20:03:22 +0800
-Subject: [PATCH] board: rockchip: add HINLINK H28K
-
-The HINLINK H28K is a single board computer based on the
-RK3528 SoC. Add support for the HINLINK H28K board.
-
-Features tested on HINLINK H28K:
-- SD-card boot
-- eMMC boot
-- Ethernet
-
-Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
----
-
---- /dev/null
-+++ b/arch/arm/dts/rk3528-hinlink-h28k-u-boot.dtsi
-@@ -0,0 +1,11 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+
-+#include "rk3528-u-boot.dtsi"
-+
-+&vdd_arm {
-+	regulator-init-microvolt = <953000>;
-+};
-+
-+&vdd_logic {
-+	regulator-init-microvolt = <900000>;
-+};
---- /dev/null
-+++ b/configs/hinlink-h28k-rk3528_defconfig
-@@ -0,0 +1,64 @@
-+CONFIG_ARM=y
-+CONFIG_SKIP_LOWLEVEL_INIT=y
-+CONFIG_COUNTER_FREQUENCY=24000000
-+CONFIG_ARCH_ROCKCHIP=y
-+CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3528-hinlink-h28k"
-+CONFIG_ROCKCHIP_RK3528=y
-+CONFIG_SYS_LOAD_ADDR=0xc00800
-+CONFIG_DEBUG_UART_BASE=0xFF9F0000
-+CONFIG_DEBUG_UART_CLOCK=24000000
-+CONFIG_DEBUG_UART=y
-+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3528-hinlink-h28k.dtb"
-+# CONFIG_DISPLAY_CPUINFO is not set
-+CONFIG_BOARD_RNG_SEED=y
-+CONFIG_SPL_MAX_SIZE=0x40000
-+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-+CONFIG_CMD_MEMINFO=y
-+CONFIG_CMD_MEMINFO_MAP=y
-+CONFIG_CMD_ADC=y
-+CONFIG_CMD_GPIO=y
-+CONFIG_CMD_GPT=y
-+CONFIG_CMD_MISC=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_ROCKUSB=y
-+CONFIG_CMD_USB_MASS_STORAGE=y
-+# CONFIG_CMD_SETEXPR is not set
-+CONFIG_CMD_RNG=y
-+CONFIG_CMD_REGULATOR=y
-+# CONFIG_SPL_DOS_PARTITION is not set
-+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
-+CONFIG_BUTTON=y
-+CONFIG_BUTTON_ADC=y
-+# CONFIG_USB_FUNCTION_FASTBOOT is not set
-+CONFIG_ROCKCHIP_GPIO=y
-+CONFIG_LED=y
-+CONFIG_LED_GPIO=y
-+CONFIG_SUPPORT_EMMC_RPMB=y
-+CONFIG_MMC_DW=y
-+CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
-+CONFIG_MMC_SDHCI_ROCKCHIP=y
-+CONFIG_PHY_REALTEK=y
-+CONFIG_DM_MDIO=y
-+CONFIG_DWC_ETH_QOS=y
-+CONFIG_DWC_ETH_QOS_ROCKCHIP=y
-+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
-+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
-+CONFIG_REGULATOR_PWM=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_PWM_ROCKCHIP=y
-+CONFIG_BAUDRATE=1500000
-+CONFIG_DEBUG_UART_SHIFT=2
-+CONFIG_SYS_NS16550_MEM32=y
-+CONFIG_USB=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_GENERIC=y
-+CONFIG_USB_DWC3=y
-+CONFIG_USB_DWC3_GENERIC=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET_DOWNLOAD=y
-+CONFIG_USB_FUNCTION_ROCKUSB=y
-+CONFIG_ERRNO_STR=y
---- /dev/null
-+++ b/dts/upstream/src/arm64/rockchip/rk3528-hinlink-h28k.dts
-@@ -0,0 +1,278 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+
-+/dts-v1/;
-+
-+#include <dt-bindings/input/input.h>
-+#include <dt-bindings/leds/common.h>
-+#include <dt-bindings/pwm/pwm.h>
-+#include "rk3528.dtsi"
-+
-+/ {
-+	model = "HINLINK H28K";
-+	compatible = "hinlink,h28k", "rockchip,rk3528";
-+
-+	aliases {
-+		ethernet0 = &gmac1;
-+		mmc0 = &sdhci;
-+		mmc1 = &sdmmc;
-+		serial0 = &uart0;
-+	};
-+
-+	chosen {
-+		stdout-path = "serial0:1500000n8";
-+	};
-+
-+	keys {
-+		compatible = "adc-keys";
-+		io-channels = <&saradc 0>;
-+		io-channel-names = "buttons";
-+		keyup-threshold-microvolt = <1800000>;
-+		poll-interval = <100>;
-+
-+		button-boot {
-+			label = "BOOT";
-+			linux,code = <KEY_SETUP>;
-+			press-threshold-microvolt = <0>;
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&lan_led>, <&wan_led>, <&work_led>;
-+
-+		led-0 {
-+			color = <LED_COLOR_ID_AMBER>;
-+			function = LED_FUNCTION_LAN;
-+			gpios = <&gpio4 RK_PC1 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "netdev";
-+		};
-+
-+		led-1 {
-+			color = <LED_COLOR_ID_BLUE>;
-+			function = LED_FUNCTION_WAN;
-+			gpios = <&gpio4 RK_PC0 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "netdev";
-+		};
-+
-+		led-2 {
-+			color = <LED_COLOR_ID_GREEN>;
-+			function = LED_FUNCTION_STATUS;
-+			gpios = <&gpio4 RK_PB7 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "default-on";
-+		};
-+	};
-+
-+	vdd_0v9: regulator-0v9-vdd {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vdd_0v9";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <900000>;
-+		regulator-max-microvolt = <900000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc_ddr: regulator-1v1-vcc-ddr {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc_ddr";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <1100000>;
-+		regulator-max-microvolt = <1100000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc_1v8: regulator-1v8-vcc {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc_1v8";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		vin-supply = <&vcc_3v3>;
-+	};
-+
-+	vcc_3v3: regulator-3v3-vcc {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc_3v3";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vcc3v3_sd: regulator-3v3-vcc-sd {
-+		compatible = "regulator-fixed";
-+		gpios = <&gpio4 RK_PA1 GPIO_ACTIVE_LOW>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&sdmmc_pwren_l>;
-+		regulator-name = "vcc3v3_sd";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		vin-supply = <&vcc_3v3>;
-+	};
-+
-+	vcc5v0_sys: regulator-5v0-vcc-sys {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc5v0_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+	};
-+
-+	vccio_sd: regulator-vccio-sd {
-+		compatible = "regulator-gpio";
-+		gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&sdmmc_vol_ctrl_h>;
-+		regulator-name = "vccio_sd";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <3300000>;
-+		states = <1800000 0x0>, <3300000 0x1>;
-+		vin-supply = <&vcc5v0_sys>;
-+	};
-+
-+	vdd_arm: regulator-vdd-arm {
-+		compatible = "pwm-regulator";
-+		pwms = <&pwm1 0 5000 PWM_POLARITY_INVERTED>;
-+		pwm-supply = <&vcc5v0_sys>;
-+		regulator-name = "vdd_arm";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <746000>;
-+		regulator-max-microvolt = <1201000>;
-+		regulator-settling-time-up-us = <250>;
-+	};
-+
-+	vdd_logic: regulator-vdd-logic {
-+		compatible = "pwm-regulator";
-+		pwms = <&pwm2 0 5000 PWM_POLARITY_INVERTED>;
-+		pwm-supply = <&vcc5v0_sys>;
-+		regulator-name = "vdd_logic";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <705000>;
-+		regulator-max-microvolt = <1006000>;
-+		regulator-settling-time-up-us = <250>;
-+	};
-+};
-+
-+&cpu0 {
-+	cpu-supply = <&vdd_arm>;
-+};
-+
-+&cpu1 {
-+	cpu-supply = <&vdd_arm>;
-+};
-+
-+&cpu2 {
-+	cpu-supply = <&vdd_arm>;
-+};
-+
-+&cpu3 {
-+	cpu-supply = <&vdd_arm>;
-+};
-+
-+&gmac1 {
-+	clock_in_out = "output";
-+	phy-handle = <&rgmii_phy>;
-+	phy-mode = "rgmii-id";
-+	phy-supply = <&vcc_3v3>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&rgmii_miim>,
-+		    <&rgmii_tx_bus2>,
-+		    <&rgmii_rx_bus2>,
-+		    <&rgmii_rgmii_clk>,
-+		    <&rgmii_rgmii_bus>;
-+	status = "okay";
-+};
-+
-+&mdio1 {
-+	rgmii_phy: ethernet-phy@1 {
-+		compatible = "ethernet-phy-ieee802.3-c22";
-+		reg = <0x1>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&gmac1_rstn_l>;
-+		reset-assert-us = <20000>;
-+		reset-deassert-us = <100000>;
-+		reset-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&pinctrl {
-+	gmac {
-+		gmac1_rstn_l: gmac1-rstn-l {
-+			rockchip,pins = <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	leds {
-+		lan_led: lan-led {
-+			rockchip,pins = <4 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		wan_led: wan-led {
-+			rockchip,pins = <4 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		work_led: work-led {
-+			rockchip,pins = <4 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	sdmmc {
-+		sdmmc_pwren_l: sdmmc-pwren-l {
-+			rockchip,pins = <4 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+
-+		sdmmc_vol_ctrl_h: sdmmc-vol-ctrl-h {
-+			rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+};
-+
-+&pwm1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm1m0_pins>;
-+	status = "okay";
-+};
-+
-+&pwm2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm2m0_pins>;
-+	status = "okay";
-+};
-+
-+&saradc {
-+	vref-supply = <&vcc_1v8>;
-+	status = "okay";
-+};
-+
-+&sdhci {
-+	bus-width = <8>;
-+	cap-mmc-highspeed;
-+	mmc-hs200-1_8v;
-+	non-removable;
-+	vmmc-supply = <&vcc_3v3>;
-+	vqmmc-supply = <&vcc_1v8>;
-+	status = "okay";
-+};
-+
-+&sdmmc {
-+	bus-width = <4>;
-+	cap-sd-highspeed;
-+	disable-wp;
-+	sd-uhs-sdr104;
-+	vmmc-supply = <&vcc3v3_sd>;
-+	vqmmc-supply = <&vccio_sd>;
-+	status = "okay";
-+};
-+
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0m0_xfer>;
-+	status = "okay";
-+};

package/boot/uboot-stm32/Makefile

@@ -7,10 +7,10 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=2025.10
+PKG_VERSION:=2025.07
 PKG_RELEASE:=1
 
-PKG_HASH:=b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a
+PKG_HASH:=0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7
 PKG_MAINTAINER:=Thomas Richard <thomas.richard@bootlin.com>
 
 UBOOT_USE_INTREE_DTC:=1

package/boot/uboot-stm32/patches/001-configs-stm32mp13-increase-SYS_MALLOC_F_LEN-to-0x210.patch

@@ -0,0 +1,27 @@
+From 1cdb64ad3aa9d6cd4a02adc09fcc1015f90e2fb9 Mon Sep 17 00:00:00 2001
+From: Patrice Chotard <patrice.chotard@foss.st.com>
+Date: Mon, 9 Jun 2025 14:53:13 +0200
+Subject: [PATCH] configs: stm32mp13: increase SYS_MALLOC_F_LEN to 0x210000
+
+Due SCMI update to protocol v2.0, we need to increase
+SYS_MALLOC_F_LEN value to avoid following message:
+alloc space exhausted ptr 200040 limit 200000
+
+Set SYS_MALLOC_F_LEN to 0x210000 to fix this issue.
+
+Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
+---
+ configs/stm32mp13_defconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configs/stm32mp13_defconfig
++++ b/configs/stm32mp13_defconfig
+@@ -1,7 +1,7 @@
+ CONFIG_ARM=y
+ CONFIG_ARCH_STM32MP=y
+ CONFIG_TFABOOT=y
+-CONFIG_SYS_MALLOC_F_LEN=0x180000
++CONFIG_SYS_MALLOC_F_LEN=0x210000
+ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc0400000
+ CONFIG_ENV_OFFSET=0x900000
+ CONFIG_DEFAULT_DEVICE_TREE="st/stm32mp135f-dk"

package/boot/uboot-sunxi/Makefile

@@ -137,14 +137,14 @@ endef
 define U-Boot/OLIMEX_A13_SOM
   BUILD_SUBTARGET:=cortexa8
   NAME:=Olimex A13 SOM
-  BUILD_DEVICES:=olimex_a13-olinuxino
+  BUILD_DEVICES:=olimex_a13-olimex-som
 endef
 
 define U-Boot/licheepi_nano
   BUILD_SUBTARGET:=arm926ejs
   NAME:=LicheePi Nano
   UENV:=f1c
-  BUILD_DEVICES:=licheepi_licheepi-nano
+  BUILD_DEVICES:=licheepi-nano
 endef
 
 define U-Boot/Linksprite_pcDuino
@@ -268,7 +268,7 @@ define U-Boot/popstick
   BUILD_SUBTARGET:=arm926ejs
   NAME:=PopStick
   UENV:=f1c
-  BUILD_DEVICES:=sourceparts_popstick-v1.1
+  BUILD_DEVICES:=popstick-v1.1
 endef
 
 define U-Boot/libretech_all_h3_cc_h5
@@ -319,13 +319,13 @@ endef
 define U-Boot/bananapi_m2_plus_h3
   BUILD_SUBTARGET:=cortexa7
   NAME:=Bananapi M2 Plus H3
-  BUILD_DEVICES:=sinovoip_bpi-m2-plus
+  BUILD_DEVICES:=sinovoip_bananapi-m2-plus
 endef
 
 define U-Boot/Sinovoip_BPI_M3
   BUILD_SUBTARGET:=cortexa7
   NAME:=Bananapi M3
-  BUILD_DEVICES:=sinovoip_bpi-m3
+  BUILD_DEVICES:=sinovoip_bananapi-m3
 endef
 
 define U-Boot/sopine_baseboard
@@ -385,19 +385,19 @@ endef
 define U-Boot/Bananapi_M2_Ultra
   BUILD_SUBTARGET:=cortexa7
   NAME:=Bananapi M2 Ultra
-  BUILD_DEVICES:=sinovoip_bpi-m2-ultra
+  BUILD_DEVICES:=sinovoip_bananapi-m2-ultra
 endef
 
 define U-Boot/bananapi_m2_berry
   BUILD_SUBTARGET:=cortexa7
   NAME:=Bananapi M2 Berry
-  BUILD_DEVICES:=sinovoip_bpi-m2-berry
+  BUILD_DEVICES:=sinovoip_bananapi-m2-berry
 endef
 
 define U-Boot/bananapi_p2_zero
   BUILD_SUBTARGET:=cortexa7
   NAME:=Bananapi P2 Zero
-  BUILD_DEVICES:=sinovoip_bpi-p2-zero
+  BUILD_DEVICES:=sinovoip_bananapi-p2-zero
 endef
 
 

package/boot/uboot-tools/uboot-envtools/files/ipq40xx

@@ -11,6 +11,25 @@ touch /etc/config/ubootenv
 
 board=$(board_name)
 
+ubootenv_mtdinfo () {
+	UBOOTENV_PART=$(cat /proc/mtd | grep APPSBLENV)
+	mtd_dev=$(echo $UBOOTENV_PART | awk '{print $1}' | sed 's/:$//')
+	mtd_size=$(echo $UBOOTENV_PART | awk '{print "0x"$2}')
+	mtd_erase=$(echo $UBOOTENV_PART | awk '{print "0x"$3}')
+	nor_flash=$(find /sys/bus/spi/devices/*/mtd -name ${mtd_dev})
+
+	if [ -n "$nor_flash" ]; then
+		ubootenv_size=$mtd_size
+	else
+		# size is fixed to 0x40000 in u-boot
+		ubootenv_size=0x40000
+	fi
+
+	sectors=$(( $ubootenv_size / $mtd_erase ))
+	sectors=$(printf "0x%x" $sectors )
+	echo /dev/$mtd_dev 0x0 $ubootenv_size $mtd_erase $sectors
+}
+
 case "$board" in
 alfa-network,ap120c-ac|\
 devolo,magic-2-wifi-next|\

package/boot/uboot-tools/uboot-envtools/files/kirkwood

@@ -16,7 +16,6 @@ checkpoint,l-50|\
 cloudengines,pogoe02|\
 cloudengines,pogoplugv4|\
 dlink,dns320l|\
-dlink,dns-325-a1\
 globalscale,sheevaplug|\
 iom,ix2-200|\
 iom,ix4-200d|\

package/boot/uboot-tools/uboot-envtools/files/lantiq

@@ -12,13 +12,15 @@ touch /etc/config/ubootenv
 board=$(board_name)
 
 case "$board" in
-bt,homehub-v2b|\
-siemens,gigaset-sx76x)
+bt,homehub-v2b)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000" "1"
 	;;
 bt,homehub-v3a)
 	ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x4000" "0x4000" "1"
 	;;
+siemens,gigaset-sx76x)
+	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000" "1"
+	;;
 zyxel,p-2812hnu-f1)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x2000" "0x20000" "1"
 	;;

package/boot/uboot-tools/uboot-envtools/files/mediatek_filogic

@@ -28,22 +28,16 @@ asus,zenwifi-bt8-ubootmod|\
 cmcc,a10-ubootmod|\
 comfast,cf-wr632ax-ubootmod|\
 cudy,tr3000-v1-ubootmod|\
-cudy,wbr3000uax-v1-ubootmod|\
 h3c,magic-nx30-pro|\
-imou,hx21|\
 jcg,q30-pro|\
 konka,komi-a31|\
 mercusys,mr90x-v1-ubi|\
 netcore,n60|\
 netcore,n60-pro|\
-netis,nx30v2|\
 netis,nx31|\
-netis,nx32u|\
 nokia,ea0326gmp|\
-openwrt,one|\
 qihoo,360t7|\
 routerich,ax3000-ubootmod|\
-routerich,be7200|\
 snr,snr-cpe-ax2|\
 tplink,tl-xdr4288|\
 tplink,tl-xdr6086|\
@@ -59,7 +53,6 @@ acer,predator-w6|\
 acer,predator-w6d|\
 acer,vero-w6m|\
 glinet,gl-mt2500|\
-glinet,gl-mt2500-airoha|\
 glinet,gl-mt6000|\
 glinet,gl-x3000|\
 glinet,gl-xe3000|\
@@ -67,15 +60,6 @@ huasifei,wh3000|\
 nradio,c8-668gl)
 	ubootenv_add_mmc "u-boot-env" "" "0x0" "0x80000"
 	;;
-asiarf,ap7986-003|\
-cetron,ct3003|\
-comfast,cf-wr632ax|\
-edgecore,eap111|\
-netgear,wax220|\
-zbtlink,zbt-z8102ax|\
-zbtlink,zbt-z8103ax)
-	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
-	;;
 asus,rt-ax59u)
 	ubootenv_add_uci_config "/dev/mtd0" "0x100000" "0x20000" "0x20000"
 	;;
@@ -103,7 +87,6 @@ jdcloud,re-cp-03)
 	;;
 buffalo,wsr-6000ax8|\
 mercusys,mr80x-v3|\
-mercusys,mr85x|\
 mercusys,mr90x-v1|\
 routerich,ax3000|\
 routerich,ax3000-v1|\
@@ -115,6 +98,15 @@ comfast,cf-e393ax|\
 iptime,ax3000m)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x80000"
 	;;
+asiarf,ap7986-003|\
+cetron,ct3003|\
+comfast,cf-wr632ax|\
+edgecore,eap111|\
+netgear,wax220|\
+zbtlink,zbt-z8102ax|\
+zbtlink,zbt-z8103ax)
+	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
+	;;
 dlink,aquila-pro-ai-m30-a1|\
 dlink,aquila-pro-ai-m60-a1)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x40000"
@@ -129,22 +121,24 @@ openembed,som7981)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x80000"
 	ubootenv_add_uci_sys_config "/dev/mtd3" "0x0" "0x100000" "0x100000"
 	;;
+openwrt,one)
+	ubootenv_add_ubi_default
+	;;
 smartrg,sdg-8733|\
 smartrg,sdg-8733a|\
 smartrg,sdg-8734)
 	ubootenv_add_mmc "u-boot-env" "mmcblk0" "0x0" "0x8000" "0x8000"
 	;;
-teltonika,rutc50)
-	ubootenv_add_mtd "u-boot-env" "0x0" "0x10000" "0x10000"
-	;;
 tplink,archer-ax80-v1|\
-tplink,archer-ax80-v1-eu|\
 tplink,be450)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000" "8"
 	;;
 ubnt,unifi-6-plus)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x10000"
 	;;
+teltonika,rutc50)
+	ubootenv_add_mtd "u-boot-env" "0x0" "0x10000" "0x10000"
+	;;
 xiaomi,mi-router-ax3000t|\
 xiaomi,mi-router-wr30u-stock|\
 xiaomi,redmi-router-ax6000-stock)