mediatek: filogic: openwrt-one: drop kmod-nvme

The OpenWrt One is the only board listing kmod-nvme as part of it's
default package set.

Remove kmod-nvme from the default package set as the board is sold
without an NVMe SSD and the M.2 slot can also be used for other
purposes.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

.gitattributes

@@ -1 +1,2 @@
 * -text
+*.patch whitespace=-indent-with-non-tab,-space-before-tab,-tab-in-indent,-trailing-space

.github/labeler.yml

@@ -80,6 +80,12 @@
 - changed-files:
   - any-glob-to-any-file:
     - "target/linux/qualcommax/**"
+    - "package/kernel/qca-ssdk/**"
+    - "package/kernel/qca-nss-dp/**"
+"target/qualcommbe":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/qualcommbe/**"
 "target/ixp4xx":
 - changed-files:
   - any-glob-to-any-file:

config/Config-build.in

@@ -70,8 +70,8 @@ menu "Global build settings"
 
 	config USE_APK
 		imply PACKAGE_apk-mbedtls
-		bool "Use APK instead of OPKG to build distribution (BROKEN)"
-		depends on BROKEN
+		bool "Use APK instead of OPKG to build distribution"
+		default y
 
 	comment "General build options"
 
@@ -423,11 +423,10 @@ menu "Global build settings"
 
 	endchoice
 
-	config SECCOMP
+	config USE_SECCOMP
 		bool "Enable SECCOMP"
 		select KERNEL_SECCOMP
-		select PACKAGE_procd-seccomp
-		depends on (aarch64 || arm || armeb || mips || mipsel || mips64 || mips64el || i386 || powerpc || x86_64)
+		depends on (aarch64 || arm || armeb || mips || mipsel || mips64 || mips64el || i386 || loongarch64 || powerpc || x86_64)
 		depends on !TARGET_uml
 		default y
 		help

config/Config-kernel.in

@@ -1212,6 +1212,28 @@ config KERNEL_NET_L3_MASTER_DEV
 	  drivers to support L3 master devices like VRF.
   	  Increases the compressed kernel size by ~4kB (as of Linux 6.6).
 
+config KERNEL_DCB
+	bool "Data Center Bridging support"
+	default y if TARGET_armsr_armv8
+	default y if TARGET_x86_64
+	help
+	  This enables support for configuring Data Center Bridging (DCB)
+	  features on DCB capable Ethernet adapters via rtnetlink.  Say 'Y'
+	  if you have a DCB capable Ethernet adapter which supports this
+	  interface and you are connected to a DCB capable switch.
+
+	  DCB is a collection of Ethernet enhancements which allow DCB capable
+	  NICs and switches to support network traffic with differing
+	  requirements (highly reliable, no drops vs. best effort vs. low
+	  latency) to co-exist on Ethernet.
+
+	  DCB features include:
+	    Enhanced Transmission Selection (aka Priority Grouping) - provides a
+	      framework for assigning bandwidth guarantees to traffic classes.
+	    Priority-based Flow Control (PFC) - a MAC control pause frame which
+	      works at the granularity of the 802.1p priority instead of the
+	      link (802.3x).
+
 config KERNEL_XDP_SOCKETS
 	bool "XDP sockets support"
 	help
@@ -1239,6 +1261,13 @@ config KERNEL_MPTCP_IPV6
 	default KERNEL_MPTCP
 endif
 
+config KERNEL_NF_CONNTRACK_TIMEOUT
+	bool "Per-connection connection tracking timeout"
+	default y if !SMALL_FLASH
+	help
+	   Select this option to enable support for per-connection conntrack timeouts.
+	   Increases the (uncompressed) size of nf_conntrack.ko by ~8kB.
+
 #
 # NFS related symbols
 #

feeds.conf.default

@@ -1,4 +1,8 @@
-src-git packages https://git.openwrt.org/feed/packages.git^b5f11b79d2b0538d57103a8da05e7a7a87981ff3
-src-git luci https://git.openwrt.org/project/luci.git^e76155d09484602e2b02e84bb8ffafa4848798f0
-src-git routing https://git.openwrt.org/feed/routing.git^3f15699240c076d5ee9ed697fa5ef45355423f6f
-src-git telephony https://git.openwrt.org/feed/telephony.git^fd605af7143165a2490681ec1752f259873b9147
+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/bpf.mk

@@ -1,4 +1,4 @@
-BPF_DEPENDS := @HAS_BPF_TOOLCHAIN
+BPF_DEPENDS := @HAS_BPF_TOOLCHAIN +@NEED_BPF_TOOLCHAIN
 LLVM_VER:=
 
 CLANG_MIN_VER:=12

include/default-packages.mk

@@ -0,0 +1,5 @@
+ifneq ($(CONFIG_USE_APK),)
+  DEFAULT_PACKAGES += apk-mbedtls
+else
+  DEFAULT_PACKAGES += opkg
+endif

include/image-commands.mk

@@ -391,8 +391,8 @@ define Build/fit
 		$(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), gen-cpio$(if $(TARGET_PER_DEVICE_ROOTFS),.$(ROOTFS_ID/$(DEVICE_NAME))))
-	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
+	$(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)
 	@mv $@.new $@
 endef
 
@@ -438,13 +438,14 @@ endef
 
 define Build/jffs2
 	rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 && \
-		mkdir -p $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$$(dirname $(1)) && \
-		cp $@ $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$(1) && \
+		mkdir -p $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$$(dirname $(word 1,$(1))) && \
+		cp $@ $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$(word 1,$(1)) && \
 		$(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad \
 			$(if $(CONFIG_BIG_ENDIAN),--big-endian,--little-endian) \
 			--squash-uids -v -e $(patsubst %k,%KiB,$(BLOCKSIZE)) \
 			-o $@.new \
 			-d $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 \
+			$(wordlist 2,$(words $(1)),$(1)) \
 			2>&1 1>/dev/null | awk '/^.+$$$$/' && \
 		$(STAGING_DIR_HOST)/bin/padjffs2 $@.new -J $(patsubst %k,,$(BLOCKSIZE))
 	-rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/
@@ -626,6 +627,14 @@ define Build/sysupgrade-tar
 		$@
 endef
 
+define Build/tplink-image-2022
+	$(TOPDIR)/scripts/tplink-mkimage-2022.py  \
+		--create $@.new \
+		--rootfs $@ \
+		--support "$(TPLINK_SUPPORT_STRING)"
+	@mv $@.new $@
+endef
+
 define Build/tplink-safeloader
 	-$(STAGING_DIR_HOST)/bin/tplink-safeloader \
 		-B $(TPLINK_BOARD_ID) \
@@ -732,6 +741,10 @@ define Build/zip
 	rm -rf $@.tmp
 endef
 
+define Build/zyimage
+	$(STAGING_DIR_HOST)/bin/zyimage $(1) $@
+endef
+
 define Build/zyxel-ras-image
 	let \
 		newsize="$(call exp_units,$(RAS_ROOTFS_SIZE))"; \

include/image.mk

@@ -310,7 +310,7 @@ endef
 define Image/Manifest
 	$(if $(CONFIG_USE_APK), \
 		$(call apk,$(TARGET_DIR_ORIG)) list --quiet --manifest --no-network \
-			--repositories-file /dev/zero | sort | sed 's/ / - /'  > \
+			--repositories-file /dev/null | sort | sed 's/ / - /'  > \
 			$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest, \
 		$(call opkg,$(TARGET_DIR_ORIG)) list-installed > \
 			$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest \
@@ -365,19 +365,17 @@ opkg_target = \
 
 apk_target = \
 	$(call apk,$(mkfs_cur_target_dir)) --no-scripts \
-		--repositories-file /dev/zero --repository file://$(PACKAGE_DIR_ALL)/packages.adb
+		--repositories-file /dev/null --repository file://$(PACKAGE_DIR_ALL)/packages.adb
 
 
 target-dir-%: FORCE
 ifneq ($(CONFIG_USE_APK),)
 	rm -rf $(mkfs_cur_target_dir)
 	$(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir)
-	mv $(mkfs_cur_target_dir)/etc/apk/repositories $(mkfs_cur_target_dir).repositories
 	$(if $(mkfs_packages_remove), \
-		$(apk_target) del $(mkfs_packages_remove))
+		-$(apk_target) del $(mkfs_packages_remove))
 	$(if $(mkfs_packages_add), \
 		$(apk_target) add $(mkfs_packages_add))
-	mv $(mkfs_cur_target_dir).repositories $(mkfs_cur_target_dir)/etc/apk/repositories
 else
 	rm -rf $(mkfs_cur_target_dir) $(mkfs_cur_target_dir).opkg
 	$(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir)

include/kernel-6.6

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .63
-LINUX_KERNEL_HASH-6.6.63 = d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835
+LINUX_VERSION-6.6 = .82
+LINUX_KERNEL_HASH-6.6.82 = f3c2389b8c23cabe747f104a3e434201ca6e7725bbbfb3a8c59a063ac4820e41

include/kernel-defaults.mk

@@ -175,7 +175,6 @@ define Kernel/PrepareConfigPerRootfs
 		[ ! -d "$(1)" ] || rm -rf $(1); \
 		mkdir $(1) && $(CP) -T $(LINUX_DIR) $(1); \
 		touch $(1)/.config; \
-		rm -rf $(1)/usr/initramfs_data.cpio*; \
 	}
 endef
 
@@ -190,6 +189,7 @@ define Kernel/CompileImage/Initramfs
 		$(call Kernel/Configure/Initramfs,$(if $(1),$(1),$(TARGET_DIR)),$(LINUX_DIR)$(2)); \
 		$(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(if $(1),$(1),$(TARGET_DIR))/init; \
 		$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(if $(1),$(1),$(TARGET_DIR)) $(if $(1),$(1),$(TARGET_DIR))/init;) \
+		rm -rf $(LINUX_DIR)$(2)/usr/initramfs_data.cpio*; \
 		$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE), \
 			$(call locked,{ \
 				$(if $(call qstrip,$(CONFIG_EXTERNAL_CPIO)), \

include/meson.mk

@@ -55,8 +55,14 @@ else
 MESON_CPU:="$(CPU_TYPE)$(if $(CPU_SUBTYPE),+$(CPU_SUBTYPE))"
 endif
 
+ifeq ($(MESON_USE_STAGING_PYTHON),)
+PYTHON_BIN:=$(STAGING_DIR_HOST)/bin/$(PYTHON)
+else
+PYTHON_BIN:=$(STAGING_DIR_HOSTPKG)/bin/$(PYTHON)
+endif
+
 define Meson
-	$(2) $(STAGING_DIR_HOST)/bin/$(PYTHON) $(STAGING_DIR_HOST)/bin/meson.py $(1)
+	$(2) $(PYTHON_BIN) $(STAGING_DIR_HOST)/bin/meson.py $(1)
 endef
 
 define Meson/CreateNativeFile
@@ -65,7 +71,7 @@ define Meson/CreateNativeFile
 		-e "s|@CXX@|$(foreach BIN,$(HOSTCXX),'$(BIN)',)|" \
 		-e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
 		-e "s|@CMAKE@|$(STAGING_DIR_HOST)/bin/cmake|" \
-		-e "s|@PYTHON@|$(STAGING_DIR_HOST)/bin/python3|" \
+		-e "s|@PYTHON@|$(PYTHON_BIN)|" \
 		-e "s|@CFLAGS@|$(foreach FLAG,$(HOST_CFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \
 		-e "s|@CXXFLAGS@|$(foreach FLAG,$(HOST_CXXFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \
 		-e "s|@LDFLAGS@|$(foreach FLAG,$(HOST_LDFLAGS),'$(FLAG)',)|" \
@@ -84,7 +90,7 @@ define Meson/CreateCrossFile
 		-e "s|@NM@|$(TARGET_NM)|" \
 		-e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
 		-e "s|@CMAKE@|$(STAGING_DIR_HOST)/bin/cmake|" \
-		-e "s|@PYTHON@|$(STAGING_DIR_HOST)/bin/python3|" \
+		-e "s|@PYTHON@|$(PYTHON_BIN)|" \
 		-e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
 		-e "s|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
 		-e "s|@LDFLAGS@|$(foreach FLAG,$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS),'$(FLAG)',)|" \
@@ -108,7 +114,7 @@ define Host/Configure/Meson
 endef
 
 define Host/Compile/Meson
-	+$(NINJA) -C $(MESON_HOST_BUILD_DIR) $(1)
+	+$(MESON_HOST_VARS) $(NINJA) -C $(MESON_HOST_BUILD_DIR) $(1)
 endef
 
 define Host/Install/Meson
@@ -135,7 +141,7 @@ define Build/Configure/Meson
 endef
 
 define Build/Compile/Meson
-	+$(NINJA) -C $(MESON_BUILD_DIR) $(1)
+	+$(MESON_VARS) $(NINJA) -C $(MESON_BUILD_DIR) $(1)
 endef
 
 define Build/Install/Meson

include/package-pack.mk

@@ -8,6 +8,10 @@ endif
 
 IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
 
+define description_escape
+$(subst `,\`,$(subst $$,\$$,$(subst ",\",$(subst \,\\,$(1)))))
+endef
+
 # Generates a make statement to return a wildcard for candidate ipkg files
 # 1: package name
 define gen_package_wildcard
@@ -106,6 +110,13 @@ endif
     IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
     ADIR_$(1):=$(PKG_BUILD_DIR)/apk-$(PKGARCH)/$(1)
     KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))
+    APK_SCRIPTS_$(1):=\
+    --script "post-install:$$(ADIR_$(1))/post-install" \
+    --script "pre-deinstall:$$(ADIR_$(1))/pre-deinstall"
+
+    ifdef Package/$(1)/postrm
+        APK_SCRIPTS_$(1)+=--script "post-deinstall:$$(ADIR_$(1))/postrm"
+    endif
 
     TARGET_VARIANT:=$$(if $(ALL_VARIANTS),$$(if $$(VARIANT),$$(filter-out *,$$(VARIANT)),$(firstword $(ALL_VARIANTS))))
     ifeq ($(BUILD_VARIANT),$$(if $$(TARGET_VARIANT),$$(TARGET_VARIANT),$(BUILD_VARIANT)))
@@ -290,8 +301,8 @@ else
 		echo 'export root="$$$${IPKG_INSTROOT}"'; \
 		echo 'export pkgname="$(1)"'; \
 		echo "add_group_and_user"; \
-		[ ! -f $$(ADIR_$(1))/postinst-pkg ] || cat "$$(ADIR_$(1))/postinst-pkg"; \
 		echo "default_postinst"; \
+		[ ! -f $$(ADIR_$(1))/postinst-pkg ] || sed -z 's/^\s*#!/#!/' "$$(ADIR_$(1))/postinst-pkg"; \
 	) > $$(ADIR_$(1))/post-install;
 
 	( \
@@ -300,10 +311,12 @@ else
 		echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
 		echo 'export root="$$$${IPKG_INSTROOT}"'; \
 		echo 'export pkgname="$(1)"'; \
-		[ ! -f $$(ADIR_$(1))/prerm-pkg ] || cat "$$(ADIR_$(1))/prerm-pkg"; \
 		echo "default_prerm"; \
+		[ ! -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).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" > $$(IDIR_$(1))/lib/apk/packages/$(1).list)
@@ -339,8 +352,8 @@ else
 	$(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \
 	  --info "name:$(1)$$(ABIV_$(1))" \
 	  --info "version:$(VERSION)" \
-	  --info "description:$$(strip $$(Package/$(1)/description))" \
-	  --info "arch:$(PKGARCH)" \
+	  --info "description:$$(call description_escape,$$(strip $$(Package/$(1)/description)))" \
+	  $(if $(findstring all,$(PKGARCH)),--info "arch:noarch",--info "arch:$(PKGARCH)") \
 	  --info "license:$(LICENSE)" \
 	  --info "origin:$(SOURCE)" \
 	  --info "url:$(URL)" \
@@ -355,9 +368,8 @@ else
 			) \
 		), \
 		$$(prov) )" \
-	  $(if $(DEFAULT_VARIANT),--info "provider-priority:100") \
-	  --script "post-install:$$(ADIR_$(1))/post-install" \
-	  --script "pre-deinstall:$$(ADIR_$(1))/pre-deinstall" \
+	  $(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))" \
 	  --output "$$(PACK_$(1))" \

include/rootfs.mk

@@ -48,7 +48,6 @@ apk = \
   $(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk \
 	--root $(1) \
 	--keys-dir $(if $(APK_KEYS),$(APK_KEYS),$(TOPDIR)) \
-	--no-cache \
 	--no-logfile \
 	--preserve-env
 

include/target.mk

@@ -90,45 +90,9 @@ else
   endif
 endif
 
-ifneq ($(DUMP),)
-  # Parse generic config that might be set before a .config is generated to modify the
-  # default package configuration
-  # Keep DYNAMIC_DEF_PKG_CONF in sync with toplevel.mk to reflect the same configs
-  DYNAMIC_DEF_PKG_CONF := CONFIG_USE_APK CONFIG_SELINUX CONFIG_SMALL_FLASH CONFIG_SECCOMP
-  $(foreach config, $(DYNAMIC_DEF_PKG_CONF), \
-    $(eval $(config) := $(shell grep "$(config)=y" $(TOPDIR)/.config 2>/dev/null)) \
-  )
-  # The config options that are enabled by default and where other default
-  # packages depends on needs to be set if they are missing in the .config.
-  ifeq ($(shell grep "CONFIG_SECCOMP" $(TOPDIR)/.config 2>/dev/null),)
-    ifeq ($(filter $(BOARD), uml),)
-    ifneq ($(filter $(ARCH), aarch64 arm armeb mips mipsel mips64 mips64el i386 powerpc x86_64),)
-      CONFIG_SECCOMP := y
-    endif
-    endif
-  endif
-endif
-
-ifneq ($(CONFIG_USE_APK),)
-DEFAULT_PACKAGES+=apk-mbedtls
-else
-DEFAULT_PACKAGES+=opkg
-endif
-
-ifneq ($(CONFIG_SELINUX),)
-DEFAULT_PACKAGES+=busybox-selinux procd-selinux
-else
-DEFAULT_PACKAGES+=busybox procd
-endif
-
 # include ujail on systems with enough storage
-ifeq ($(CONFIG_SMALL_FLASH),)
-DEFAULT_PACKAGES+=procd-ujail
-endif
-
-# include seccomp ld-preload hooks if kernel supports it
-ifneq ($(CONFIG_SECCOMP),)
-DEFAULT_PACKAGES+=procd-seccomp
+ifeq ($(filter small_flash,$(FEATURES)),)
+  DEFAULT_PACKAGES+=procd-ujail
 endif
 
 # Add device specific packages (here below to allow device type set from subtarget)
@@ -411,6 +375,7 @@ define BuildTargets/DumpCurrent
 	 echo 'Target-Description:'; \
 	 echo "$$$$DESCRIPTION"; \
 	 echo '@@'; \
+	 $(if $(DEFAULT_PROFILE),echo 'Target-Default-Profile: $(DEFAULT_PROFILE)';) \
 	 echo 'Default-Packages: $(DEFAULT_PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES))'; \
 	 $(DUMPINFO)
 	$(if $(CUR_SUBTARGET),$(SUBMAKE) -r --no-print-directory -C image -s DUMP=1 SUBTARGET=$(CUR_SUBTARGET))

include/toplevel.mk

@@ -75,22 +75,7 @@ endif
 
 _ignore = $(foreach p,$(IGNORE_PACKAGES),--ignore $(p))
 
-# Config that will invalidate the .targetinfo as they will affect
-# DEFAULT_PACKAGES.
-# Keep DYNAMIC_DEF_PKG_CONF in sync with target.mk to reflect the same configs
-DYNAMIC_DEF_PKG_CONF := CONFIG_USE_APK CONFIG_SELINUX CONFIG_SMALL_FLASH CONFIG_SECCOMP
-check-dynamic-def-pkg: FORCE
-	@+DEF_PKG_CONFS=""; \
-	if [ -f $(TOPDIR)/.config ]; then \
-		for config in $(DYNAMIC_DEF_PKG_CONF); do \
-			DEF_PKG_CONFS="$$DEF_PKG_CONFS "$$(grep "$$config"=y $(TOPDIR)/.config); \
-		done; \
-	fi; \
-	[ ! -f tmp/.packagedynamicdefault ] || OLD_DEF_PKG_CONFS=$$(cat tmp/.packagedynamicdefault); \
-	[ "$$DEF_PKG_CONFS" = "$$OLD_DEF_PKG_CONFS" ] || rm -rf tmp/info/.targetinfo*; \
-	mkdir -p tmp && echo "$$DEF_PKG_CONFS" > tmp/.packagedynamicdefault;
-
-prepare-tmpinfo: check-dynamic-def-pkg FORCE
+prepare-tmpinfo: FORCE
 	@+$(MAKE) -r -s $(STAGING_DIR_HOST)/.prereq-build $(PREP_MK)
 	mkdir -p tmp/info feeds
 	[ -e $(TOPDIR)/feeds/base ] || ln -sf $(TOPDIR)/package $(TOPDIR)/feeds/base

include/trusted-firmware-a.mk

@@ -3,7 +3,7 @@ PKG_CPE_ID ?= cpe:/a:arm:trusted_firmware-a
 
 ifndef PKG_SOURCE_PROTO
 PKG_SOURCE = trusted-firmware-a-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot
+PKG_SOURCE_URL:=https://codeload.github.com/TrustedFirmware-A/trusted-firmware-a/tar.gz/v$(PKG_VERSION)?
 endif
 
 PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
@@ -77,13 +77,13 @@ endef
 DTC=$(wildcard $(LINUX_DIR)/scripts/dtc/dtc)
 
 define Build/Compile/Trusted-Firmware-A
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+	+unset CC; \
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		CROSS_COMPILE=$(TARGET_CROSS) \
 		OPENSSL_DIR=$(STAGING_DIR_HOST) \
 		$(if $(DTC),DTC="$(DTC)") \
 		PLAT=$(PLAT) \
 		BUILD_STRING="OpenWrt v$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \
-		$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
 		$(TFA_MAKE_FLAGS)
 endef
 

include/version.mk

@@ -6,6 +6,9 @@
 # Substituted by SDK, do not remove
 # REVISION:=x
 # SOURCE_DATE_EPOCH:=x
+# BASE_FILES_VERSION:=x
+# KERNEL_VERSION:=x
+# LIBC_VERSION:=x
 
 PKG_CONFIG_DEPENDS += \
 	CONFIG_VERSION_HOME_URL \
@@ -18,18 +21,19 @@ PKG_CONFIG_DEPENDS += \
 	CONFIG_VERSION_MANUFACTURER_URL \
 	CONFIG_VERSION_PRODUCT \
 	CONFIG_VERSION_SUPPORT_URL \
+	CONFIG_VERSION_FIRMWARE_URL \
 	CONFIG_VERSION_HWREV \
 
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),24.10.0-rc2)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r28161-ea17e958b9)
+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/24.10.0-rc2)
+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)
@@ -50,6 +54,9 @@ VERSION_HOME_URL:=$(if $(VERSION_HOME_URL),$(VERSION_HOME_URL),https://openwrt.o
 VERSION_SUPPORT_URL:=$(call qstrip,$(CONFIG_VERSION_SUPPORT_URL))
 VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),https://forum.openwrt.org/)
 
+VERSION_FIRMWARE_URL:=$(call qstrip,$(CONFIG_VERSION_FIRMWARE_URL))
+VERSION_FIRMWARE_URL:=$(if $(VERSION_FIRMWARE_URL),$(VERSION_FIRMWARE_URL),https://downloads.openwrt.org/)
+
 VERSION_PRODUCT:=$(call qstrip,$(CONFIG_VERSION_PRODUCT))
 VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
 
@@ -103,7 +110,7 @@ VERSION_SED_SCRIPT:=$(SED) 's,%U,$(call sed_escape,$(VERSION_REPO)),g' \
 	-e 's,%b,$(call sed_escape,$(VERSION_BUG_URL)),g' \
 	-e 's,%u,$(call sed_escape,$(VERSION_HOME_URL)),g' \
 	-e 's,%s,$(call sed_escape,$(VERSION_SUPPORT_URL)),g' \
+	-e 's,%f,$(call sed_escape,$(VERSION_FIRMWARE_URL)),g' \
 	-e 's,%P,$(call sed_escape,$(VERSION_PRODUCT)),g' \
 	-e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g' \
 	-e 's,%B,$(call sed_escape,$(SOURCE_DATE_EPOCH)),g'
-

package/Makefile

@@ -98,9 +98,14 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(curdir)/merge-index
 ifneq ($(CONFIG_USE_APK),)
 	$(file >$(TMP_DIR)/apk_install_list,\
 	    $(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg))))
-	$(call apk,$(TARGET_DIR)) add --initdb --no-scripts --arch $(ARCH_PACKAGES) \
-		--repositories-file /dev/zero --repository file://$(PACKAGE_DIR_ALL)/packages.adb \
-		$$(cat $(TMP_DIR)/apk_install_list)
+	$(call apk,$(TARGET_DIR)) add --no-cache --initdb --no-scripts --arch $(ARCH_PACKAGES) \
+		--repositories-file /dev/null --repository file://$(PACKAGE_DIR_ALL)/packages.adb \
+		$$(cat $(TMP_DIR)/apk_install_list) \
+			"base-files=$(shell cat $(TMP_DIR)/base-files.version)" \
+			"libc=$(shell cat $(TMP_DIR)/libc.version)" \
+			"kernel=$(shell cat $(TMP_DIR)/kernel.version)"
+
+	rm -rf $(TARGET_DIR)/run
 else
 	$(file >$(TMP_DIR)/opkg_install_list,\
 	  $(call opkg_package_files,\
@@ -130,7 +135,12 @@ ifneq ($(CONFIG_USE_APK),)
 			--keys-dir $(TOPDIR) \
 			--sign $(BUILD_KEY_APK_SEC) \
 			--output packages.adb \
-			$$(ls *.apk | grep -v 'kernel\|libc'); \
+			*.apk; \
+		echo -n '{"architecture": "$(ARCH_PACKAGES)", "packages":{' > index.json; \
+		$(STAGING_DIR_HOST)/bin/apk adbdump packages.adb | \
+			awk '/- name: / {pkg = $$NF} ; / version: / {printf "\"%s\": \"%s\", ", pkg, $$NF}' | \
+			sed 's/, $$//' >> index.json; \
+		echo '}}' >> index.json; \
 	done
 else
 	@for d in $(PACKAGE_SUBDIRS); do ( \

package/base-files/Makefile

@@ -39,7 +39,11 @@ endif
 define Package/base-files
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+netifd +libc +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:openwrt-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
+  DEPENDS:= \
+	+netifd +libc +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:openwrt-keyring \
+	+NAND_SUPPORT:ubi-utils +fstools +fwtool \
+	+SELINUX:procd-selinux +!SELINUX:procd +USE_SECCOMP:procd-seccomp \
+	+SELINUX:busybox-selinux +!SELINUX:busybox
   TITLE:=Base filesystem for OpenWrt
   URL:=http://openwrt.org/
   VERSION:=$(PKG_RELEASE)~$(lastword $(subst -, ,$(REVISION)))
@@ -246,12 +250,13 @@ endif
 		rm -f $(1)/etc/banner.failsafe,)
 
 ifneq ($(CONFIG_USE_APK),)
-	mkdir -p $(1)/etc/apk/
-	$(call FeedSourcesAppendAPK,$(1)/etc/apk/repositories)
-	$(VERSION_SED_SCRIPT) $(1)/etc/apk/repositories
+	mkdir -p $(1)/etc/apk/repositories.d
+	$(call FeedSourcesAppendAPK,$(1)/etc/apk/repositories.d/distfeeds.list)
+	$(VERSION_SED_SCRIPT) $(1)/etc/apk/repositories.d/distfeeds.list
 
 	rm -f $(1)/etc/uci-defaults/13_fix-group-user
 	rm -f $(1)/sbin/pkg_check
+	echo $(PKG_RELEASE)~$(lastword $(subst -, ,$(REVISION))) >$(TMP_DIR)/base-files.version
 else
 	$(if $(CONFIG_CLEAN_IPKG),, \
 		mkdir -p $(1)/etc/opkg; \

package/base-files/files/bin/config_generate

@@ -312,7 +312,8 @@ generate_static_system() {
 		delete system.@system[0]
 		add system system
 		set system.@system[-1].hostname='OpenWrt'
-		set system.@system[-1].timezone='UTC'
+		set system.@system[-1].timezone='GMT0'
+		set system.@system[-1].zonename='UTC'
 		set system.@system[-1].ttylogin='0'
 		set system.@system[-1].log_size='128'
 		set system.@system[-1].urandom_seed='0'

package/base-files/files/etc/init.d/done

@@ -5,6 +5,7 @@ START=95
 boot() {
 	mount_root done
 	rm -f /sysupgrade.tgz && sync
+	rm -f /tmp/sysupgrade.tar && sync
 
 	# process user commands
 	[ -f /etc/rc.local ] && {

package/base-files/files/etc/init.d/led

@@ -3,6 +3,10 @@
 
 START=96
 
+extra_command "turnon" "Put the LEDs into their default state"
+extra_command "turnoff" "Turn all LEDs off"
+extra_command "blink" "Blink all LEDs"
+
 led_color_set() {
 	local cfg="$1"
 	local sysfs="$2"
@@ -47,6 +51,7 @@ load_led() {
 	local delayon
 	local delayoff
 	local interval
+	local brightness
 
 	config_get sysfs $1 sysfs
 	config_get name $1 name "$sysfs"
@@ -63,6 +68,7 @@ load_led() {
 	config_get message $1 message ""
 	config_get gpio $1 gpio "0"
 	config_get_bool inverted $1 inverted "0"
+	config_get brightness $1 brightness
 
 	[ "$2" ] && [ "$sysfs" != "$2" ] && return
 
@@ -100,8 +106,10 @@ load_led() {
 		[ "$default" = 0 ] &&
 			echo 0 >/sys/class/leds/${sysfs}/brightness
 
-		[ $default = 1 ] &&
-			cat /sys/class/leds/${sysfs}/max_brightness > /sys/class/leds/${sysfs}/brightness
+		[ "$default" = 1 ] && {
+			[ -z "$brightness" ] && brightness="$(cat /sys/class/leds/${sysfs}/max_brightness)"
+			echo "$brightness" > /sys/class/leds/${sysfs}/brightness
+		}
 
 		led_color_set "$1" "$sysfs"
 
@@ -168,7 +176,31 @@ load_led() {
 	}
 }
 
+turnoff() {
+	for led in `ls /sys/class/leds/`; do
+		echo 0 > /sys/class/leds/$led/brightness
+	done
+}
+
+turnon() {
+	turnoff
+	. /etc/diag.sh
+	set_state done
+	start
+}
+
+blink() {
+	for led in `ls /sys/class/leds/`; do
+		echo 0 > /sys/class/leds/$led/brightness
+		echo timer > /sys/class/leds/$led/trigger
+	done
+}
+
 start() {
+	[ "$(uci -q get system.@system[-1].leds_off)" = '1' ] && {
+		turnoff
+		exit 0
+	}
 	[ -e /sys/class/leds/ ] && {
 		[ -s /var/run/led.state ] && {
 			local led trigger brightness color

package/base-files/files/etc/init.d/system

@@ -9,8 +9,8 @@ validate_system_section() {
 		'hostname:string:OpenWrt' \
 		'conloglevel:uinteger' \
 		'buffersize:uinteger' \
-		'timezone:string:UTC' \
-		'zonename:string'
+		'timezone:string:GMT0' \
+		'zonename:string:UTC'
 }
 
 system_config() {

package/base-files/files/etc/profile

@@ -38,3 +38,24 @@ 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/rc.button/reset

@@ -23,7 +23,7 @@ released)
 	elif [ "$SEEN" -ge 5 -a -n "$OVERLAY" ]
 	then
 		echo "FACTORY RESET" > /dev/console
-		jffs2reset -y && reboot &
+		factoryreset -y && reboot &
 	fi
 ;;
 esac

package/base-files/files/etc/rc.common

@@ -100,10 +100,6 @@ service_triggers() {
 	return 0
 }
 
-service_data() {
-	return 0
-}
-
 service_running() {
 	local instance="${1:-*}"
 

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

@@ -125,8 +125,8 @@ caldata_valid() {
 caldata_patch_data() {
 	local data=$1
 	local data_count=$((${#1} / 2))
-	local data_offset=$(($2))
-	local chksum_offset=$(($3))
+	[ -n "$2" ] && local data_offset=$(($2))
+	[ -n "$3" ] && local chksum_offset=$(($3))
 	local target=$4
 	local fw_data
 	local fw_chksum

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

@@ -66,7 +66,7 @@ get_mac_ascii() {
 	local key="$2"
 	local mac_dirty
 
-	mac_dirty=$(strings "$part" | sed -n 's/^'"$key"'=//p')
+	mac_dirty=$(strings "$part" | tr -d ' \t' | sed -n 's/^'"$key"'=//p' | head -n 1)
 
 	# "canonicalize" mac
 	[ -n "$mac_dirty" ] && macaddr_canonicalize "$mac_dirty"

package/base-files/files/sbin/firstboot

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/sbin/jffs2reset $@
+/sbin/factoryreset $@

package/base-files/files/sbin/sysupgrade

@@ -20,6 +20,7 @@ CONF_IMAGE=
 CONF_BACKUP_LIST=0
 CONF_BACKUP=
 CONF_RESTORE=
+USE_CURR_PART=0
 NEED_IMAGE=
 HELP=0
 TEST=0
@@ -50,6 +51,7 @@ while [ -n "$1" ]; do
 		-r|--restore-backup) CONF_RESTORE="$2" NEED_IMAGE=1; shift;;
 		-l|--list-backup) CONF_BACKUP_LIST=1;;
 		-f) CONF_IMAGE="$2"; shift;;
+		-s) USE_CURR_PART=1;;
 		-F|--force) export FORCE=1;;
 		-T|--test) TEST=1;;
 		-h|--help) HELP=1; break;;
@@ -79,6 +81,7 @@ upgrade-option:
 	-p           do not attempt to restore the partition table after flash.
 	-k           include in backup a list of current installed packages at
 	             $INSTALLED_PACKAGES
+	-s           stay on current partition (for dual firmware devices)
 	-T | --test
 	             Verify image and config .tar.gz but do not actually flash.
 	-F | --force
@@ -279,11 +282,19 @@ create_backup_archive() {
 			if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then
 				# Format: pkg-name<TAB>{rom,overlay,unknown}
 				# rom is used for pkgs in /rom, even if updated later
-				tar_print_member "$INSTALLED_PACKAGES" "$(find /usr/lib/opkg/info -name "*.control" \( \
-					\( -exec test -f /rom/{} \; -exec echo {} rom \; \) -o \
-					\( -exec test -f /overlay/upper/{} \; -exec echo {} overlay \; \) -o \
-					\( -exec echo {} unknown \; \) \
-					\) | sed -e 's,.*/,,;s/\.control /\t/')" || ret=1
+				if [ -d "/usr/lib/opkg/info" ]; then
+					tar_print_member "$INSTALLED_PACKAGES" "$(find /usr/lib/opkg/info -name "*.control" \( \
+						\( -exec test -f /rom/{} \; -exec echo {} rom \; \) -o \
+						\( -exec test -f /overlay/upper/{} \; -exec echo {} overlay \; \) -o \
+						\( -exec echo {} unknown \; \) \
+						\) | sed -e 's,.*/,,;s/\.control /\t/')" || ret=1
+				elif [ -d "/lib/apk/packages" ]; then
+					tar_print_member "$INSTALLED_PACKAGES" "$(find /lib/apk/packages -name "*.list" \( \
+						\( -exec test -f /rom/{} \; -exec echo {} rom \; \) -o \
+						\( -exec test -f /overlay/upper/{} \; -exec echo {} overlay \; \) -o \
+						\( -exec echo {} unknown \; \) \
+						\) | sed -e 's,.*/,,;s/\.list /\t/')" || ret=1
+				fi
 			fi
 		fi
 
@@ -416,6 +427,7 @@ else
 	json_add_string command "$COMMAND"
 	json_add_object options
 	json_add_int save_partitions "$SAVE_PARTITIONS"
+	[ $USE_CURR_PART -eq 1 ] && json_add_boolean use_curr_part 1
 	json_close_object
 
 	ubus call system sysupgrade "$(json_dump)"

package/base-files/files/usr/lib/os-release

@@ -7,6 +7,7 @@ VERSION_ID="%v"
 HOME_URL="%u"
 BUG_URL="%b"
 SUPPORT_URL="%s"
+FIRMWARE_URL="%f"
 BUILD_ID="%R"
 OPENWRT_BOARD="%S"
 OPENWRT_ARCH="%A"

package/base-files/image-config.in

@@ -190,7 +190,7 @@ if VERSIONOPT
 	config VERSION_REPO
 		string
 		prompt "Release repository"
-		default "https://downloads.openwrt.org/releases/24.10.0-rc2"
+		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:
@@ -241,6 +241,12 @@ if VERSIONOPT
 		help
 			This an URL to provide users seeking support
 
+	config VERSION_FIRMWARE_URL
+		string
+		prompt "Firmware URL"
+		help
+			This is an URL to provide users for downloading firmware
+
 	config VERSION_PRODUCT
 		string
 		prompt "Product name"
@@ -266,7 +272,7 @@ if VERSIONOPT
 	config VERSION_CODE_FILENAMES
 		bool
 		prompt "Revision code in filenames"
-		default n
+		default y
 		help
 			Enable this to include the revision identifier or the configured
 			version code into the firmware image, SDK- and Image Builder archive

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

@@ -33,6 +33,7 @@ TFA_TARGETS:= \
 	bcm4908
 
 TFA_MAKE_FLAGS += \
+	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
 	BRCM_CHIP=$(BRCM_CHIP)
 
 define Package/trusted-firmware-a/install

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

@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=arm-trusted-firmware-mediatek
-PKG_RELEASE:=3
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/mtk-openwrt/arm-trusted-firmware.git
-PKG_SOURCE_DATE:=2024-01-17
-PKG_SOURCE_VERSION:=bacca82a8cac369470df052a9d801a0ceb9b74ca
-PKG_MIRROR_HASH:=1138649f64ac3982330925c38c795ca6860289adbd95755991f80afa30ebdea7
+PKG_SOURCE_DATE:=2025-02-12
+PKG_SOURCE_VERSION:=e090770684e775711a624e68e0b28112227a4c38
+PKG_MIRROR_HASH:=1ff9d60f3677aadd9a6716e860985987ba7157bd28ce831112e05c0b3170939a
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 
@@ -352,6 +352,15 @@ define Trusted-Firmware-A/mt7986-spim-nand-ddr3
   DDR_TYPE:=ddr3
 endef
 
+define Trusted-Firmware-A/mt7986-spim-nand-ubi-ddr3
+  NAME:=MediaTek MT7986 (SPI-NAND via SPIM using UBI, DDR3)
+  BOOT_DEVICE:=spim-nand
+  BUILD_SUBTARGET:=filogic
+  PLAT:=mt7986
+  DDR_TYPE:=ddr3
+  USE_UBI:=1
+endef
+
 define Trusted-Firmware-A/mt7988-nor-ddr3
   NAME:=MediaTek MT7988 (SPI-NOR, DDR3)
   BOOT_DEVICE:=nor
@@ -531,6 +540,7 @@ TFA_TARGETS:= \
 	mt7986-sdmmc-ddr3 \
 	mt7986-snand-ddr3 \
 	mt7986-spim-nand-ddr3 \
+	mt7986-spim-nand-ubi-ddr3 \
 	mt7986-ram-ddr4 \
 	mt7986-emmc-ddr4 \
 	mt7986-nor-ddr4 \
@@ -570,6 +580,7 @@ TFA_MAKE_FLAGS += \
 	$(if $(RAM_BOOT_UART_DL),RAM_BOOT_UART_DL=1) \
 	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7622,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x80000)) \
 	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7981,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x100000)) \
+	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7986,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x200000)) \
 	$(if $(RAM_BOOT_UART_DL),bl2,all)
 
 define Package/trusted-firmware-a-ram/install

package/boot/arm-trusted-firmware-mediatek/patches/0004-mediatek-snfi-fix-return-code-when-reading.patch

@@ -13,15 +13,19 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/plat/mediatek/apsoc_common/bl2/bl2_dev_snfi_init.c
 +++ b/plat/mediatek/apsoc_common/bl2/bl2_dev_snfi_init.c
-@@ -29,8 +29,10 @@ static int snfi_mtd_read_page(struct nan
+@@ -30,9 +30,14 @@ static int snfi_mtd_read_page(struct nan
  	int ret;
  
  	ret = mtk_snand_read_page(snf, addr, (void *)buffer, NULL, false);
--	if (ret == -EBADMSG)
+-	if (ret == -EBADMSG || ret > 0)
++	if (ret == -EBADMSG)
+ 		ret = 0;
+ 
 +	if (ret > 0) {
 +		NOTICE("corrected %d bitflips while reading page %u\n", ret, page);
- 		ret = 0;
++		ret = 0;
 +	}
- 
++
  	return ret;
  }
+ 

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

@@ -119,6 +119,7 @@ TFA_TARGETS:= \
 	edpu
 
 TFA_MAKE_FLAGS += \
+		$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
 		CROSS_CM3=$(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \
 		BL33=$(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.bin \
 		MV_DDR_PATH=$(BUILD_DIR)/$(MV_DDR_NAME) \

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

@@ -37,6 +37,9 @@ TFA_TARGETS:= \
 	rk3328 \
 	rk3399
 
+TFA_MAKE_FLAGS+= \
+	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments")
+
 ifeq ($(BUILD_VARIANT),rk3399)
   M0_GCC_NAME:=gcc-arm
   M0_GCC_RELEASE:=11.2-2022.02

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

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

package/boot/arm-trusted-firmware-stm32/patches/0001-Revert-feat-stm32mp1-fdts-remove-RTC-clock-configura.patch

@@ -0,0 +1,66 @@
+From 0e1a71d84585ec33b479c2cb8c8d65a4f6734dbe Mon Sep 17 00:00:00 2001
+From: Thomas Richard <thomas.richard@bootlin.com>
+Date: Wed, 4 Dec 2024 14:26:52 +0100
+Subject: [PATCH] Revert "feat(stm32mp1-fdts): remove RTC clock configuration"
+
+This reverts commit 703a581e2522bffe21b421c98994dc02aed2934c.
+---
+ fdts/stm32mp135f-dk.dts   | 2 ++
+ fdts/stm32mp157c-ed1.dts  | 2 ++
+ fdts/stm32mp15xx-dkx.dtsi | 2 ++
+ 3 files changed, 6 insertions(+)
+
+--- a/fdts/stm32mp135f-dk.dts
++++ b/fdts/stm32mp135f-dk.dts
+@@ -190,6 +190,7 @@
+ 		CLK_AXI_PLL2P
+ 		CLK_MLAHBS_PLL3
+ 		CLK_CKPER_HSE
++		CLK_RTC_LSE
+ 		CLK_SDMMC1_PLL4P
+ 		CLK_SDMMC2_PLL4P
+ 		CLK_STGEN_HSE
+@@ -211,6 +212,7 @@
+ 		DIV(DIV_APB4, 1)
+ 		DIV(DIV_APB5, 2)
+ 		DIV(DIV_APB6, 1)
++		DIV(DIV_RTC, 0)
+ 	>;
+ 
+ 	st,pll_vco {
+--- 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/arm-trusted-firmware-sunxi/Makefile

@@ -46,6 +46,9 @@ TFA_TARGETS:= \
 	sunxi-h6 \
 	sunxi-h616
 
+TFA_MAKE_FLAGS+= \
+	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments")
+
 define Package/trusted-firmware-a/install
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl31.bin $(STAGING_DIR_IMAGE)/bl31_$(BUILD_VARIANT).bin

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

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=arm-trusted-firmware-tools
-PKG_VERSION:=2.9
+PKG_VERSION:=2.12
 PKG_RELEASE:=1
-PKG_HASH:=76a66a1de0c01aeb83dfc7b72b51173fe62c6e51d6fca17cc562393117bed08b
+PKG_HASH:=b4c047493cac1152203e1ba121ae57267e4899b7bf56eb365e22a933342d31c9
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_HOST_ONLY:=1
@@ -33,7 +33,8 @@ define Host/Compile
 	$(MAKE) -C \
 		$(HOST_BUILD_DIR)/tools/fiptool \
 		CPPFLAGS="$(HOST_CFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)"
+		LDFLAGS="$(HOST_LDFLAGS)" \
+		OPENSSL_DIR="$(STAGING_DIR_HOST)"
 endef
 
 define Host/Install

package/boot/arm-trusted-firmware-tools/patches/001-respect-LDFLAGS.patch

@@ -1,11 +1,11 @@
 --- a/tools/fiptool/Makefile
 +++ b/tools/fiptool/Makefile
-@@ -38,7 +38,7 @@
+@@ -74,7 +74,7 @@ all: --openssl ${PROJECT}
  
  ${PROJECT}: ${OBJECTS} Makefile
- 	@echo "  HOSTLD  $@"
--	${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
-+	${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS)
- 	@${ECHO_BLANK_LINE}
- 	@echo "Built $@ successfully"
- 	@${ECHO_BLANK_LINE}
+ 	$(s)echo "  HOSTLD  $@"
+-	$(q)$(host-cc) ${OBJECTS} -o $@ $(LDOPTS)
++	$(q)$(host-cc) ${OBJECTS} -o $@ $(LDOPTS) $(LDFLAGS)
+ 	$(s)echo
+ 	$(s)echo "Built $@ successfully"
+ 	$(s)echo

package/boot/arm-trusted-firmware-tools/patches/002-darwin_compile.patch

@@ -1,15 +1,6 @@
 --- a/tools/fiptool/fiptool.c
 +++ b/tools/fiptool/fiptool.c
-@@ -3,7 +3,7 @@
-  *
-  * SPDX-License-Identifier: BSD-3-Clause
-  */
--
-+#define _DARWIN_C_SOURCE
- #ifndef _MSC_VER
- #include <sys/mount.h>
- #endif
-@@ -18,6 +18,9 @@
+@@ -19,6 +19,9 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
@@ -19,3 +10,13 @@
  
  #include "fiptool.h"
  #include "tbbr_config.h"
+--- a/tools/fiptool/fiptool_platform.h
++++ b/tools/fiptool/fiptool_platform.h
+@@ -12,6 +12,7 @@
+ #ifndef FIPTOOL_PLATFORM_H
+ #define FIPTOOL_PLATFORM_H
+ 
++#define _DARWIN_C_SOURCE
+ #ifndef _MSC_VER
+ 
+ /* Not Visual Studio, so include Posix Headers. */

package/boot/imx-bootlets/Makefile

@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=imx-bootlets
-PKG_VERSION:=10.05.02
+PKG_VERSION:=10.12.01
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://trabant.uid0.hu/openwrt/
-PKG_HASH:=09ecd81a64db5166a235932146faf08d0689bfc7ac04ac9fcc3a5bd809fba74a
+PKG_HASH:=f7c98cbc41e15184cad61c56115e840e34ac3ebb4a162fadeea905e5038fd65b
 
 PKG_FLAGS:=nonshared
 
@@ -37,7 +37,7 @@ define Package/imx-bootlets/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/boot_prep/boot_prep $(STAGING_DIR)/boot_prep
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/linux_prep/output-target/linux_prep $(STAGING_DIR)/linux_prep
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/power_prep/power_prep $(STAGING_DIR)/power_prep
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/linux_prebuilt.db $(STAGING_DIR)/linux_prebuilt.db
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/linux_ivt.bd $(STAGING_DIR)/linux_ivt.bd
 endef
 
 $(eval $(call BuildPackage,imx-bootlets))

package/boot/imx-bootlets/patches/001-skip_sb_generation.patch

@@ -1,18 +1,22 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -32,10 +32,11 @@ ifeq "$(DFT_IMAGE)" "$(wildcard $(DFT_IM
- 	sed -i 's,[^ *]image.*;,\timage="$(DFT_UBOOT)";,' uboot.db
- 	elftosb2 -z -c ./uboot.db -o i$(ARCH)_uboot.sb
+@@ -37,13 +37,13 @@ ifeq "$(DFT_IMAGE)" "$(wildcard $(DFT_IM
+ 	elftosb -z -c ./uboot.bd -o i$(ARCH)_uboot.sb
+ 	elftosb -z -f imx28 -c ./uboot_ivt.bd -o i$(ARCH)_ivt_uboot.sb
  else
 -	@echo "by using the pre-built kernel"
--	elftosb2 -z -c ./linux_prebuilt.db -o i$(ARCH)_linux.sb
--	@echo "generating U-Boot boot stream image"
--	elftosb2 -z -c ./uboot_prebuilt.db -o i$(ARCH)_uboot.sb
+-	elftosb -z -c ./linux.bd -o i$(ARCH)_linux.sb
+-	elftosb -z -f imx28 -c  ./linux_ivt.bd -o i$(ARCH)_ivt_linux.sb
 +	@echo "... not generating any image for now."
-+	#@echo "by using the pre-built kernel"
-+	#elftosb2 -z -c ./linux_prebuilt.db -o i$(ARCH)_linux.sb
++	#elftosb -z -c ./linux.bd -o i$(ARCH)_linux.sb
++	#elftosb -z -f imx28 -c  ./linux_ivt.bd -o i$(ARCH)_ivt_linux.sb
+ 
+-	@echo "generating U-Boot boot stream image"
+-	elftosb -z -c ./uboot.bd -o i$(ARCH)_uboot.sb
+-	elftosb -z -f imx28 -c ./uboot_ivt.bd -o i$(ARCH)_ivt_uboot.sb
 +	#@echo "generating U-Boot boot stream image"
-+	#elftosb2 -z -c ./uboot_prebuilt.db -o i$(ARCH)_uboot.sb
++	#elftosb -z -c ./uboot.bd -o i$(ARCH)_uboot.sb
++	#elftosb -z -f imx28 -c ./uboot_ivt.bd -o i$(ARCH)_ivt_uboot.sb
  endif
  	#@echo "generating kernel bootstream file sd_mmc_bootstream.raw"
  	#Please use cfimager to burn xxx_linux.sb. The below way will no

package/boot/imx-bootlets/patches/002-set_elftosb_config.patch

@@ -1,5 +1,5 @@
---- a/linux_prebuilt.db
-+++ b/linux_prebuilt.db
+--- a/linux_ivt.bd
++++ b/linux_ivt.bd
 @@ -4,10 +4,10 @@ options {
  	flags = 0x01;
  }
@@ -7,11 +7,11 @@
 -	power_prep="./power_prep/power_prep";
 -	sdram_prep="./boot_prep/boot_prep";
 -	linux_prep="./linux_prep/output-target/linux_prep";
--	zImage = "./zImage";
+-	zImage="./zImage";
 +	power_prep="./power_prep";
 +	sdram_prep="./boot_prep";
 +	linux_prep="./linux_prep";
-+	zImage = "./zImage_dtb";
++	zImage="./zImage_dtb";
  }
  
  section (0) {

package/boot/imx-bootlets/patches/003-add-olinuxino.patch

@@ -121,7 +121,7 @@
  
  all: build_prep gen_bootstream
  
-@@ -94,6 +97,8 @@ distclean: clean
+@@ -101,6 +104,8 @@ distclean: clean
  clean:
  	-rm -rf *.sb
  	rm -f sd_mmc_bootstream.raw
@@ -130,14 +130,3 @@
  	$(MAKE) -C linux_prep clean ARCH=$(ARCH)
  	$(MAKE) -C boot_prep clean ARCH=$(ARCH)
  	$(MAKE) -C power_prep clean ARCH=$(ARCH)
---- a/uboot.db
-+++ b/uboot.db
-@@ -3,7 +3,7 @@
- sources {
- 	power_prep="./power_prep/power_prep";
- 	sdram_prep="./boot_prep/boot_prep";
--	image="/home/b18647/repos/ltib_latest/rootfs/boot/u-boot";
-+	image="../boot/u-boot";
- }
- 
- section (0) {

package/boot/imx-bootlets/patches/004-fix-ARM-8933_1.patch

@@ -0,0 +1,11 @@
+--- a/linux_prep/core/cmdlines.S
++++ b/linux_prep/core/cmdlines.S
+@@ -14,7 +14,7 @@
+ #define CMDLINES_FILE "output-target/command_lines_stripped.txt"
+ #endif
+ 
+-	.section .cmdlines, #alloc
++	.section .cmdlines, "a"
+ 	.globl	cmdlines_start
+ cmdlines_start:
+ 	.incbin	CMDLINES_FILE

package/boot/kexec-tools/Makefile

@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/kexec-tools/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/
+  URL:=https://github.com/horms/kexec-tools
 endef
 
 define Package/kexec-tools

package/boot/opensbi/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=opensbi
-PKG_RELEASE:=1.4
+PKG_RELEASE:=1.6
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/riscv/opensbi
-PKG_SOURCE_DATE:=2023-12-24
-PKG_SOURCE_VERSION:=a2b255b88918715173942f2c5e1f97ac9e90c877
-PKG_MIRROR_HASH:=a81d7b3622feba80b2a45fe0d38600be73cfbee64a0426be82a71545c10c54d3
+PKG_SOURCE_DATE:=2024-12-24
+PKG_SOURCE_VERSION:=bd613dd92113f683052acfb23d9dc8ba60029e0a
+PKG_MIRROR_HASH:=247bbb751635d9414cf47cce417185fd3323e98c524eafa825dc91b76cc5c054
 
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 

package/boot/optee-os-stm32/Makefile

@@ -7,10 +7,10 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=4.3.0
+PKG_VERSION:=4.4.0
 PKG_RELEASE:=1
 
-PKG_HASH:=390b271905c828d6def9fa6a77bbaa425f3b434d733c8eb18f582ccbc6896096
+PKG_HASH:=b13c65ff2abcd21a9200cb0131f34d61bde7c31eb0427fa761d27c3b87c7fec8
 PKG_MAINTAINER:=Thomas Richard <thomas.richard@bootlin.com>
 
 OPTEE_USE_INTREE_DTC:=1

package/boot/rkbin/Makefile

@@ -71,6 +71,9 @@ TFA_TARGETS:= \
 	rk3568-e25 \
 	rk3588
 
+TFA_MAKE_FLAGS+= \
+	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments")
+
 ifeq ($(BUILD_VARIANT),rk3308-rock-pi-s)
   TPL_FILE:=rk3308_ddr_589MHz_uart0_m0_v2.07.bin
   define Download/rk3308-tpl-rock-pi-s

package/boot/tfa-layerscape/Makefile

@@ -161,6 +161,7 @@ TFA_TARGETS := \
   lx2160a-rdb-sdboot
 
 TFA_MAKE_FLAGS += \
+	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
 	fip pbl \
 	BOOT_MODE=$(BOOT_MODE) \
 	RCW=$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-rcw.bin \

package/boot/uboot-d1/Makefile

@@ -30,7 +30,7 @@ define U-Boot/dongshan_nezha_stu
   OPENSBI:=generic
   DEPENDS:=+opensbi_generic
   UBOOT_DTS:=sun20i-d1-dongshan-nezha-stu.dtb
-  BUILD_DEVICES:=dongshan_nezha_stu
+  BUILD_DEVICES:=100ask_dongshan-nezha-stu
 endef
 
 define U-Boot/lichee_rv_dock
@@ -38,7 +38,7 @@ define U-Boot/lichee_rv_dock
   OPENSBI:=generic
   DEPENDS:=+opensbi_generic
   UBOOT_DTS:=sun20i-d1-lichee-rv-dock.dtb
-  BUILD_DEVICES:=lichee_rv_dock
+  BUILD_DEVICES:=sipeed_lichee-rv-dock
 endef
 
 define U-Boot/mangopi_mq_pro
@@ -46,7 +46,7 @@ define U-Boot/mangopi_mq_pro
   OPENSBI:=generic
   DEPENDS:=+opensbi_generic
   UBOOT_DTS:=sun20i-d1-mangopi-mq-pro.dtb
-  BUILD_DEVICES:=mangopi_mq_pro
+  BUILD_DEVICES:=widora_mangopi-mq-pro
 endef
 
 define U-Boot/nezha
@@ -54,7 +54,7 @@ define U-Boot/nezha
   OPENSBI:=generic
   DEPENDS:=+opensbi_generic
   UBOOT_DTS:=sun20i-d1-nezha.dtb
-  BUILD_DEVICES:=nezha
+  BUILD_DEVICES:=allwinner_d1-nezha
 endef
 
 UBOOT_TARGETS := \
@@ -74,7 +74,7 @@ endef
 define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(DTS_DIR)/$(UBOOT_DTS) $(STAGING_DIR_IMAGE)/$(UBOOT_DTS)
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-$(UBOOT_IMAGE)
 	mkimage -C none -A riscv -T script -d uEnv-$(UENV).txt \
 		$(STAGING_DIR_IMAGE)/$(BUILD_DEVICES)-boot.scr
 endef

package/boot/uboot-envtools/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uboot-envtools
 PKG_DISTNAME:=u-boot
-PKG_VERSION:=2024.07
+PKG_VERSION:=2025.01
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
@@ -17,7 +17,7 @@ PKG_SOURCE_URL:= \
     https://ftp.denx.de/pub/u-boot \
     https://mirror.cyberbits.eu/u-boot \
     ftp://ftp.denx.de/pub/u-boot
-PKG_HASH:=f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
+PKG_HASH:=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f
 PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION)
 

package/boot/uboot-envtools/files/ath79

@@ -28,6 +28,7 @@ asus,rt-ac59u-v2|\
 asus,zenwifi-cd6n|\
 asus,zenwifi-cd6r|\
 buffalo,bhr-4grv2|\
+buffalo,wzr-450hp2|\
 devolo,magic-2-wifi|\
 engenius,eap300-v2|\
 engenius,eap350-v1|\

package/boot/uboot-envtools/files/mediatek_filogic

@@ -34,8 +34,10 @@ ubootenv_add_ubi_default() {
 
 case "$board" in
 abt,asr3000|\
+cmcc,a10-ubootmod|\
 h3c,magic-nx30-pro|\
 jcg,q30-pro|\
+mercusys,mr90x-v1-ubi|\
 netcore,n60|\
 nokia,ea0326gmp|\
 qihoo,360t7|\
@@ -56,7 +58,8 @@ acer,vero-w6m|\
 glinet,gl-mt2500|\
 glinet,gl-mt6000|\
 glinet,gl-x3000|\
-glinet,gl-xe3000)
+glinet,gl-xe3000|\
+nradio,c8-668gl)
 	local envdev=$(find_mmc_part "u-boot-env")
 	ubootenv_add_uci_config "$envdev" "0x0" "0x80000"
 	;;
@@ -94,7 +97,8 @@ 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-m30-a1|\
+dlink,aquila-pro-ai-m60-a1)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x40000"
 	;;
 gatonetworks,gdsp)
@@ -105,6 +109,7 @@ glinet,gl-mt3000)
 	;;
 mercusys,mr90x-v1|\
 routerich,ax3000|\
+tenbay,wr3000k|\
 tplink,re6000xd)
 	local envdev=/dev/mtd$(find_mtd_index "u-boot-env")
 	ubootenv_add_uci_config "$envdev" "0x0" "0x20000" "0x20000" "1"

package/boot/uboot-envtools/files/qualcommax_ipq50xx

@@ -0,0 +1,24 @@
+[ -e /etc/config/ubootenv ] && exit 0
+
+touch /etc/config/ubootenv
+
+. /lib/uboot-envtools.sh
+. /lib/functions.sh
+
+board=$(board_name)
+
+case "$board" in
+linksys,mr5500|\
+linksys,mx2000|\
+linksys,mx5500|\
+linksys,spnmx56)
+	idx="$(find_mtd_index u_env)"
+	[ -n "$idx" ] && \
+		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000"
+	;;
+esac
+
+config_load ubootenv
+config_foreach ubootenv_add_app_config
+
+exit 0

package/boot/uboot-envtools/files/qualcommax_ipq60xx

@@ -7,23 +7,27 @@ touch /etc/config/ubootenv
 
 board=$(board_name)
 
+ubootenv_add_mtd() {
+	local idx="$(find_mtd_index "${1}")"
+	[ -n "$idx" ] && \
+		ubootenv_add_uci_config "/dev/mtd$idx" "${2}" "${3}" "${4}"
+}
+
 case "$board" in
 8devices,mango-dvk|\
 8devices,mango-dvk-sfp|\
 cambiumnetworks,xe3-4)
-	idx="$(find_mtd_index 0:APPSBLENV)"
-	[ -n "$idx" ] && \
-		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x10000"
+	ubootenv_add_mtd "0:APPSBLENV" "0x0" "0x10000" "0x10000"
 	;;
-netgear,wax214)
-	idx="$(find_mtd_index 0:appsblenv)"
-	[ -n "$idx" ] && \
-		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000" "2"
+linksys,mr7350)
+	ubootenv_add_mtd "u_env" "0x0" "0x40000" "0x20000"
+	;;
+netgear,wax214|\
+tplink,eap610-outdoor)
+	ubootenv_add_mtd "0:appsblenv" "0x0" "0x40000" "0x20000"
 	;;
 yuncore,fap650)
-	idx="$(find_mtd_index 0:appsblenv)"
-	[ -n "$idx" ] && \
-		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x10000"
+	ubootenv_add_mtd "0:appsblenv" "0x0" "0x10000" "0x10000"
 	;;
 esac
 

package/boot/uboot-envtools/files/qualcommax_ipq807x

@@ -7,68 +7,72 @@ touch /etc/config/ubootenv
 
 board=$(board_name)
 
-case "$board" in
-dynalink,dl-wrx36|\
-netgear,rax120v2|\
-netgear,wax218|\
-netgear,wax620|\
-netgear,wax630)
-	idx="$(find_mtd_index 0:appsblenv)"
+ubootenv_add_mtd() {
+	local idx="$(find_mtd_index "${1}")"
 	[ -n "$idx" ] && \
-		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000" "2"
-	;;
+		ubootenv_add_uci_config "/dev/mtd$idx" "${2}" "${3}" "${4}"
+}
+
+ubootenv_add_sys_mtd() {
+	local idx="$(find_mtd_index "${1}")"
+	[ -n "$idx" ] && \
+		ubootenv_add_uci_sys_config "/dev/mtd$idx" "${2}" "${3}" "${4}"
+}
+
+ubootenv_add_mmc() {
+	local mmcpart="$(find_mmc_part "${1}")"
+	[ -n "$mmcpart" ] && \
+		ubootenv_add_uci_config "$mmcpart" "${2}" "${3}" "${4}" "${5}"
+}
+
+case "$board" in
+aliyun,ap8220|\
 compex,wpq873|\
 edgecore,eap102|\
 zyxel,nbg7815)
-	idx="$(find_mtd_index 0:appsblenv)"
-	[ -n "$idx" ] && \
-		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x10000" "1"
+	ubootenv_add_mtd "0:appsblenv" "0x0" "0x10000" "0x10000"
+	;;
+dynalink,dl-wrx36|\
+netgear,rax120v2|\
+netgear,sxr80|\
+netgear,sxs80|\
+netgear,wax218|\
+netgear,wax620|\
+netgear,wax630|\
+tplink,eap620hd-v1|\
+tplink,eap660hd-v1)
+	ubootenv_add_mtd "0:appsblenv" "0x0" "0x40000" "0x20000"
 	;;
 edimax,cax1800)
-	idx="$(find_mtd_index 0:appsblenv)"
-	[ -n "$idx" ] && \
-		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x20000"
+	ubootenv_add_mtd "0:appsblenv" "0x0" "0x10000" "0x20000"
+	;;
+linksys,homewrk)
+	ubootenv_add_mtd "0:appsblenv" "0x0" "0x40000" "0x40000"
 	;;
 linksys,mx4200v1|\
 linksys,mx4200v2|\
 linksys,mx5300|\
 linksys,mx8500)
-	idx="$(find_mtd_index u_env)"
-	[ -n "$idx" ] && \
-		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000" "2"
+	ubootenv_add_mtd "u_env" "0x0" "0x40000" "0x20000"
 	;;
-netgear,sxr80|\
-netgear,sxs80|\
-tplink,eap660hd-v1)
-	idx="$(find_mtd_index 0:appsblenv)"
-	[ -n "$idx" ] && \
-		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000"
+linksys,mx4300)
+	ubootenv_add_mtd "u_env" "0x0" "0x40000" "0x40000"
 	;;
 redmi,ax6|\
 xiaomi,ax3600|\
 xiaomi,ax9000)
-	idx="$(find_mtd_index 0:appsblenv)"
-	[ -n "$idx" ] && \
-		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x20000"
-	idx2="$(find_mtd_index bdata)"
-	[ -n "$idx2" ] && \
-		ubootenv_add_uci_sys_config "/dev/mtd$idx2" "0x0" "0x10000" "0x20000"
+	ubootenv_add_mtd "0:appsblenv" "0x0" "0x10000" "0x20000"
+	ubootenv_add_sys_mtd "bdata" "0x0" "0x10000" "0x20000"
 	;;
 prpl,haze)
-	mmcpart="$(find_mmc_part 0:APPSBLENV)"
-	[ -n "$mmcpart" ] && \
-		ubootenv_add_uci_config "$mmcpart" "0x0" "0x40000" "0x400" "0x100"
+	ubootenv_add_mmc "0:APPSBLENV" "0x0" "0x40000" "0x400" "0x100"
 	;;
 asus,rt-ax89x|\
 qnap,301w)
-	idx="$(find_mtd_index 0:appsblenv)"
-	[ -n "$idx" ] && \
-		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x20000" "0x20000" "1"
+	ubootenv_add_mtd "0:appsblenv" "0x0" "0x20000" "0x20000"
 	;;
 spectrum,sax1v1k)
-	mmcpart="$(find_mmc_part 0:APPSBLENV)"
-	[ -n "$mmcpart" ] && \
-		ubootenv_add_uci_config "$mmcpart" "0x0" "0x40000" "0x40000" "1"
+	ubootenv_add_mmc "0:APPSBLENV" "0x0" "0x40000" "0x40000" "1"
 	;;
 esac
 

package/boot/uboot-envtools/files/ramips

@@ -19,6 +19,7 @@ alfa-network,r36m-e4g|\
 alfa-network,tube-e4g|\
 engenius,epg600|\
 engenius,esr600h|\
+hongdian,h8922-v30|\
 linksys,re7000|\
 meig,slt866|\
 sitecom,wlr-4100-v1-002|\
@@ -69,6 +70,7 @@ zte,mf283plus)
 	;;
 asus,rt-ax53u|\
 asus,rt-ax54|\
+asus,4g-ax56|\
 belkin,rt1800|\
 elecom,wrc-x1800gs|\
 h3c,tx1800-plus|\
@@ -147,7 +149,8 @@ xiaomi,mi-router-cr6608|\
 xiaomi,mi-router-cr6609)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x20000"
 	;;
-dna,valokuitu-plus-ex400)
+dna,valokuitu-plus-ex400|\
+genexis,pulse-ex400)
 	ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1"
 	ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
 	;;

package/boot/uboot-envtools/files/realtek

@@ -28,6 +28,7 @@ zyxel,gs1900-10hp|\
 zyxel,gs1900-16|\
 zyxel,gs1900-24-v1|\
 zyxel,gs1900-24e|\
+zyxel,gs1900-24ep|\
 zyxel,gs1900-24hp-v1|\
 zyxel,gs1900-24hp-v2)
 	idx="$(find_mtd_index u-boot-env)"

package/boot/uboot-mediatek/Makefile

@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-PKG_VERSION:=2024.10
-PKG_HASH:=b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0
+PKG_VERSION:=2025.01
+PKG_HASH:=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f
 PKG_BUILD_DEPENDS:=!(TARGET_ramips||TARGET_mediatek_mt7623):arm-trusted-firmware-tools/host
 
 UBOOT_USE_INTREE_DTC:=1
@@ -231,6 +231,18 @@ define U-Boot/mt7981_abt_asr3000
   DEPENDS:=+trusted-firmware-a-mt7981-spim-nand-ddr3
 endef
 
+define U-Boot/mt7981_cmcc_a10
+  NAME:=CMCC A10
+  BUILD_SUBTARGET:=filogic
+  BUILD_DEVICES:=cmcc_a10-ubootmod
+  UBOOT_CONFIG:=mt7981_cmcc_a10
+  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_rax3000m-emmc
   NAME:=CMCC RAX3000M
   BUILD_SUBTARGET:=filogic
@@ -570,6 +582,18 @@ define U-Boot/mt7986_jdcloud_re-cp-03
   DEPENDS:=+trusted-firmware-a-mt7986-emmc-ddr4
 endef
 
+define U-Boot/mt7986_mercusys_mr90x-v1
+  NAME:=MERCUSYS MR90X v1
+  BUILD_SUBTARGET:=filogic
+  BUILD_DEVICES:=mercusys_mr90x-v1-ubi
+  UBOOT_CONFIG:=mt7986_mercusys_mr90x-v1
+  UBOOT_IMAGE:=u-boot.fip
+  BL2_BOOTDEV:=spim-nand-ubi
+  BL2_SOC:=mt7986
+  BL2_DDRTYPE:=ddr3
+  DEPENDS:=+trusted-firmware-a-mt7986-spim-nand-ubi-ddr3
+endef
+
 define U-Boot/mt7986_netcore_n60
   NAME:=Netcore N60
   BUILD_SUBTARGET:=filogic
@@ -820,6 +844,7 @@ UBOOT_TARGETS := \
 	mt7628_ravpower_rp-wd009 \
 	mt7629_rfb \
 	mt7981_abt_asr3000 \
+	mt7981_cmcc_a10 \
 	mt7981_cmcc_rax3000m-emmc \
 	mt7981_cmcc_rax3000m-nand \
 	mt7981_gatonetworks_gdsp \
@@ -847,6 +872,7 @@ UBOOT_TARGETS := \
 	mt7986_bananapi_bpi-r3-mini-snand \
 	mt7986_glinet_gl-mt6000 \
 	mt7986_jdcloud_re-cp-03 \
+	mt7986_mercusys_mr90x-v1 \
 	mt7986_netcore_n60 \
 	mt7986_tplink_tl-xdr4288 \
 	mt7986_tplink_tl-xdr6086 \

package/boot/uboot-mediatek/patches/010-menu-fix-the-logic-checking-whether-ESC-key-is-press.patch

@@ -1,63 +0,0 @@
-From 72b4ba8417d33516b8489bac3c90dbbbf781a3d2 Mon Sep 17 00:00:00 2001
-From: Weijie Gao <weijie.gao@mediatek.com>
-Date: Tue, 29 Oct 2024 17:47:10 +0800
-Subject: [PATCH 1/3] menu: fix the logic checking whether ESC key is pressed
-
-It's observed that the bootmenu on a serial console sometimes
-incorrectly quitted with superfluous characters filled to command
-line input:
-
->  *** U-Boot Boot Menu ***
->
->      1. Startup system (Default)
->      2. Upgrade firmware
->      3. Upgrade ATF BL2
->      4. Upgrade ATF FIP
->      5. Load image
->      0. U-Boot console
->
->
->  Press UP/DOWN to move, ENTER to select, ESC to quit
->MT7988> [B
-
-Analysis shows it was caused by the wrong logic of bootmenu_loop:
-
-At first the bootmenu_loop received the first ESC char correctly.
-
-However, during the second call to bootmenu_loop, there's no data
-in the UART Rx FIFO. Due to the low baudrate, the second char of
-the down array key sequence hasn't be fully received.
-
-But bootmenu_loop just did a mdelay(10), and then treated it as a
-single ESC key press event. It didn't even try tstc() again after
-the 10ms timeout.
-
-This patch fixes this issue by letting bootmenu_loop check tstc()
-twice.
-
-Tested-By: E Shattow <lucent@gmail.com>
-Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
----
- common/menu.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/common/menu.c
-+++ b/common/menu.c
-@@ -525,14 +525,15 @@ enum bootmenu_key bootmenu_loop(struct b
- 				struct cli_ch_state *cch)
- {
- 	enum bootmenu_key key;
--	int c;
-+	int c, errchar = 0;
- 
- 	c = cli_ch_process(cch, 0);
- 	if (!c) {
- 		while (!c && !tstc()) {
- 			schedule();
- 			mdelay(10);
--			c = cli_ch_process(cch, -ETIMEDOUT);
-+			c = cli_ch_process(cch, errchar);
-+			errchar = -ETIMEDOUT;
- 		}
- 		if (!c) {
- 			c = getchar();

package/boot/uboot-mediatek/patches/011-menu-add-support-to-check-if-menu-needs-to-be-reprin.patch

@@ -1,112 +0,0 @@
-From f1cbdd3330f0055dfbff0ef7d86276c4cc3cff2a Mon Sep 17 00:00:00 2001
-From: Weijie Gao <weijie.gao@mediatek.com>
-Date: Tue, 29 Oct 2024 17:47:16 +0800
-Subject: [PATCH 2/3] menu: add support to check if menu needs to be reprinted
-
-This patch adds a new callback named need_reprint for menu.
-The need_reprint will be called before printing the menu. If the
-callback exists and returns FALSE, menu printing will be canceled.
-
-This is very useful if the menu was not changed. It can save time
-for serial-based menu to handle more input data.
-
-Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
----
- boot/pxe_utils.c |  2 +-
- cmd/bootmenu.c   |  2 +-
- cmd/eficonfig.c  |  2 +-
- common/menu.c    | 11 +++++++++++
- include/menu.h   |  1 +
- 5 files changed, 15 insertions(+), 3 deletions(-)
-
---- a/boot/pxe_utils.c
-+++ b/boot/pxe_utils.c
-@@ -1449,7 +1449,7 @@ static struct menu *pxe_menu_to_menu(str
- 	 * Create a menu and add items for all the labels.
- 	 */
- 	m = menu_create(cfg->title, DIV_ROUND_UP(cfg->timeout, 10),
--			cfg->prompt, NULL, label_print, NULL, NULL);
-+			cfg->prompt, NULL, label_print, NULL, NULL, NULL);
- 	if (!m)
- 		return NULL;
- 
---- a/cmd/bootmenu.c
-+++ b/cmd/bootmenu.c
-@@ -506,7 +506,7 @@ static enum bootmenu_ret bootmenu_show(i
- 
- 	menu = menu_create(NULL, bootmenu->delay, 1, menu_display_statusline,
- 			   bootmenu_print_entry, bootmenu_choice_entry,
--			   bootmenu);
-+			   NULL, bootmenu);
- 	if (!menu) {
- 		bootmenu_destroy(bootmenu);
- 		return BOOTMENU_RET_FAIL;
---- a/cmd/eficonfig.c
-+++ b/cmd/eficonfig.c
-@@ -443,7 +443,7 @@ efi_status_t eficonfig_process_common(st
- 		efi_menu->menu_desc = menu_desc;
- 
- 	menu = menu_create(NULL, 0, 1, display_statusline, item_data_print,
--			   item_choice, efi_menu);
-+			   item_choice, NULL, efi_menu);
- 	if (!menu)
- 		return EFI_INVALID_PARAMETER;
- 
---- a/common/menu.c
-+++ b/common/menu.c
-@@ -43,6 +43,7 @@ struct menu {
- 	void (*display_statusline)(struct menu *);
- 	void (*item_data_print)(void *);
- 	char *(*item_choice)(void *);
-+	bool (*need_reprint)(void *);
- 	void *item_choice_data;
- 	struct list_head items;
- 	int item_cnt;
-@@ -117,6 +118,11 @@ static inline void *menu_item_destroy(st
-  */
- static inline void menu_display(struct menu *m)
- {
-+	if (m->need_reprint) {
-+		if (!m->need_reprint(m->item_choice_data))
-+			return;
-+	}
-+
- 	if (m->title) {
- 		puts(m->title);
- 		putc('\n');
-@@ -362,6 +368,9 @@ int menu_item_add(struct menu *m, char *
-  * item. Returns a key string corresponding to the chosen item or NULL if
-  * no item has been selected.
-  *
-+ * need_reprint - If not NULL, will be called before printing the menu.
-+ * Returning FALSE means the menu does not need reprint.
-+ *
-  * item_choice_data - Will be passed as the argument to the item_choice function
-  *
-  * Returns a pointer to the menu if successful, or NULL if there is
-@@ -371,6 +380,7 @@ struct menu *menu_create(char *title, in
- 				void (*display_statusline)(struct menu *),
- 				void (*item_data_print)(void *),
- 				char *(*item_choice)(void *),
-+				bool (*need_reprint)(void *),
- 				void *item_choice_data)
- {
- 	struct menu *m;
-@@ -386,6 +396,7 @@ struct menu *menu_create(char *title, in
- 	m->display_statusline = display_statusline;
- 	m->item_data_print = item_data_print;
- 	m->item_choice = item_choice;
-+	m->need_reprint = need_reprint;
- 	m->item_choice_data = item_choice_data;
- 	m->item_cnt = 0;
- 
---- a/include/menu.h
-+++ b/include/menu.h
-@@ -13,6 +13,7 @@ struct menu *menu_create(char *title, in
- 				void (*display_statusline)(struct menu *),
- 				void (*item_data_print)(void *),
- 				char *(*item_choice)(void *),
-+				bool (*need_reprint)(void *),
- 				void *item_choice_data);
- int menu_default_set(struct menu *m, char *item_key);
- int menu_get_choice(struct menu *m, void **choice);

package/boot/uboot-mediatek/patches/012-bootmenu-add-reprint-check.patch

@@ -1,75 +0,0 @@
-From 702752cfae954648d6133bdff19283343b3339ef Mon Sep 17 00:00:00 2001
-From: Weijie Gao <weijie.gao@mediatek.com>
-Date: Tue, 29 Oct 2024 17:47:22 +0800
-Subject: [PATCH 3/3] bootmenu: add reprint check
-
-Record the last active menu item and check if it equals to the
-current selected item before reprint.
-
-Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
----
- cmd/bootmenu.c | 16 +++++++++++++++-
- include/menu.h |  1 +
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
---- a/cmd/bootmenu.c
-+++ b/cmd/bootmenu.c
-@@ -103,11 +103,13 @@ static char *bootmenu_choice_entry(void
- 
- 		switch (key) {
- 		case BKEY_UP:
-+			menu->last_active = menu->active;
- 			if (menu->active > 0)
- 				--menu->active;
- 			/* no menu key selected, regenerate menu */
- 			return NULL;
- 		case BKEY_DOWN:
-+			menu->last_active = menu->active;
- 			if (menu->active < menu->count - 1)
- 				++menu->active;
- 			/* no menu key selected, regenerate menu */
-@@ -133,6 +135,17 @@ static char *bootmenu_choice_entry(void
- 	return NULL;
- }
- 
-+static bool bootmenu_need_reprint(void *data)
-+{
-+	struct bootmenu_data *menu = data;
-+	bool need_reprint;
-+
-+	need_reprint = menu->last_active != menu->active;
-+	menu->last_active = menu->active;
-+
-+	return need_reprint;
-+}
-+
- static void bootmenu_destroy(struct bootmenu_data *menu)
- {
- 	struct bootmenu_entry *iter = menu->first;
-@@ -332,6 +345,7 @@ static struct bootmenu_data *bootmenu_cr
- 
- 	menu->delay = delay;
- 	menu->active = 0;
-+	menu->last_active = -1;
- 	menu->first = NULL;
- 
- 	default_str = env_get("bootmenu_default");
-@@ -506,7 +520,7 @@ static enum bootmenu_ret bootmenu_show(i
- 
- 	menu = menu_create(NULL, bootmenu->delay, 1, menu_display_statusline,
- 			   bootmenu_print_entry, bootmenu_choice_entry,
--			   NULL, bootmenu);
-+			   bootmenu_need_reprint, bootmenu);
- 	if (!menu) {
- 		bootmenu_destroy(bootmenu);
- 		return BOOTMENU_RET_FAIL;
---- a/include/menu.h
-+++ b/include/menu.h
-@@ -40,6 +40,7 @@ int menu_show(int bootdelay);
- struct bootmenu_data {
- 	int delay;			/* delay for autoboot */
- 	int active;			/* active menu entry */
-+	int last_active;		/* last active menu entry */
- 	int count;			/* total count of menu entries */
- 	struct bootmenu_entry *first;	/* first menu entry */
- };

package/boot/uboot-mediatek/patches/060-01-clk-mediatek-mt7629-fix-parent-clock-of-some-top-clo.patch

@@ -0,0 +1,45 @@
+From 6e45549f4dac42748d66462e04f940ef6737289d Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Tue, 17 Dec 2024 16:39:16 +0800
+Subject: [PATCH 01/10] clk: mediatek: mt7629: fix parent clock of some top
+ clock muxes
+
+According to the mt7629 programming guide, the CLK_TOP_F10M_REF_SEL
+shares the same parent selection with CLK_TOP_IRRX_SEL, while the
+present parent selection for CLK_TOP_F10M_REF_SEL is actually used
+for CLK_TOP_SGMII_REF_1_SEL.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/clk/mediatek/clk-mt7629.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/clk/mediatek/clk-mt7629.c
++++ b/drivers/clk/mediatek/clk-mt7629.c
+@@ -186,7 +186,7 @@ static const int pwm_parents[] = {
+ 	CLK_TOP_UNIVPLL2_D4
+ };
+ 
+-static const int f10m_ref_parents[] = {
++static const int sgmii_ref_1_parents[] = {
+ 	CLK_XTAL,
+ 	CLK_TOP_SGMIIPLL_D2
+ };
+@@ -369,7 +369,7 @@ static const struct mtk_composite top_mu
+ 
+ 	/* CLK_CFG_1 */
+ 	MUX_GATE(CLK_TOP_PWM_SEL, pwm_parents, 0x50, 0, 2, 7),
+-	MUX_GATE(CLK_TOP_F10M_REF_SEL, f10m_ref_parents, 0x50, 8, 1, 15),
++	MUX_GATE(CLK_TOP_F10M_REF_SEL, irrx_parents, 0x50, 8, 1, 15),
+ 	MUX_GATE(CLK_TOP_NFI_INFRA_SEL, nfi_infra_parents, 0x50, 16, 4, 23),
+ 	MUX_GATE(CLK_TOP_FLASH_SEL, flash_parents, 0x50, 24, 3, 31),
+ 
+@@ -412,7 +412,7 @@ static const struct mtk_composite top_mu
+ 
+ 	/* CLK_CFG_8 */
+ 	MUX_GATE(CLK_TOP_CRYPTO_SEL, crypto_parents, 0xC0, 0, 3, 7),
+-	MUX_GATE(CLK_TOP_SGMII_REF_1_SEL, f10m_ref_parents, 0xC0, 8, 1, 15),
++	MUX_GATE(CLK_TOP_SGMII_REF_1_SEL, sgmii_ref_1_parents, 0xC0, 8, 1, 15),
+ 	MUX_GATE(CLK_TOP_10M_SEL, gpt10m_parents, 0xC0, 16, 1, 23),
+ };
+ 

package/boot/uboot-mediatek/patches/060-02-arm-dts-mt7629-fix-sgmii-clock-selection-for-etherne.patch

@@ -0,0 +1,28 @@
+From ba365c3d23411620d86b5baf621c8f5a4000ab33 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Tue, 17 Dec 2024 16:39:20 +0800
+Subject: [PATCH 02/10] arm: dts: mt7629: fix sgmii clock selection for
+ ethernet
+
+Setup correct parent of clock CLK_TOP_SGMII_REF_1_SEL to allow
+sgmiisys1 work correctly.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ arch/arm/dts/mt7629.dtsi | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/dts/mt7629.dtsi
++++ b/arch/arm/dts/mt7629.dtsi
+@@ -314,8 +314,10 @@
+ 				"sgmii2_cdr_ref", "sgmii2_cdr_fb",
+ 				"sgmii_ck", "eth2pll";
+ 		assigned-clocks = <&topckgen CLK_TOP_ETH_SEL>,
+-				  <&topckgen CLK_TOP_F10M_REF_SEL>;
++				  <&topckgen CLK_TOP_F10M_REF_SEL>,
++				  <&topckgen CLK_TOP_SGMII_REF_1_SEL>;
+ 		assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL1_D2>,
++					 <&topckgen CLK_TOP_SYSPLL4_D16>,
+ 					 <&topckgen CLK_TOP_SGMIIPLL_D2>;
+ 		power-domains = <&scpsys MT7629_POWER_DOMAIN_ETHSYS>;
+ 		resets = <&ethsys ETHSYS_FE_RST>;

package/boot/uboot-mediatek/patches/060-03-net-mediatek-use-correct-register-field-for-SGMII-sp.patch

@@ -0,0 +1,64 @@
+From 0d4d8e6f47ef22ea6b3041b4c0cb27b4ed4bf188 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Tue, 17 Dec 2024 16:39:23 +0800
+Subject: [PATCH 03/10] net: mediatek: use correct register field for SGMII
+ speed selection
+
+The register field for SGMII speed selection is a 2-bit field with
+value 0 for 1Gbps and 1 for 2.5Gbps (2/3 are reserved).
+So it's necessary to set both bits instead of just setting/clearing
+only the lower bit.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/net/mtk_eth.c | 12 ++++++------
+ drivers/net/mtk_eth.h |  3 ++-
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+--- a/drivers/net/mtk_eth.c
++++ b/drivers/net/mtk_eth.c
+@@ -835,8 +835,8 @@ static int mt7531_port_sgmii_init(struct
+ 	}
+ 
+ 	/* Set SGMII GEN2 speed(2.5G) */
+-	mt753x_reg_rmw(priv, MT7531_PHYA_CTRL_SIGNAL3(port),
+-		       SGMSYS_SPEED_2500, SGMSYS_SPEED_2500);
++	mt753x_reg_rmw(priv, MT7531_PHYA_CTRL_SIGNAL3(port), SGMSYS_SPEED_MASK,
++		       FIELD_PREP(SGMSYS_SPEED_MASK, SGMSYS_SPEED_2500));
+ 
+ 	/* Disable SGMII AN */
+ 	mt753x_reg_rmw(priv, MT7531_PCS_CONTROL_1(port),
+@@ -1281,8 +1281,7 @@ static int mtk_phy_probe(struct udevice
+ static void mtk_sgmii_an_init(struct mtk_eth_priv *priv)
+ {
+ 	/* Set SGMII GEN1 speed(1G) */
+-	clrsetbits_le32(priv->sgmii_base + priv->soc->ana_rgc3,
+-			SGMSYS_SPEED_2500, 0);
++	clrbits_le32(priv->sgmii_base + priv->soc->ana_rgc3, SGMSYS_SPEED_MASK);
+ 
+ 	/* Enable SGMII AN */
+ 	setbits_le32(priv->sgmii_base + SGMSYS_PCS_CONTROL_1,
+@@ -1305,8 +1304,9 @@ static void mtk_sgmii_an_init(struct mtk
+ static void mtk_sgmii_force_init(struct mtk_eth_priv *priv)
+ {
+ 	/* Set SGMII GEN2 speed(2.5G) */
+-	setbits_le32(priv->sgmii_base + priv->soc->ana_rgc3,
+-		     SGMSYS_SPEED_2500);
++	clrsetbits_le32(priv->sgmii_base + priv->soc->ana_rgc3,
++			SGMSYS_SPEED_MASK,
++			FIELD_PREP(SGMSYS_SPEED_MASK, SGMSYS_SPEED_2500));
+ 
+ 	/* Disable SGMII AN */
+ 	clrsetbits_le32(priv->sgmii_base + SGMSYS_PCS_CONTROL_1,
+--- a/drivers/net/mtk_eth.h
++++ b/drivers/net/mtk_eth.h
+@@ -108,7 +108,8 @@ enum mkt_eth_capabilities {
+ 
+ #define SGMSYS_GEN2_SPEED		0x2028
+ #define SGMSYS_GEN2_SPEED_V2		0x128
+-#define SGMSYS_SPEED_2500		BIT(2)
++#define SGMSYS_SPEED_MASK		GENMASK(3, 2)
++#define SGMSYS_SPEED_2500		1
+ 
+ /* USXGMII subsystem config registers */
+ /* Register to control USXGMII XFI PLL digital */

package/boot/uboot-mediatek/patches/060-04-net-mediatek-correct-register-name-of-ethsys-syscfg1.patch

@@ -0,0 +1,78 @@
+From 7562da9454c1a6eff3db3b41c183e03039e855e6 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Tue, 17 Dec 2024 16:39:27 +0800
+Subject: [PATCH 04/10] net: mediatek: correct register name of ethsys syscfg1
+
+The SYSCFG0 should be SYSCFG1 according to the programming guide.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/net/mtk_eth.c | 14 +++++++-------
+ drivers/net/mtk_eth.h | 12 ++++++------
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+--- a/drivers/net/mtk_eth.c
++++ b/drivers/net/mtk_eth.c
+@@ -1450,8 +1450,8 @@ static void mtk_mac_init(struct mtk_eth_
+ 		}
+ 
+ 		ge_mode = GE_MODE_RGMII;
+-		mtk_ethsys_rmw(priv, ETHSYS_SYSCFG0_REG, SYSCFG0_SGMII_SEL_M,
+-			       SYSCFG0_SGMII_SEL(priv->gmac_id));
++		mtk_ethsys_rmw(priv, ETHSYS_SYSCFG1_REG, SYSCFG1_SGMII_SEL_M,
++			       SYSCFG1_SGMII_SEL(priv->gmac_id));
+ 		if (priv->phy_interface == PHY_INTERFACE_MODE_SGMII)
+ 			mtk_sgmii_an_init(priv);
+ 		else
+@@ -1469,9 +1469,9 @@ static void mtk_mac_init(struct mtk_eth_
+ 	}
+ 
+ 	/* set the gmac to the right mode */
+-	mtk_ethsys_rmw(priv, ETHSYS_SYSCFG0_REG,
+-		       SYSCFG0_GE_MODE_M << SYSCFG0_GE_MODE_S(priv->gmac_id),
+-		       ge_mode << SYSCFG0_GE_MODE_S(priv->gmac_id));
++	mtk_ethsys_rmw(priv, ETHSYS_SYSCFG1_REG,
++		       SYSCFG1_GE_MODE_M << SYSCFG1_GE_MODE_S(priv->gmac_id),
++		       ge_mode << SYSCFG1_GE_MODE_S(priv->gmac_id));
+ 
+ 	if (priv->force_mode) {
+ 		mcr = (IPG_96BIT_WITH_SHORT_IPG << IPG_CFG_S) |
+@@ -1527,8 +1527,8 @@ static void mtk_xmac_init(struct mtk_eth
+ 	}
+ 
+ 	/* Set GMAC to the correct mode */
+-	mtk_ethsys_rmw(priv, ETHSYS_SYSCFG0_REG,
+-		       SYSCFG0_GE_MODE_M << SYSCFG0_GE_MODE_S(priv->gmac_id),
++	mtk_ethsys_rmw(priv, ETHSYS_SYSCFG1_REG,
++		       SYSCFG1_GE_MODE_M << SYSCFG1_GE_MODE_S(priv->gmac_id),
+ 		       0);
+ 
+ 	if (priv->phy_interface == PHY_INTERFACE_MODE_USXGMII &&
+--- a/drivers/net/mtk_eth.h
++++ b/drivers/net/mtk_eth.h
+@@ -65,11 +65,11 @@ enum mkt_eth_capabilities {
+ 
+ /* Ethernet subsystem registers */
+ 
+-#define ETHSYS_SYSCFG0_REG		0x14
+-#define SYSCFG0_GE_MODE_S(n)		(12 + ((n) * 2))
+-#define SYSCFG0_GE_MODE_M		0x3
+-#define SYSCFG0_SGMII_SEL_M		(0x3 << 8)
+-#define SYSCFG0_SGMII_SEL(gmac)		((!(gmac)) ? BIT(9) : BIT(8))
++#define ETHSYS_SYSCFG1_REG		0x14
++#define SYSCFG1_GE_MODE_S(n)		(12 + ((n) * 2))
++#define SYSCFG1_GE_MODE_M		0x3
++#define SYSCFG1_SGMII_SEL_M		(0x3 << 8)
++#define SYSCFG1_SGMII_SEL(gmac)		((!(gmac)) ? BIT(9) : BIT(8))
+ 
+ #define ETHSYS_CLKCFG0_REG		0x2c
+ #define ETHSYS_TRGMII_CLK_SEL362_5	BIT(11)
+@@ -84,7 +84,7 @@ enum mkt_eth_capabilities {
+ #define QPHY_SEL_MASK			0x3
+ #define SGMII_QPHY_SEL			0x2
+ 
+-/* SYSCFG0_GE_MODE: GE Modes */
++/* SYSCFG1_GE_MODE: GE Modes */
+ #define GE_MODE_RGMII			0
+ #define GE_MODE_MII			1
+ #define GE_MODE_MII_PHY			2

package/boot/uboot-mediatek/patches/060-05-net-mediatek-fix-sgmii-selection-for-mt7622.patch

@@ -0,0 +1,90 @@
+From 82f05bc48821f3709f22f3d1f6e45290547f74be Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Tue, 17 Dec 2024 16:39:41 +0800
+Subject: [PATCH 05/10] net: mediatek: fix sgmii selection for mt7622
+
+Unlike other platforms, mt7622 has only one SGMII and it can be
+attached to either gmac1 or gmac2. So the register field of the
+sgmii selection differs from other platforms as newer platforms can
+control each sgmii individually.
+
+This patch adds a new capability for mt7622 to handle this case.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/net/mtk_eth.c | 10 ++++++++--
+ drivers/net/mtk_eth.h |  8 ++++++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/mtk_eth.c
++++ b/drivers/net/mtk_eth.c
+@@ -1434,7 +1434,7 @@ static void mtk_usxgmii_an_init(struct m
+ 
+ static void mtk_mac_init(struct mtk_eth_priv *priv)
+ {
+-	int i, ge_mode = 0;
++	int i, sgmii_sel_mask = 0, ge_mode = 0;
+ 	u32 mcr;
+ 
+ 	switch (priv->phy_interface) {
+@@ -1450,8 +1450,13 @@ static void mtk_mac_init(struct mtk_eth_
+ 		}
+ 
+ 		ge_mode = GE_MODE_RGMII;
+-		mtk_ethsys_rmw(priv, ETHSYS_SYSCFG1_REG, SYSCFG1_SGMII_SEL_M,
++
++		if (MTK_HAS_CAPS(priv->soc->caps, MTK_ETH_PATH_MT7622_SGMII))
++			sgmii_sel_mask = SYSCFG1_SGMII_SEL_M;
++
++		mtk_ethsys_rmw(priv, ETHSYS_SYSCFG1_REG, sgmii_sel_mask,
+ 			       SYSCFG1_SGMII_SEL(priv->gmac_id));
++
+ 		if (priv->phy_interface == PHY_INTERFACE_MODE_SGMII)
+ 			mtk_sgmii_an_init(priv);
+ 		else
+@@ -2112,6 +2117,7 @@ static const struct mtk_soc_data mt7623_
+ };
+ 
+ static const struct mtk_soc_data mt7622_data = {
++	.caps = MT7622_CAPS,
+ 	.ana_rgc3 = 0x2028,
+ 	.gdma_count = 2,
+ 	.pdma_base = PDMA_V1_BASE,
+--- a/drivers/net/mtk_eth.h
++++ b/drivers/net/mtk_eth.h
+@@ -23,6 +23,7 @@ enum mkt_eth_capabilities {
+ 	/* PATH BITS */
+ 	MTK_ETH_PATH_GMAC1_TRGMII_BIT,
+ 	MTK_ETH_PATH_GMAC2_SGMII_BIT,
++	MTK_ETH_PATH_MT7622_SGMII_BIT,
+ };
+ 
+ #define MTK_TRGMII			BIT(MTK_TRGMII_BIT)
+@@ -36,6 +37,7 @@ enum mkt_eth_capabilities {
+ #define MTK_ETH_PATH_GMAC1_TRGMII	BIT(MTK_ETH_PATH_GMAC1_TRGMII_BIT)
+ 
+ #define MTK_ETH_PATH_GMAC2_SGMII	BIT(MTK_ETH_PATH_GMAC2_SGMII_BIT)
++#define MTK_ETH_PATH_MT7622_SGMII	BIT(MTK_ETH_PATH_MT7622_SGMII_BIT)
+ 
+ #define MTK_GMAC1_TRGMII	(MTK_ETH_PATH_GMAC1_TRGMII | MTK_TRGMII)
+ 
+@@ -45,6 +47,8 @@ enum mkt_eth_capabilities {
+ 
+ #define MT7621_CAPS  (MTK_GMAC1_TRGMII | MTK_TRGMII_MT7621_CLK)
+ 
++#define MT7622_CAPS  (MTK_ETH_PATH_MT7622_SGMII)
++
+ #define MT7623_CAPS  (MTK_GMAC1_TRGMII)
+ 
+ #define MT7981_CAPS  (MTK_GMAC2_U3_QPHY | MTK_NETSYS_V2)
+@@ -68,8 +72,8 @@ enum mkt_eth_capabilities {
+ #define ETHSYS_SYSCFG1_REG		0x14
+ #define SYSCFG1_GE_MODE_S(n)		(12 + ((n) * 2))
+ #define SYSCFG1_GE_MODE_M		0x3
+-#define SYSCFG1_SGMII_SEL_M		(0x3 << 8)
+-#define SYSCFG1_SGMII_SEL(gmac)		((!(gmac)) ? BIT(9) : BIT(8))
++#define SYSCFG1_SGMII_SEL_M		GENMASK(9, 8)
++#define SYSCFG1_SGMII_SEL(gmac)		BIT(9 - (gmac))
+ 
+ #define ETHSYS_CLKCFG0_REG		0x2c
+ #define ETHSYS_TRGMII_CLK_SEL362_5	BIT(11)

package/boot/uboot-mediatek/patches/060-06-net-mediatek-fix-gmac2-usability-for-mt7629.patch

@@ -0,0 +1,73 @@
+From d8d7e566545f836dd49611cafbf44eef56434e08 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Tue, 17 Dec 2024 16:39:46 +0800
+Subject: [PATCH 06/10] net: mediatek: fix gmac2 usability for mt7629
+
+MT7629 need extra setting for gmac2 to work. So additional
+capability is added for mt7629 to handle this case.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/net/mtk_eth.c | 6 ++++++
+ drivers/net/mtk_eth.h | 7 +++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/drivers/net/mtk_eth.c
++++ b/drivers/net/mtk_eth.c
+@@ -1437,6 +1437,11 @@ static void mtk_mac_init(struct mtk_eth_
+ 	int i, sgmii_sel_mask = 0, ge_mode = 0;
+ 	u32 mcr;
+ 
++	if (MTK_HAS_CAPS(priv->soc->caps, MTK_ETH_PATH_MT7629_GMAC2)) {
++		mtk_infra_rmw(priv, MT7629_INFRA_MISC2_REG,
++			      INFRA_MISC2_BONDING_OPTION, priv->gmac_id);
++	}
++
+ 	switch (priv->phy_interface) {
+ 	case PHY_INTERFACE_MODE_RGMII_RXID:
+ 	case PHY_INTERFACE_MODE_RGMII:
+@@ -2101,6 +2106,7 @@ static const struct mtk_soc_data mt7981_
+ };
+ 
+ static const struct mtk_soc_data mt7629_data = {
++	.caps = MT7629_CAPS,
+ 	.ana_rgc3 = 0x128,
+ 	.gdma_count = 2,
+ 	.pdma_base = PDMA_V1_BASE,
+--- a/drivers/net/mtk_eth.h
++++ b/drivers/net/mtk_eth.h
+@@ -24,6 +24,7 @@ enum mkt_eth_capabilities {
+ 	MTK_ETH_PATH_GMAC1_TRGMII_BIT,
+ 	MTK_ETH_PATH_GMAC2_SGMII_BIT,
+ 	MTK_ETH_PATH_MT7622_SGMII_BIT,
++	MTK_ETH_PATH_MT7629_GMAC2_BIT,
+ };
+ 
+ #define MTK_TRGMII			BIT(MTK_TRGMII_BIT)
+@@ -38,6 +39,7 @@ enum mkt_eth_capabilities {
+ 
+ #define MTK_ETH_PATH_GMAC2_SGMII	BIT(MTK_ETH_PATH_GMAC2_SGMII_BIT)
+ #define MTK_ETH_PATH_MT7622_SGMII	BIT(MTK_ETH_PATH_MT7622_SGMII_BIT)
++#define MTK_ETH_PATH_MT7629_GMAC2	BIT(MTK_ETH_PATH_MT7629_GMAC2_BIT)
+ 
+ #define MTK_GMAC1_TRGMII	(MTK_ETH_PATH_GMAC1_TRGMII | MTK_TRGMII)
+ 
+@@ -51,6 +53,8 @@ enum mkt_eth_capabilities {
+ 
+ #define MT7623_CAPS  (MTK_GMAC1_TRGMII)
+ 
++#define MT7629_CAPS  (MTK_ETH_PATH_MT7629_GMAC2 | MTK_INFRA)
++
+ #define MT7981_CAPS  (MTK_GMAC2_U3_QPHY | MTK_NETSYS_V2)
+ 
+ #define MT7986_CAPS  (MTK_NETSYS_V2)
+@@ -88,6 +92,9 @@ enum mkt_eth_capabilities {
+ #define QPHY_SEL_MASK			0x3
+ #define SGMII_QPHY_SEL			0x2
+ 
++#define MT7629_INFRA_MISC2_REG		0x70c
++#define INFRA_MISC2_BONDING_OPTION	GENMASK(15, 0)
++
+ /* SYSCFG1_GE_MODE: GE Modes */
+ #define GE_MODE_RGMII			0
+ #define GE_MODE_MII			1

package/boot/uboot-mediatek/patches/060-07-net-mediatek-add-support-for-10GBASE-R.patch

@@ -0,0 +1,147 @@
+From ad0c47109e4c9f6297aa247d8bbf7131438bc435 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Tue, 17 Dec 2024 16:39:50 +0800
+Subject: [PATCH 07/10] net: mediatek: add support for 10GBASE-R
+
+This patch adds support for 10GBASE-R interface mode
+
+Signed-off-by: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/net/mtk_eth.c | 83 +++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 81 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/mtk_eth.c
++++ b/drivers/net/mtk_eth.c
+@@ -1246,6 +1246,7 @@ static int mtk_phy_start(struct mtk_eth_
+ 
+ 	if (!priv->force_mode) {
+ 		if (priv->phy_interface == PHY_INTERFACE_MODE_USXGMII ||
++		    priv->phy_interface == PHY_INTERFACE_MODE_10GBASER ||
+ 		    priv->phy_interface == PHY_INTERFACE_MODE_XGMII)
+ 			mtk_xphy_link_adjust(priv);
+ 		else
+@@ -1425,6 +1426,71 @@ static void mtk_usxgmii_setup_phya_an_10
+ 	udelay(400);
+ }
+ 
++static void mtk_usxgmii_setup_phya_force_10000(struct mtk_eth_priv *priv)
++{
++	regmap_write(priv->usxgmii_regmap, 0x810, 0x000FFE6C);
++	regmap_write(priv->usxgmii_regmap, 0x818, 0x07B1EC7B);
++	regmap_write(priv->usxgmii_regmap, 0x80C, 0xB0000000);
++	ndelay(1020);
++	regmap_write(priv->usxgmii_regmap, 0x80C, 0x90000000);
++	ndelay(1020);
++
++	regmap_write(priv->xfi_pextp_regmap, 0x9024, 0x00C9071C);
++	regmap_write(priv->xfi_pextp_regmap, 0x2020, 0xAA8585AA);
++	regmap_write(priv->xfi_pextp_regmap, 0x2030, 0x0C020707);
++	regmap_write(priv->xfi_pextp_regmap, 0x2034, 0x0E050F0F);
++	regmap_write(priv->xfi_pextp_regmap, 0x2040, 0x00140032);
++	regmap_write(priv->xfi_pextp_regmap, 0x50F0, 0x00C014AA);
++	regmap_write(priv->xfi_pextp_regmap, 0x50E0, 0x3777C12B);
++	regmap_write(priv->xfi_pextp_regmap, 0x506C, 0x005F9CFF);
++	regmap_write(priv->xfi_pextp_regmap, 0x5070, 0x9D9DFAFA);
++	regmap_write(priv->xfi_pextp_regmap, 0x5074, 0x27273F3F);
++	regmap_write(priv->xfi_pextp_regmap, 0x5078, 0xA7883C68);
++	regmap_write(priv->xfi_pextp_regmap, 0x507C, 0x11661166);
++	regmap_write(priv->xfi_pextp_regmap, 0x5080, 0x0E000AAF);
++	regmap_write(priv->xfi_pextp_regmap, 0x5084, 0x08080D0D);
++	regmap_write(priv->xfi_pextp_regmap, 0x5088, 0x02030909);
++	regmap_write(priv->xfi_pextp_regmap, 0x50E4, 0x0C0C0000);
++	regmap_write(priv->xfi_pextp_regmap, 0x50E8, 0x04040000);
++	regmap_write(priv->xfi_pextp_regmap, 0x50EC, 0x0F0F0C06);
++	regmap_write(priv->xfi_pextp_regmap, 0x50A8, 0x506E8C8C);
++	regmap_write(priv->xfi_pextp_regmap, 0x6004, 0x18190000);
++	regmap_write(priv->xfi_pextp_regmap, 0x00F8, 0x01423342);
++	regmap_write(priv->xfi_pextp_regmap, 0x00F4, 0x80201F20);
++	regmap_write(priv->xfi_pextp_regmap, 0x0030, 0x00050C00);
++	regmap_write(priv->xfi_pextp_regmap, 0x0070, 0x02002800);
++	ndelay(1020);
++	regmap_write(priv->xfi_pextp_regmap, 0x30B0, 0x00000020);
++	regmap_write(priv->xfi_pextp_regmap, 0x3028, 0x00008A01);
++	regmap_write(priv->xfi_pextp_regmap, 0x302C, 0x0000A884);
++	regmap_write(priv->xfi_pextp_regmap, 0x3024, 0x00083002);
++	regmap_write(priv->xfi_pextp_regmap, 0x3010, 0x00022220);
++	regmap_write(priv->xfi_pextp_regmap, 0x5064, 0x0F020A01);
++	regmap_write(priv->xfi_pextp_regmap, 0x50B4, 0x06100600);
++	regmap_write(priv->xfi_pextp_regmap, 0x3048, 0x47684100);
++	regmap_write(priv->xfi_pextp_regmap, 0x3050, 0x00000000);
++	regmap_write(priv->xfi_pextp_regmap, 0x3054, 0x00000000);
++	regmap_write(priv->xfi_pextp_regmap, 0x306C, 0x00000F00);
++	if (priv->gmac_id == 2)
++		regmap_write(priv->xfi_pextp_regmap, 0xA008, 0x0007B400);
++	regmap_write(priv->xfi_pextp_regmap, 0xA060, 0x00040000);
++	regmap_write(priv->xfi_pextp_regmap, 0x90D0, 0x00000001);
++	regmap_write(priv->xfi_pextp_regmap, 0x0070, 0x0200E800);
++	udelay(150);
++	regmap_write(priv->xfi_pextp_regmap, 0x0070, 0x0200C111);
++	ndelay(1020);
++	regmap_write(priv->xfi_pextp_regmap, 0x0070, 0x0200C101);
++	udelay(15);
++	regmap_write(priv->xfi_pextp_regmap, 0x0070, 0x0202C111);
++	ndelay(1020);
++	regmap_write(priv->xfi_pextp_regmap, 0x0070, 0x0202C101);
++	udelay(100);
++	regmap_write(priv->xfi_pextp_regmap, 0x30B0, 0x00000030);
++	regmap_write(priv->xfi_pextp_regmap, 0x00F4, 0x80201F00);
++	regmap_write(priv->xfi_pextp_regmap, 0x3040, 0x30000000);
++	udelay(400);
++}
++
+ static void mtk_usxgmii_an_init(struct mtk_eth_priv *priv)
+ {
+ 	mtk_xfi_pll_enable(priv);
+@@ -1432,6 +1498,13 @@ static void mtk_usxgmii_an_init(struct m
+ 	mtk_usxgmii_setup_phya_an_10000(priv);
+ }
+ 
++static void mtk_10gbaser_init(struct mtk_eth_priv *priv)
++{
++	mtk_xfi_pll_enable(priv);
++	mtk_usxgmii_reset(priv);
++	mtk_usxgmii_setup_phya_force_10000(priv);
++}
++
+ static void mtk_mac_init(struct mtk_eth_priv *priv)
+ {
+ 	int i, sgmii_sel_mask = 0, ge_mode = 0;
+@@ -1532,6 +1605,9 @@ static void mtk_xmac_init(struct mtk_eth
+ 	case PHY_INTERFACE_MODE_USXGMII:
+ 		mtk_usxgmii_an_init(priv);
+ 		break;
++	case PHY_INTERFACE_MODE_10GBASER:
++		mtk_10gbaser_init(priv);
++		break;
+ 	default:
+ 		break;
+ 	}
+@@ -1541,7 +1617,8 @@ static void mtk_xmac_init(struct mtk_eth
+ 		       SYSCFG1_GE_MODE_M << SYSCFG1_GE_MODE_S(priv->gmac_id),
+ 		       0);
+ 
+-	if (priv->phy_interface == PHY_INTERFACE_MODE_USXGMII &&
++	if ((priv->phy_interface == PHY_INTERFACE_MODE_USXGMII ||
++	     priv->phy_interface == PHY_INTERFACE_MODE_10GBASER) &&
+ 	    priv->gmac_id == 1) {
+ 		mtk_infra_rmw(priv, TOPMISC_NETSYS_PCS_MUX,
+ 			      NETSYS_PCS_MUX_MASK, MUX_G2_USXGMII_SEL);
+@@ -1843,6 +1920,7 @@ static int mtk_eth_probe(struct udevice
+ 
+ 	/* Set MAC mode */
+ 	if (priv->phy_interface == PHY_INTERFACE_MODE_USXGMII ||
++	    priv->phy_interface == PHY_INTERFACE_MODE_10GBASER ||
+ 	    priv->phy_interface == PHY_INTERFACE_MODE_XGMII)
+ 		mtk_xmac_init(priv);
+ 	else
+@@ -1977,7 +2055,8 @@ static int mtk_eth_of_to_plat(struct ude
+ 		/* Upstream linux use mediatek,pnswap instead of pn_swap */
+ 		priv->pn_swap = ofnode_read_bool(args.node, "pn_swap") ||
+ 				ofnode_read_bool(args.node, "mediatek,pnswap");
+-	} else if (priv->phy_interface == PHY_INTERFACE_MODE_USXGMII) {
++	} else if (priv->phy_interface == PHY_INTERFACE_MODE_USXGMII ||
++		   priv->phy_interface == PHY_INTERFACE_MODE_10GBASER) {
+ 		/* get corresponding usxgmii phandle */
+ 		ret = dev_read_phandle_with_args(dev, "mediatek,usxgmiisys",
+ 						 NULL, 0, 0, &args);

package/boot/uboot-mediatek/patches/060-08-net-mediatek-make-sgmii-usxgmii-optional.patch

@@ -0,0 +1,144 @@
+From 5ac929fd1ab1d0dc77b9167952aea7cafdb8619f Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Tue, 17 Dec 2024 16:39:55 +0800
+Subject: [PATCH 08/10] net: mediatek: make sgmii/usxgmii optional
+
+Not all platforms supports sgmii and/or usxgmii. So we add Kconfig
+options for these features and enable them only for supported
+platforms.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/net/Kconfig   | 12 ++++++++++++
+ drivers/net/mtk_eth.c | 39 +++++++++++++++++++++++++++++----------
+ 2 files changed, 41 insertions(+), 10 deletions(-)
+
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -975,6 +975,18 @@ config MEDIATEK_ETH
+ 	  This Driver support MediaTek Ethernet GMAC
+ 	  Say Y to enable support for the MediaTek Ethernet GMAC.
+ 
++if MEDIATEK_ETH
++
++config MTK_ETH_SGMII
++	bool
++	default y if ARCH_MEDIATEK && !TARGET_MT7623
++
++config MTK_ETH_XGMII
++	bool
++	default y if TARGET_MT7987 || TARGET_MT7988
++
++endif # MEDIATEK_ETH
++
+ config HIFEMAC_ETH
+ 	bool "HiSilicon Fast Ethernet Controller"
+ 	select DM_CLK
+--- a/drivers/net/mtk_eth.c
++++ b/drivers/net/mtk_eth.c
+@@ -1505,7 +1505,7 @@ static void mtk_10gbaser_init(struct mtk
+ 	mtk_usxgmii_setup_phya_force_10000(priv);
+ }
+ 
+-static void mtk_mac_init(struct mtk_eth_priv *priv)
++static int mtk_mac_init(struct mtk_eth_priv *priv)
+ {
+ 	int i, sgmii_sel_mask = 0, ge_mode = 0;
+ 	u32 mcr;
+@@ -1522,13 +1522,16 @@ static void mtk_mac_init(struct mtk_eth_
+ 		break;
+ 	case PHY_INTERFACE_MODE_SGMII:
+ 	case PHY_INTERFACE_MODE_2500BASEX:
++		if (!IS_ENABLED(CONFIG_MTK_ETH_SGMII)) {
++			printf("Error: SGMII is not supported on this platform\n");
++			return -ENOTSUPP;
++		}
++
+ 		if (MTK_HAS_CAPS(priv->soc->caps, MTK_GMAC2_U3_QPHY)) {
+ 			mtk_infra_rmw(priv, USB_PHY_SWITCH_REG, QPHY_SEL_MASK,
+ 				      SGMII_QPHY_SEL);
+ 		}
+ 
+-		ge_mode = GE_MODE_RGMII;
+-
+ 		if (MTK_HAS_CAPS(priv->soc->caps, MTK_ETH_PATH_MT7622_SGMII))
+ 			sgmii_sel_mask = SYSCFG1_SGMII_SEL_M;
+ 
+@@ -1539,6 +1542,8 @@ static void mtk_mac_init(struct mtk_eth_
+ 			mtk_sgmii_an_init(priv);
+ 		else
+ 			mtk_sgmii_force_init(priv);
++
++		ge_mode = GE_MODE_RGMII;
+ 		break;
+ 	case PHY_INTERFACE_MODE_MII:
+ 	case PHY_INTERFACE_MODE_GMII:
+@@ -1595,12 +1600,19 @@ static void mtk_mac_init(struct mtk_eth_
+ 			     RX_RST | RXC_DQSISEL);
+ 		mtk_gmac_rmw(priv, GMAC_TRGMII_RCK_CTRL, RX_RST, 0);
+ 	}
++
++	return 0;
+ }
+ 
+-static void mtk_xmac_init(struct mtk_eth_priv *priv)
++static int mtk_xmac_init(struct mtk_eth_priv *priv)
+ {
+ 	u32 force_link = 0;
+ 
++	if (!IS_ENABLED(CONFIG_MTK_ETH_XGMII)) {
++		printf("Error: 10Gb interface is not supported on this platform\n");
++		return -ENOTSUPP;
++	}
++
+ 	switch (priv->phy_interface) {
+ 	case PHY_INTERFACE_MODE_USXGMII:
+ 		mtk_usxgmii_an_init(priv);
+@@ -1633,6 +1645,8 @@ static void mtk_xmac_init(struct mtk_eth
+ 
+ 	/* Force GMAC link down */
+ 	mtk_gmac_write(priv, GMAC_PORT_MCR(priv->gmac_id), FORCE_MODE);
++
++	return 0;
+ }
+ 
+ static void mtk_eth_fifo_init(struct mtk_eth_priv *priv)
+@@ -1922,9 +1936,12 @@ static int mtk_eth_probe(struct udevice
+ 	if (priv->phy_interface == PHY_INTERFACE_MODE_USXGMII ||
+ 	    priv->phy_interface == PHY_INTERFACE_MODE_10GBASER ||
+ 	    priv->phy_interface == PHY_INTERFACE_MODE_XGMII)
+-		mtk_xmac_init(priv);
++		ret = mtk_xmac_init(priv);
+ 	else
+-		mtk_mac_init(priv);
++		ret = mtk_mac_init(priv);
++
++	if (ret)
++		return ret;
+ 
+ 	/* Probe phy if switch is not specified */
+ 	if (priv->sw == SW_NONE)
+@@ -2032,8 +2049,9 @@ static int mtk_eth_of_to_plat(struct ude
+ 		}
+ 	}
+ 
+-	if (priv->phy_interface == PHY_INTERFACE_MODE_SGMII ||
+-	    priv->phy_interface == PHY_INTERFACE_MODE_2500BASEX) {
++	if ((priv->phy_interface == PHY_INTERFACE_MODE_SGMII ||
++	     priv->phy_interface == PHY_INTERFACE_MODE_2500BASEX) &&
++	    IS_ENABLED(CONFIG_MTK_ETH_SGMII)) {
+ 		/* get corresponding sgmii phandle */
+ 		ret = dev_read_phandle_with_args(dev, "mediatek,sgmiisys",
+ 						 NULL, 0, 0, &args);
+@@ -2055,8 +2073,9 @@ static int mtk_eth_of_to_plat(struct ude
+ 		/* Upstream linux use mediatek,pnswap instead of pn_swap */
+ 		priv->pn_swap = ofnode_read_bool(args.node, "pn_swap") ||
+ 				ofnode_read_bool(args.node, "mediatek,pnswap");
+-	} else if (priv->phy_interface == PHY_INTERFACE_MODE_USXGMII ||
+-		   priv->phy_interface == PHY_INTERFACE_MODE_10GBASER) {
++	} else if ((priv->phy_interface == PHY_INTERFACE_MODE_USXGMII ||
++		    priv->phy_interface == PHY_INTERFACE_MODE_10GBASER) &&
++		   IS_ENABLED(CONFIG_MTK_ETH_XGMII)) {
+ 		/* get corresponding usxgmii phandle */
+ 		ret = dev_read_phandle_with_args(dev, "mediatek,usxgmiisys",
+ 						 NULL, 0, 0, &args);

package/boot/uboot-mediatek/patches/060-09-net-mediatek-don-t-enable-GDMA-cpu-bridge-unconditio.patch

@@ -0,0 +1,36 @@
+From b9dfb5636bc5eb9b783b88b8388dc7d1f41d6498 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Tue, 17 Dec 2024 16:39:59 +0800
+Subject: [PATCH 09/10] net: mediatek: don't enable GDMA cpu bridge
+ unconditionally for NETSYSv3
+
+Enable GDMA cpu bridge only when 10Gb interface is enabled for GMAC other
+than GMAC0, or when MT7988 internal switch is used.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/net/mtk_eth.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/mtk_eth.c
++++ b/drivers/net/mtk_eth.c
+@@ -1762,10 +1762,16 @@ static int mtk_eth_start(struct udevice
+ 		if (priv->sw == SW_MT7988 && priv->gmac_id == 0) {
+ 			mtk_gdma_write(priv, priv->gmac_id, GDMA_IG_CTRL_REG,
+ 				       GDMA_BRIDGE_TO_CPU);
+-		}
+ 
+-		mtk_gdma_write(priv, priv->gmac_id, GDMA_EG_CTRL_REG,
+-			       GDMA_CPU_BRIDGE_EN);
++			mtk_gdma_write(priv, priv->gmac_id, GDMA_EG_CTRL_REG,
++				       GDMA_CPU_BRIDGE_EN);
++		} else if ((priv->phy_interface == PHY_INTERFACE_MODE_USXGMII ||
++			    priv->phy_interface == PHY_INTERFACE_MODE_10GBASER ||
++			    priv->phy_interface == PHY_INTERFACE_MODE_XGMII) &&
++			   priv->gmac_id != 0) {
++			mtk_gdma_write(priv, priv->gmac_id, GDMA_EG_CTRL_REG,
++				       GDMA_CPU_BRIDGE_EN);
++		}
+ 	}
+ 
+ 	udelay(500);

package/boot/uboot-mediatek/patches/060-10-net-mediatek-fix-usability-with-wget-command.patch

@@ -0,0 +1,37 @@
+From c949686e558e00cbb8c38f7c060701006d70cea8 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Tue, 17 Dec 2024 16:40:03 +0800
+Subject: [PATCH 10/10] net: mediatek: fix usability with wget command
+
+The wget command currently cannot work correctly with mtk_eth driver.
+This patch fixed this by increase DMA ring size and invalidate ring data
+after use.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/net/mtk_eth.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/mtk_eth.c
++++ b/drivers/net/mtk_eth.c
+@@ -29,8 +29,8 @@
+ 
+ #include "mtk_eth.h"
+ 
+-#define NUM_TX_DESC		24
+-#define NUM_RX_DESC		24
++#define NUM_TX_DESC		32
++#define NUM_RX_DESC		32
+ #define TX_TOTAL_BUF_SIZE	(NUM_TX_DESC * PKTSIZE_ALIGN)
+ #define RX_TOTAL_BUF_SIZE	(NUM_RX_DESC * PKTSIZE_ALIGN)
+ #define TOTAL_PKT_BUF_SIZE	(TX_TOTAL_BUF_SIZE + RX_TOTAL_BUF_SIZE)
+@@ -1897,6 +1897,9 @@ static int mtk_eth_free_pkt(struct udevi
+ 
+ 	rxd = priv->rx_ring_noc + idx * priv->soc->rxd_size;
+ 
++	invalidate_dcache_range((ulong)rxd->rxd1,
++				(ulong)rxd->rxd1 + PKTSIZE_ALIGN);
++
+ 	if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2) ||
+ 	    MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V3))
+ 		rxd->rxd2 = PDMA_V2_RXD2_PLEN0_SET(PKTSIZE_ALIGN);

package/boot/uboot-mediatek/patches/061-02-net-mediatek-add-support-for-MediaTek-MT7987-SoC.patch

@@ -0,0 +1,63 @@
+From fe106f2093733b8bd61946372945dfea552b4755 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 10 Jan 2025 16:41:20 +0800
+Subject: [PATCH 2/3] net: mediatek: add support for MediaTek MT7987 SoC
+
+This patch adds support for MediaTek MT7987.
+
+MT7987 features MediaTek NETSYS v3, similar to MT7988, features three GMACs
+which support 2.5Gb HSGMII. One 2.5Gb PHY is also embedded an can be
+connected to a dedicated GMAC.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/net/mtk_eth/Kconfig   |  4 ++--
+ drivers/net/mtk_eth/mtk_eth.c | 10 ++++++++++
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/mtk_eth/Kconfig
++++ b/drivers/net/mtk_eth/Kconfig
+@@ -16,7 +16,7 @@ config MTK_ETH_SGMII
+ 
+ config MTK_ETH_XGMII
+ 	bool
+-	default y if TARGET_MT7988
++	default y if TARGET_MT7987 || TARGET_MT7988
+ 
+ config MTK_ETH_SWITCH_MT7530
+ 	bool "Support for MediaTek MT7530 ethernet switch"
+@@ -25,7 +25,7 @@ config MTK_ETH_SWITCH_MT7530
+ config MTK_ETH_SWITCH_MT7531
+ 	bool "Support for MediaTek MT7531 ethernet switch"
+ 	default y if TARGET_MT7622 || TARGET_MT7629 || TARGET_MT7981 || \
+-		     TARGET_MT7986
++		     TARGET_MT7986 || TARGET_MT7987
+ 
+ config MTK_ETH_SWITCH_MT7988
+ 	bool "Support for MediaTek MT7988 built-in ethernet switch"
+--- a/drivers/net/mtk_eth/mtk_eth.c
++++ b/drivers/net/mtk_eth/mtk_eth.c
+@@ -1477,6 +1477,15 @@ static const struct mtk_soc_data mt7988_
+ 	.rxd_size = sizeof(struct mtk_rx_dma_v2),
+ };
+ 
++static const struct mtk_soc_data mt7987_data = {
++	.caps = MT7987_CAPS,
++	.ana_rgc3 = 0x128,
++	.gdma_count = 3,
++	.pdma_base = PDMA_V3_BASE,
++	.txd_size = sizeof(struct mtk_tx_dma_v2),
++	.rxd_size = sizeof(struct mtk_rx_dma_v2),
++};
++
+ static const struct mtk_soc_data mt7986_data = {
+ 	.caps = MT7986_CAPS,
+ 	.ana_rgc3 = 0x128,
+@@ -1531,6 +1540,7 @@ static const struct mtk_soc_data mt7621_
+ 
+ static const struct udevice_id mtk_eth_ids[] = {
+ 	{ .compatible = "mediatek,mt7988-eth", .data = (ulong)&mt7988_data },
++	{ .compatible = "mediatek,mt7987-eth", .data = (ulong)&mt7987_data },
+ 	{ .compatible = "mediatek,mt7986-eth", .data = (ulong)&mt7986_data },
+ 	{ .compatible = "mediatek,mt7981-eth", .data = (ulong)&mt7981_data },
+ 	{ .compatible = "mediatek,mt7629-eth", .data = (ulong)&mt7629_data },

package/boot/uboot-mediatek/patches/070-01-board-mediatek-mt7622-remove-board_late_init.patch

@@ -0,0 +1,26 @@
+From 92090b92fab207250d5b8d5a4a36aa34f5a91f19 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:16:33 +0800
+Subject: [PATCH 01/15] board: mediatek: mt7622: remove board_late_init
+
+The function board_late_init defined for mt7622 is useless now. Just
+remove it.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ board/mediatek/mt7622/mt7622_rfb.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+--- a/board/mediatek/mt7622/mt7622_rfb.c
++++ b/board/mediatek/mt7622/mt7622_rfb.c
+@@ -15,10 +15,3 @@ int board_init(void)
+ {
+ 	return 0;
+ }
+-
+-int board_late_init(void)
+-{
+-	gd->env_valid = 1; //to load environment variable from persistent store
+-	env_relocate();
+-	return 0;
+-}

package/boot/uboot-mediatek/patches/070-02-clk-mediatek-fix-uninitialized-fields-issue-in-INFRA.patch

@@ -0,0 +1,48 @@
+From b033dfb21df8ae876ec69d84bc8c5fafd7aa8ced Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:16:38 +0800
+Subject: [PATCH 02/15] clk: mediatek: fix uninitialized fields issue in
+ INFRA_MUX struct
+
+This patch adds missing initialization of fields in INFRA_MUX struct
+which caused uart broken after any other infra mux being enabled by
+'clk_prepare_enable'
+
+Signed-off-by: Sam Shih <sam.shih@mediatek.com>
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/clk/mediatek/clk-mt7981.c | 1 +
+ drivers/clk/mediatek/clk-mt7986.c | 1 +
+ drivers/clk/mediatek/clk-mt7988.c | 1 +
+ 3 files changed, 3 insertions(+)
+
+--- a/drivers/clk/mediatek/clk-mt7981.c
++++ b/drivers/clk/mediatek/clk-mt7981.c
+@@ -359,6 +359,7 @@ static const struct mtk_parent infra_pci
+ 		.id = _id, .mux_reg = (_reg) + 0x8,                            \
+ 		.mux_set_reg = (_reg) + 0x0, .mux_clr_reg = (_reg) + 0x4,      \
+ 		.mux_shift = _shift, .mux_mask = BIT(_width) - 1,              \
++		.gate_shift = -1, .upd_shift = -1,			       \
+ 		.parent_flags = _parents, .num_parents = ARRAY_SIZE(_parents), \
+ 		.flags = CLK_MUX_SETCLR_UPD | CLK_PARENT_MIXED,                \
+ 	}
+--- a/drivers/clk/mediatek/clk-mt7986.c
++++ b/drivers/clk/mediatek/clk-mt7986.c
+@@ -366,6 +366,7 @@ static const struct mtk_parent infra_pci
+ 		.id = _id, .mux_reg = (_reg) + 0x8,                            \
+ 		.mux_set_reg = (_reg) + 0x0, .mux_clr_reg = (_reg) + 0x4,      \
+ 		.mux_shift = _shift, .mux_mask = BIT(_width) - 1,              \
++		.gate_shift = -1, .upd_shift = -1,			       \
+ 		.parent_flags = _parents, .num_parents = ARRAY_SIZE(_parents), \
+ 		.flags = CLK_MUX_SETCLR_UPD | CLK_PARENT_MIXED,                \
+ 	}
+--- a/drivers/clk/mediatek/clk-mt7988.c
++++ b/drivers/clk/mediatek/clk-mt7988.c
+@@ -485,6 +485,7 @@ static const int infra_pcie_gfmux_tl_ck_
+ 		.id = _id, .mux_reg = _reg + 0x8, .mux_set_reg = _reg + 0x0,   \
+ 		.mux_clr_reg = _reg + 0x4, .mux_shift = _shift,                \
+ 		.mux_mask = BIT(_width) - 1, .parent = _parents,               \
++		.gate_shift = -1, .upd_shift = -1,			       \
+ 		.num_parents = ARRAY_SIZE(_parents),                           \
+ 		.flags = CLK_MUX_SETCLR_UPD | CLK_PARENT_TOPCKGEN,             \
+ 	}

package/boot/uboot-mediatek/patches/070-03-configs-mt7629-move-image-load-address-to-0x42000000.patch

@@ -0,0 +1,25 @@
+From 7958b41b8c6a15c3c993affd2091f8c921b6a8a1 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:17:38 +0800
+Subject: [PATCH 03/15] configs: mt7629: move image load address to 0x42000000
+
+Update the image load address to ensure it matches the mt7629 NOR
+controller's DMA alignment requirements.
+
+Signed-off-by: Sam Shih <sam.shih@mediatek.com>
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ configs/mt7629_rfb_defconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configs/mt7629_rfb_defconfig
++++ b/configs/mt7629_rfb_defconfig
+@@ -18,7 +18,7 @@ CONFIG_SPL_STACK=0x106000
+ CONFIG_SPL_TEXT_BASE=0x201000
+ CONFIG_SPL_STACK_R=y
+ CONFIG_SYS_BOOTM_LEN=0x4000000
+-CONFIG_SYS_LOAD_ADDR=0x42007f1c
++CONFIG_SYS_LOAD_ADDR=0x42000000
+ CONFIG_SPL_PAYLOAD="u-boot-lzma.img"
+ CONFIG_BUILD_TARGET="u-boot-mtk.bin"
+ CONFIG_SPL_IMAGE="spl/u-boot-spl-mtk.bin"

package/boot/uboot-mediatek/patches/070-04-configs-mt7988-move-image-load-address-to-0x44000000.patch

@@ -0,0 +1,24 @@
+From c7a3761ddfce2bd56ad319a254d5269cb26fa18f Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:17:44 +0800
+Subject: [PATCH 04/15] configs: mt7988: move image load address to 0x44000000
+
+This patch sets mt7988 image load address to 0x44000000 to support loading
+larger images.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ configs/mt7988_rfb_defconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configs/mt7988_rfb_defconfig
++++ b/configs/mt7988_rfb_defconfig
+@@ -7,7 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000
+ CONFIG_NR_DRAM_BANKS=1
+ CONFIG_DEFAULT_DEVICE_TREE="mt7988-rfb"
+ CONFIG_TARGET_MT7988=y
+-CONFIG_SYS_LOAD_ADDR=0x46000000
++CONFIG_SYS_LOAD_ADDR=0x44000000
+ CONFIG_DEBUG_UART_BASE=0x11000000
+ CONFIG_DEBUG_UART_CLOCK=40000000
+ CONFIG_DEBUG_UART=y

package/boot/uboot-mediatek/patches/070-05-spi-mtk_spim-add-support-to-use-DT-live-tree.patch

@@ -0,0 +1,23 @@
+From a2c2ac46ca4c4ef5fe043e584cf867a20e93226d Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:17:51 +0800
+Subject: [PATCH 05/15] spi: mtk_spim: add support to use DT live tree
+
+Change devfdt_get_addr_ptr to dev_read_addr_ptr to support DT live tree.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/spi/mtk_spim.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/spi/mtk_spim.c
++++ b/drivers/spi/mtk_spim.c
+@@ -648,7 +648,7 @@ static int mtk_spim_probe(struct udevice
+ 	struct mtk_spim_priv *priv = dev_get_priv(dev);
+ 	int ret;
+ 
+-	priv->base = devfdt_get_addr_ptr(dev);
++	priv->base = dev_read_addr_ptr(dev);
+ 	if (!priv->base)
+ 		return -EINVAL;
+ 

package/boot/uboot-mediatek/patches/070-06-spi-mtk_spim-check-slave-device-mode-in-spi-mem-s-su.patch

@@ -0,0 +1,27 @@
+From 7725d4ba16577b74567f7cffb2faffa8bdc5ad61 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:17:55 +0800
+Subject: [PATCH 06/15] spi: mtk_spim: check slave device mode in spi-mem's
+ supports_op
+
+Call spi_mem_default_supports_op() in supports_op to honor the
+slave's supported single/dual/quad mode settings.
+
+Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/spi/mtk_spim.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/spi/mtk_spim.c
++++ b/drivers/spi/mtk_spim.c
+@@ -359,6 +359,9 @@ static bool mtk_spim_supports_op(struct
+ 	struct udevice *bus = dev_get_parent(slave->dev);
+ 	struct mtk_spim_priv *priv = dev_get_priv(bus);
+ 
++	if (!spi_mem_default_supports_op(slave, op))
++		return false;
++
+ 	if (op->cmd.buswidth == 0 || op->cmd.buswidth > 4 ||
+ 	    op->addr.buswidth > 4 || op->dummy.buswidth > 4 ||
+ 	    op->data.buswidth > 4)

package/boot/uboot-mediatek/patches/070-07-arm-dts-mediatek-add-quad-mode-capabilities-for-SPI-.patch

@@ -0,0 +1,96 @@
+From c7a602028669f4409538c3ce0a63c4054d0f2b7a Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:18:01 +0800
+Subject: [PATCH 07/15] arm: dts: mediatek: add quad mode capabilities for SPI
+ flashes
+
+Explicitly add quad mode capabilities or the SPI controller may
+start transfer in single mode.
+
+Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ arch/arm/dts/mt7981-rfb.dts  | 4 ++++
+ arch/arm/dts/mt7986a-rfb.dts | 4 ++++
+ arch/arm/dts/mt7986b-rfb.dts | 4 ++++
+ arch/arm/dts/mt7988-rfb.dts  | 4 ++++
+ 4 files changed, 16 insertions(+)
+
+--- a/arch/arm/dts/mt7981-rfb.dts
++++ b/arch/arm/dts/mt7981-rfb.dts
+@@ -143,6 +143,8 @@
+ 		compatible = "spi-nand";
+ 		reg = <0>;
+ 		spi-max-frequency = <52000000>;
++		spi-rx-bus-width = <4>;
++		spi-tx-bus-width = <4>;
+ 	};
+ };
+ 
+@@ -164,6 +166,8 @@
+ 		compatible = "jedec,spi-nor";
+ 		reg = <0>;
+ 		spi-max-frequency = <52000000>;
++		spi-rx-bus-width = <4>;
++		spi-tx-bus-width = <4>;
+ 	};
+ };
+ 
+--- a/arch/arm/dts/mt7986a-rfb.dts
++++ b/arch/arm/dts/mt7986a-rfb.dts
+@@ -190,12 +190,16 @@
+ 		compatible = "jedec,spi-nor";
+ 		reg = <0>;
+ 		spi-max-frequency = <52000000>;
++		spi-rx-bus-width = <4>;
++		spi-tx-bus-width = <4>;
+ 	};
+ 
+ 	spi_nand@1 {
+ 		compatible = "spi-nand";
+ 		reg = <1>;
+ 		spi-max-frequency = <52000000>;
++		spi-rx-bus-width = <4>;
++		spi-tx-bus-width = <4>;
+ 	};
+ };
+ 
+--- a/arch/arm/dts/mt7986b-rfb.dts
++++ b/arch/arm/dts/mt7986b-rfb.dts
+@@ -177,12 +177,16 @@
+ 		compatible = "jedec,spi-nor";
+ 		reg = <0>;
+ 		spi-max-frequency = <52000000>;
++		spi-rx-bus-width = <4>;
++		spi-tx-bus-width = <4>;
+ 	};
+ 
+ 	spi_nand@1 {
+ 		compatible = "spi-nand";
+ 		reg = <1>;
+ 		spi-max-frequency = <52000000>;
++		spi-rx-bus-width = <4>;
++		spi-tx-bus-width = <4>;
+ 	};
+ };
+ 
+--- a/arch/arm/dts/mt7988-rfb.dts
++++ b/arch/arm/dts/mt7988-rfb.dts
+@@ -144,6 +144,8 @@
+ 		compatible = "spi-nand";
+ 		reg = <0>;
+ 		spi-max-frequency = <52000000>;
++		spi-rx-bus-width = <4>;
++		spi-tx-bus-width = <4>;
+ 	};
+ };
+ 
+@@ -165,6 +167,8 @@
+ 		compatible = "jedec,spi-nor";
+ 		reg = <0>;
+ 		spi-max-frequency = <52000000>;
++		spi-rx-bus-width = <4>;
++		spi-tx-bus-width = <4>;
+ 	};
+ };
+ 

package/boot/uboot-mediatek/patches/070-08-pwm-mediatek-add-pwm3-support-for-mt7981.patch

@@ -0,0 +1,98 @@
+From 7071ba2658ef6175183cc5dc85819293811490b3 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:18:06 +0800
+Subject: [PATCH 08/15] pwm: mediatek: add pwm3 support for mt7981
+
+This patch adds pwm channel 2 (pwm3) support for mt7981
+
+Signed-off-by: Sam Shih <sam.shih@mediatek.com>
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ arch/arm/dts/mt7981-emmc-rfb.dts |  8 ++++++++
+ arch/arm/dts/mt7981-rfb.dts      |  8 ++++++++
+ arch/arm/dts/mt7981-sd-rfb.dts   |  8 ++++++++
+ arch/arm/dts/mt7981.dtsi         | 10 ++++++++--
+ drivers/pwm/pwm-mtk.c            |  2 +-
+ 5 files changed, 33 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/dts/mt7981-emmc-rfb.dts
++++ b/arch/arm/dts/mt7981-emmc-rfb.dts
+@@ -95,6 +95,14 @@
+ 		};
+ 	};
+ 
++	/* pin13 as pwm0, pin15 as pwm1, pin7 as pwm2 */
++	three_pwm_pins_1: three-pwm-pins {
++		mux {
++			function = "pwm";
++			groups = "pwm0_0", "pwm1_1", "pwm2";
++		};
++	};
++
+ 	mmc0_pins_default: mmc0default {
+ 		mux {
+ 			function = "flash";
+--- a/arch/arm/dts/mt7981-rfb.dts
++++ b/arch/arm/dts/mt7981-rfb.dts
+@@ -123,6 +123,14 @@
+ 			groups = "pwm0_1", "pwm1_0", "pwm2";
+ 		};
+ 	};
++
++	/* pin13 as pwm0, pin15 as pwm1, pin7 as pwm2 */
++	three_pwm_pins_1: three-pwm-pins {
++		mux {
++			function = "pwm";
++			groups = "pwm0_0", "pwm1_1", "pwm2";
++		};
++	};
+ };
+ 
+ &spi0 {
+--- a/arch/arm/dts/mt7981-sd-rfb.dts
++++ b/arch/arm/dts/mt7981-sd-rfb.dts
+@@ -95,6 +95,14 @@
+ 		};
+ 	};
+ 
++	/* pin13 as pwm0, pin15 as pwm1, pin7 as pwm2 */
++	three_pwm_pins_1: three-pwm-pins {
++		mux {
++			function = "pwm";
++			groups = "pwm0_0", "pwm1_1", "pwm2";
++		};
++	};
++
+ 	mmc0_pins_default: mmc0default {
+ 		mux {
+ 			function = "flash";
+--- a/arch/arm/dts/mt7981.dtsi
++++ b/arch/arm/dts/mt7981.dtsi
+@@ -137,8 +137,14 @@
+ 			 <&infracfg CLK_INFRA_PWM1_CK>,
+ 			 <&infracfg CLK_INFRA_PWM2_CK>,
+ 			 <&infracfg CLK_INFRA_PWM3_CK>;
+-		assigned-clocks = <&topckgen CLK_TOP_PWM_SEL>;
+-		assigned-clock-parents = <&topckgen CLK_TOP_CB_CKSQ_40M>;
++		assigned-clocks = <&topckgen CLK_TOP_PWM_SEL>,
++				  <&infracfg CLK_INFRA_PWM1_SEL>,
++				  <&infracfg CLK_INFRA_PWM2_SEL>,
++				  <&infracfg CLK_INFRA_PWM3_SEL>;
++		assigned-clock-parents = <&topckgen CLK_TOP_CB_CKSQ_40M>,
++					 <&topckgen CLK_TOP_PWM_SEL>,
++					 <&topckgen CLK_TOP_PWM_SEL>,
++					 <&topckgen CLK_TOP_PWM_SEL>;
+ 		clock-names = "top", "main", "pwm1", "pwm2", "pwm3";
+ 		status = "disabled";
+ 	};
+--- a/drivers/pwm/pwm-mtk.c
++++ b/drivers/pwm/pwm-mtk.c
+@@ -192,7 +192,7 @@ static const struct mtk_pwm_soc mt7629_d
+ };
+ 
+ static const struct mtk_pwm_soc mt7981_data = {
+-	.num_pwms = 2,
++	.num_pwms = 3,
+ 	.pwm45_fixup = false,
+ 	.reg_ver = PWM_REG_V2,
+ };

package/boot/uboot-mediatek/patches/070-09-pci-mediatek-add-support-for-multiple-ports-in-media.patch

@@ -0,0 +1,61 @@
+From dfbadb86b3bc43c004671ab6eb46ee160a192e98 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:18:11 +0800
+Subject: [PATCH 09/15] pci: mediatek: add support for multiple ports in
+ mediatek pcie gen3 driver
+
+One MediaTek PCIe Gen3 controller has only one port, where PCI bus 0
+on this port represents the controller itself and bus 1 represents
+the external PCIe device.
+
+If multiple PCIe controllers are probed in U-Boot, U-Boot will use
+bus numbers greater than 2 as input parameters. Therefore, we should
+convert the BDF bus number to either 0 or 1 by subtracting the
+offset by controller->seq_.
+
+Signed-off-by: Sam Shih <sam.shih@mediatek.com>
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/pci/pcie_mediatek_gen3.c | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+--- a/drivers/pci/pcie_mediatek_gen3.c
++++ b/drivers/pci/pcie_mediatek_gen3.c
+@@ -83,6 +83,28 @@ struct mtk_pcie {
+ 	struct phy phy;
+ };
+ 
++static pci_dev_t convert_bdf(const struct udevice *controller, pci_dev_t bdf)
++{
++	int bdfs[3];
++
++	bdfs[0] = PCI_BUS(bdf);
++	bdfs[1] = PCI_DEV(bdf);
++	bdfs[2] = PCI_FUNC(bdf);
++
++	/*
++	 * One MediaTek PCIe Gen3 controller has only one port, where PCI bus 0 on
++	 * this port represents the controller itself and bus 1 represents the
++	 * external PCIe device. If multiple PCIe controllers are probed in U-Boot,
++	 * U-Boot will use bus numbers greater than 2 as input parameters. Therefore,
++	 * we should convert the BDF bus number to either 0 or 1 by subtracting the
++	 * offset by controller->seq_
++	 */
++
++	bdfs[0] = bdfs[0] - controller->seq_;
++
++	return PCI_BDF(bdfs[0], bdfs[1], bdfs[2]);
++}
++
+ static void mtk_pcie_config_tlp_header(const struct udevice *bus,
+ 				       pci_dev_t devfn,
+ 				       int where, int size)
+@@ -91,6 +113,8 @@ static void mtk_pcie_config_tlp_header(c
+ 	int bytes;
+ 	u32 val;
+ 
++	devfn = convert_bdf(bus, devfn);
++
+ 	size = 1 << size;
+ 	bytes = (GENMASK(size - 1, 0) & 0xf) << (where & 0x3);
+ 

package/boot/uboot-mediatek/patches/070-10-arm-dts-mediatek-add-pcie-support-for-mt7988.patch

@@ -0,0 +1,219 @@
+From 4064eb22e221ce93fef7f1ec3b13ac670c6b20e2 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:18:17 +0800
+Subject: [PATCH 10/15] arm: dts: mediatek: add pcie support for mt7988
+
+This patch adds PCIe support for mt7988
+
+Signed-off-by: Sam Shih <sam.shih@mediatek.com>
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ arch/arm/dts/mt7988-rfb.dts |  18 ++++
+ arch/arm/dts/mt7988.dtsi    | 162 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 180 insertions(+)
+
+--- a/arch/arm/dts/mt7988-rfb.dts
++++ b/arch/arm/dts/mt7988-rfb.dts
+@@ -63,6 +63,24 @@
+ 	};
+ };
+ 
++&pcie0 {
++	status = "okay";
++};
++
++&pcie1 {
++	status = "okay";
++};
++
++/* PCIE2 not working in u-boot */
++&pcie2 {
++	status = "disabled";
++};
++
++/* PCIE3 not working in u-boot */
++&pcie3 {
++	status = "disabled";
++};
++
+ &pinctrl {
+ 	i2c1_pins: i2c1-pins {
+ 		mux {
+--- a/arch/arm/dts/mt7988.dtsi
++++ b/arch/arm/dts/mt7988.dtsi
+@@ -188,6 +188,152 @@
+ 		status = "okay";
+ 	};
+ 
++	pcie2: pcie@11280000 {
++		compatible = "mediatek,mt7988-pcie",
++			     "mediatek,mt7986-pcie",
++			     "mediatek,mt8192-pcie";
++		device_type = "pci";
++		#address-cells = <3>;
++		#size-cells = <2>;
++		reg = <0 0x11280000 0 0x2000>;
++		reg-names = "pcie-mac";
++		linux,pci-domain = <3>;
++		interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
++		bus-range = <0x00 0xff>;
++		ranges = <0x82000000 0 0x20200000 0 0x20200000 0 0x07e00000>;
++		clocks = <&infracfg CLK_INFRA_PCIE_PIPE_P2>,
++			 <&infracfg CLK_INFRA_PCIE_GFMUX_TL_P2>,
++			 <&infracfg CLK_INFRA_PCIE_PERI_26M_CK_P2>,
++			 <&infracfg CLK_INFRA_133M_PCIE_CK_P2>;
++		clock-names = "pl_250m", "tl_26m", "peri_26m",
++			      "top_133m";
++		phys = <&xphyu3port0 PHY_TYPE_PCIE>;
++		phy-names = "pcie-phy";
++
++		status = "disabled";
++
++		#interrupt-cells = <1>;
++		interrupt-map-mask = <0 0 0 0x7>;
++		interrupt-map = <0 0 0 1 &pcie_intc2 0>,
++				<0 0 0 2 &pcie_intc2 1>,
++				<0 0 0 3 &pcie_intc2 2>,
++				<0 0 0 4 &pcie_intc2 3>;
++
++		pcie_intc2: interrupt-controller {
++			#address-cells = <0>;
++			#interrupt-cells = <1>;
++			interrupt-controller;
++		};
++	};
++
++	pcie3: pcie@11290000 {
++		compatible = "mediatek,mt7988-pcie",
++			     "mediatek,mt7986-pcie",
++			     "mediatek,mt8192-pcie";
++		device_type = "pci";
++		#address-cells = <3>;
++		#size-cells = <2>;
++		reg = <0 0x11290000 0 0x2000>;
++		reg-names = "pcie-mac";
++		linux,pci-domain = <2>;
++		interrupts = <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>;
++		bus-range = <0x00 0xff>;
++		ranges = <0x82000000 0 0x28200000 0 0x28200000 0 0x07e00000>;
++		clocks = <&infracfg CLK_INFRA_PCIE_PIPE_P3>,
++			 <&infracfg CLK_INFRA_PCIE_GFMUX_TL_P3>,
++			 <&infracfg CLK_INFRA_PCIE_PERI_26M_CK_P3>,
++			 <&infracfg CLK_INFRA_133M_PCIE_CK_P3>;
++		clock-names = "pl_250m", "tl_26m", "peri_26m",
++			      "top_133m";
++		use-dedicated-phy;
++
++		status = "disabled";
++
++		#interrupt-cells = <1>;
++		interrupt-map-mask = <0 0 0 0x7>;
++		interrupt-map = <0 0 0 1 &pcie_intc3 0>,
++				<0 0 0 2 &pcie_intc3 1>,
++				<0 0 0 3 &pcie_intc3 2>,
++				<0 0 0 4 &pcie_intc3 3>;
++		pcie_intc3: interrupt-controller {
++			#address-cells = <0>;
++			#interrupt-cells = <1>;
++			interrupt-controller;
++		};
++	};
++
++	pcie0: pcie@11300000 {
++		compatible = "mediatek,mt7988-pcie",
++			     "mediatek,mt7986-pcie",
++			     "mediatek,mt8192-pcie";
++		device_type = "pci";
++		#address-cells = <3>;
++		#size-cells = <2>;
++		reg = <0 0x11300000 0 0x2000>;
++		reg-names = "pcie-mac";
++		linux,pci-domain = <0>;
++		interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
++		bus-range = <0x00 0xff>;
++		ranges = <0x82000000 0 0x30200000 0 0x30200000 0 0x07e00000>;
++		clocks = <&infracfg CLK_INFRA_PCIE_PIPE_P0>,
++			 <&infracfg CLK_INFRA_PCIE_GFMUX_TL_P0>,
++			 <&infracfg CLK_INFRA_PCIE_PERI_26M_CK_P0>,
++			 <&infracfg CLK_INFRA_133M_PCIE_CK_P0>;
++		clock-names = "pl_250m", "tl_26m", "peri_26m",
++			      "top_133m";
++		use-dedicated-phy;
++
++		status = "disabled";
++
++		#interrupt-cells = <1>;
++		interrupt-map-mask = <0 0 0 0x7>;
++		interrupt-map = <0 0 0 1 &pcie_intc0 0>,
++				<0 0 0 2 &pcie_intc0 1>,
++				<0 0 0 3 &pcie_intc0 2>,
++				<0 0 0 4 &pcie_intc0 3>;
++		pcie_intc0: interrupt-controller {
++			#address-cells = <0>;
++			#interrupt-cells = <1>;
++			interrupt-controller;
++		};
++	};
++
++	pcie1: pcie@11310000 {
++		compatible = "mediatek,mt7988-pcie",
++			     "mediatek,mt7986-pcie",
++			     "mediatek,mt8192-pcie";
++		device_type = "pci";
++		#address-cells = <3>;
++		#size-cells = <2>;
++		reg = <0 0x11310000 0 0x2000>;
++		reg-names = "pcie-mac";
++		linux,pci-domain = <1>;
++		interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
++		bus-range = <0x00 0xff>;
++		ranges = <0x82000000 0 0x38200000 0 0x38200000 0 0x07e00000>;
++		clocks = <&infracfg CLK_INFRA_PCIE_PIPE_P1>,
++			 <&infracfg CLK_INFRA_PCIE_GFMUX_TL_P1>,
++			 <&infracfg CLK_INFRA_PCIE_PERI_26M_CK_P1>,
++			 <&infracfg CLK_INFRA_133M_PCIE_CK_P1>;
++		clock-names = "pl_250m", "tl_26m", "peri_26m",
++			      "top_133m";
++		use-dedicated-phy;
++
++		status = "disabled";
++
++		#interrupt-cells = <1>;
++		interrupt-map-mask = <0 0 0 0x7>;
++		interrupt-map = <0 0 0 1 &pcie_intc1 0>,
++				<0 0 0 2 &pcie_intc1 1>,
++				<0 0 0 3 &pcie_intc1 2>,
++				<0 0 0 4 &pcie_intc1 3>;
++		pcie_intc1: interrupt-controller {
++			#address-cells = <0>;
++			#interrupt-cells = <1>;
++			interrupt-controller;
++		};
++	};
++
+ 	usbtphy: usb-phy@11c50000 {
+ 		compatible = "mediatek,mt7988",
+ 			     "mediatek,generic-tphy-v2";
+@@ -214,6 +360,22 @@
+ 			status = "okay";
+ 		};
+ 	};
++
++	xphy: xphy@11e10000 {
++		compatible = "mediatek,mt7988", "mediatek,xsphy";
++		#address-cells = <2>;
++		#size-cells = <2>;
++		ranges;
++		status = "disabled";
++
++		xphyu3port0: usb-phy@11e13000 {
++			reg = <0 0x11e13400 0 0x500>;
++			clocks = <&dummy_clk>;
++			clock-names = "ref";
++			#phy-cells = <1>;
++			status = "okay";
++		};
++	};
+ 
+ 	xfi_pextp0: syscon@11f20000 {
+ 		compatible = "mediatek,mt7988-xfi_pextp_0", "syscon";

package/boot/uboot-mediatek/patches/070-11-arm-dts-medaitek-fix-internal-switch-link-speed-of-m.patch

@@ -0,0 +1,36 @@
+From 4a85182570200bf5e87e2a9920e9d28e968bc6e0 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:18:22 +0800
+Subject: [PATCH 11/15] arm: dts: medaitek: fix internal switch link speed of
+ mt7988
+
+The CPU port of mt7988 internal switch uses 10Gb link speed.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ arch/arm/dts/mt7988-rfb.dts    | 2 +-
+ arch/arm/dts/mt7988-sd-rfb.dts | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/dts/mt7988-rfb.dts
++++ b/arch/arm/dts/mt7988-rfb.dts
+@@ -57,7 +57,7 @@
+ 	mediatek,switch = "mt7988";
+ 
+ 	fixed-link {
+-		speed = <1000>;
++		speed = <10000>;
+ 		full-duplex;
+ 		pause;
+ 	};
+--- a/arch/arm/dts/mt7988-sd-rfb.dts
++++ b/arch/arm/dts/mt7988-sd-rfb.dts
+@@ -48,7 +48,7 @@
+ 	mediatek,switch = "mt7988";
+ 
+ 	fixed-link {
+-		speed = <1000>;
++		speed = <10000>;
+ 		full-duplex;
+ 		pause;
+ 	};

package/boot/uboot-mediatek/patches/070-12-arm-dts-mediatek-add-support-for-all-three-GMACs-for.patch

@@ -0,0 +1,103 @@
+From 64cf3dd0ef520a81a27359d83d58b64939e2aa06 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:18:27 +0800
+Subject: [PATCH 12/15] arm: dts: mediatek: add support for all three GMACs for
+ mt7988
+
+This patch add all three GMACs nodes for mt7988. Each GMAC can be
+configured to connect to different ethernet switches/PHYs.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ arch/arm/dts/mt7988-rfb.dts    |  3 +--
+ arch/arm/dts/mt7988-sd-rfb.dts |  3 +--
+ arch/arm/dts/mt7988.dtsi       | 42 ++++++++++++++++++++++++++++++++--
+ 3 files changed, 42 insertions(+), 6 deletions(-)
+
+--- a/arch/arm/dts/mt7988-rfb.dts
++++ b/arch/arm/dts/mt7988-rfb.dts
+@@ -50,9 +50,8 @@
+ 	status = "okay";
+ };
+ 
+-&eth {
++&eth0 {
+ 	status = "okay";
+-	mediatek,gmac-id = <0>;
+ 	phy-mode = "usxgmii";
+ 	mediatek,switch = "mt7988";
+ 
+--- a/arch/arm/dts/mt7988-sd-rfb.dts
++++ b/arch/arm/dts/mt7988-sd-rfb.dts
+@@ -41,9 +41,8 @@
+ 	status = "okay";
+ };
+ 
+-&eth {
++&eth0 {
+ 	status = "okay";
+-	mediatek,gmac-id = <0>;
+ 	phy-mode = "usxgmii";
+ 	mediatek,switch = "mt7988";
+ 
+--- a/arch/arm/dts/mt7988.dtsi
++++ b/arch/arm/dts/mt7988.dtsi
+@@ -587,11 +587,11 @@
+ 		#reset-cells = <1>;
+ 	};
+ 
+-	eth: ethernet@15100000 {
++	eth0: ethernet@15110100 {
+ 		compatible = "mediatek,mt7988-eth", "syscon";
+ 		reg = <0 0x15100000 0 0x20000>;
++		mediatek,gmac-id = <0>;
+ 		mediatek,ethsys = <&ethdma>;
+-		mediatek,sgmiisys = <&sgmiisys0>;
+ 		mediatek,usxgmiisys = <&usxgmiisys0>;
+ 		mediatek,xfi_pextp = <&xfi_pextp0>;
+ 		mediatek,xfi_pll = <&xfi_pll>;
+@@ -602,6 +602,44 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 		mediatek,mcm;
++		status = "disabled";
++	};
++
++	eth1: ethernet@15110200 {
++		compatible = "mediatek,mt7988-eth", "syscon";
++		reg = <0 0x15100000 0 0x20000>;
++		mediatek,gmac-id = <1>;
++		mediatek,ethsys = <&ethdma>;
++		mediatek,sgmiisys = <&sgmiisys1>;
++		mediatek,usxgmiisys = <&usxgmiisys1>;
++		mediatek,xfi_pextp = <&xfi_pextp1>;
++		mediatek,xfi_pll = <&xfi_pll>;
++		mediatek,infracfg = <&topmisc>;
++		mediatek,toprgu = <&watchdog>;
++		resets = <&ethdma ETHDMA_FE_RST>;
++		reset-names = "fe";
++		#address-cells = <1>;
++		#size-cells = <0>;
++		mediatek,mcm;
++		status = "disabled";
++	};
++
++	eth2: ethernet@15110300 {
++		compatible = "mediatek,mt7988-eth", "syscon";
++		reg = <0 0x15100000 0 0x20000>;
++		mediatek,gmac-id = <2>;
++		mediatek,ethsys = <&ethdma>;
++		mediatek,sgmiisys = <&sgmiisys0>;
++		mediatek,usxgmiisys = <&usxgmiisys0>;
++		mediatek,xfi_pextp = <&xfi_pextp0>;
++		mediatek,xfi_pll = <&xfi_pll>;
++		mediatek,infracfg = <&topmisc>;
++		mediatek,toprgu = <&watchdog>;
++		resets = <&ethdma ETHDMA_FE_RST>;
++		reset-names = "fe";
++		#address-cells = <1>;
++		#size-cells = <0>;
++		mediatek,mcm;
+ 		status = "disabled";
+ 	};
+ };

package/boot/uboot-mediatek/patches/070-13-arm-dts-medaitek-add-flash-interface-driving-setting.patch

@@ -0,0 +1,81 @@
+From 1090c6df3767da2c56d5827ba65ce91af8745420 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:18:41 +0800
+Subject: [PATCH 13/15] arm: dts: medaitek: add flash interface driving
+ settings for mt7988
+
+Add driving settings for both SPI and SD/eMMC interfaces to support ensure
+flash devices is accessible for ram-booting.
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ arch/arm/dts/mt7988-rfb.dts | 32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+
+--- a/arch/arm/dts/mt7988-rfb.dts
++++ b/arch/arm/dts/mt7988-rfb.dts
+@@ -101,6 +101,19 @@
+ 			function = "spi";
+ 			groups = "spi0", "spi0_wp_hold";
+ 		};
++
++		conf-pu {
++			pins = "SPI0_CSB", "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>;
++		};
++
+ 	};
+ 
+ 	spi2_pins: spi2-pins {
+@@ -108,6 +121,18 @@
+ 			function = "spi";
+ 			groups = "spi2", "spi2_wp_hold";
+ 		};
++
++		conf-pu {
++			pins = "SPI2_CSB", "SPI2_HOLD", "SPI2_WP";
++			drive-strength = <MTK_DRIVE_8mA>;
++			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
++		};
++
++		conf-pd {
++			pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
++			drive-strength = <MTK_DRIVE_8mA>;
++			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
++		};
+ 	};
+ 
+ 	mmc0_pins_default: mmc0default {
+@@ -121,18 +146,25 @@
+ 			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
+ 			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
+ 			input-enable;
++			drive-strength = <MTK_DRIVE_4mA>;
++			mediatek,pull-up-adv = <1>;	/* pull-up 10K */
+ 		};
+ 
+ 		conf-clk {
+ 			pins = "EMMC_CK";
++			drive-strength = <MTK_DRIVE_6mA>;
++			mediatek,pull-down-adv = <2>;	/* pull-down 50K */
+ 		};
+ 
+ 		conf-dsl {
+ 			pins = "EMMC_DSL";
++			mediatek,pull-down-adv = <2>;	/* pull-down 50K */
+ 		};
+ 
+ 		conf-rst {
+ 			pins = "EMMC_RSTB";
++			drive-strength = <MTK_DRIVE_4mA>;
++			mediatek,pull-up-adv = <1>;	/* pull-up 10K */
+ 		};
+ 	};
+ };

package/boot/uboot-mediatek/patches/070-14-arm-dts-mediatek-update-mt7981-mmc-node.patch

@@ -0,0 +1,62 @@
+From 140303d0308738dfb04059333c9fc25b5159a776 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:18:55 +0800
+Subject: [PATCH 14/15] arm: dts: mediatek: update mt7981 mmc node
+
+1. Fix mmc clock order of mt7981 to match the clock name
+2. Limit the max clock of SD to 50MHz to meet SD Card Spec 2.0
+3. Increase the CLK pin driving strength to 8mA
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ arch/arm/dts/mt7981-sd-rfb.dts |  6 ++++--
+ arch/arm/dts/mt7981.dtsi       | 12 ++++++------
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+
+--- a/arch/arm/dts/mt7981-sd-rfb.dts
++++ b/arch/arm/dts/mt7981-sd-rfb.dts
+@@ -118,7 +118,7 @@
+ 		};
+ 		conf-clk {
+ 			pins = "SPI1_CS";
+-			drive-strength = <MTK_DRIVE_6mA>;
++			drive-strength = <MTK_DRIVE_8mA>;
+ 			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
+ 		};
+ 		conf-rst {
+@@ -140,10 +140,12 @@
+ };
+ 
+ &mmc0 {
++	assigned-clock-parents = <&topckgen CLK_TOP_CB_NET2_D4>,
++				 <&topckgen CLK_TOP_CB_NET2_D2>;
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&mmc0_pins_default>;
+ 	bus-width = <4>;
+-	max-frequency = <52000000>;
++	max-frequency = <50000000>;
+ 	cap-sd-highspeed;
+ 	r_smpl = <0>;
+ 	vmmc-supply = <&reg_3p3v>;
+--- a/arch/arm/dts/mt7981.dtsi
++++ b/arch/arm/dts/mt7981.dtsi
+@@ -306,13 +306,13 @@
+ 		reg = <0x11230000 0x1000>,
+ 		      <0x11C20000 0x1000>;
+ 		interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+-		clocks = <&topckgen CLK_TOP_EMMC_400M>,
+-			 <&topckgen CLK_TOP_EMMC_208M>,
++		clocks = <&topckgen CLK_TOP_EMMC_208M>,
++			 <&topckgen CLK_TOP_EMMC_400M>,
+ 			 <&infracfg CLK_INFRA_MSDC_CK>;
+-		assigned-clocks = <&topckgen CLK_TOP_EMMC_400M_SEL>,
+-				  <&topckgen CLK_TOP_EMMC_208M_SEL>;
+-		assigned-clock-parents = <&topckgen CLK_TOP_CB_NET2_D2>,
+-					 <&topckgen CLK_TOP_CB_M_D2>;
++		assigned-clocks = <&topckgen CLK_TOP_EMMC_208M_SEL>,
++				  <&topckgen CLK_TOP_EMMC_400M_SEL>;
++		assigned-clock-parents = <&topckgen CLK_TOP_CB_M_D2>,
++					 <&topckgen CLK_TOP_CB_NET2_D2>;
+ 		clock-names = "source", "hclk", "source_cg";
+ 		status = "disabled";
+ 	};

package/boot/uboot-mediatek/patches/070-15-MAINTAINERS-update-file-list-for-MediaTek-ARM-platfo.patch

@@ -0,0 +1,36 @@
+From 8707ea0360046522d0784135b6c9a7c564f9515c Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 17 Jan 2025 17:18:59 +0800
+Subject: [PATCH 15/15] MAINTAINERS: update file list for MediaTek ARM platform
+
+Add driver files for MediaTek ARM platform
+
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ MAINTAINERS | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -412,9 +412,13 @@ F:	drivers/mmc/mtk-sd.c
+ F:	drivers/phy/phy-mtk-*
+ F:	drivers/pinctrl/mediatek/
+ F:	drivers/power/domain/mtk-power-domain.c
++F:	drivers/pci/pcie_mediatek_gen3.c
++F:	drivers/pci/pcie_mediatek.c
++F:	drivers/pwm/pwm-mtk.c
+ F:	drivers/ram/mediatek/
+ F:	drivers/spi/mtk_snfi_spi.c
+ F:	drivers/spi/mtk_spim.c
++F:	drivers/spi/mtk_snor.c
+ F:	drivers/timer/mtk_timer.c
+ F:	drivers/usb/host/xhci-mtk.c
+ F:	drivers/usb/mtu3/
+@@ -422,6 +426,7 @@ F:	drivers/watchdog/mtk_wdt.c
+ F:	drivers/net/mtk_eth.c
+ F:	drivers/net/mtk_eth.h
+ F:	drivers/reset/reset-mediatek.c
++F:	drivers/serial/serial_mtk.c
+ F:	include/dt-bindings/clock/mediatek,*
+ F:	include/dt-bindings/power/mediatek,*
+ F:	tools/mtk_image.c

package/boot/uboot-mediatek/patches/071-01-pinctrl-mediatek-update-mt7981-pinctrl-driver-based-.patch

@@ -0,0 +1,138 @@
+From 24e660265f11dad63687c5529cf732538946a197 Mon Sep 17 00:00:00 2001
+From: Weijie Gao <weijie.gao@mediatek.com>
+Date: Fri, 24 Jan 2025 11:39:02 +0800
+Subject: [PATCH] pinctrl: mediatek: update mt7981 pinctrl driver based on
+ upstream kernel
+
+Update mt7981 pinctrl driver based on upstream kernel
+
+Signed-off-by: Sam Shih <sam.shih@mediatek.com>
+Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+---
+ drivers/pinctrl/mediatek/pinctrl-mt7981.c | 51 ++++++++++++++++++++---
+ 1 file changed, 45 insertions(+), 6 deletions(-)
+
+--- a/drivers/pinctrl/mediatek/pinctrl-mt7981.c
++++ b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
+@@ -569,6 +569,11 @@ static const struct mtk_pin_desc mt7981_
+ 	MT7981_TYPE1_PIN(56, "WF_HB10"),
+ };
+ 
++/* List all groups consisting of these pins dedicated to the enablement of
++ * certain hardware block and the corresponding mode for all of the pins.
++ * The hardware probably has multiple combinations of these pinouts.
++ */
++
+ /* WA_AICE */
+ static const int mt7981_wa_aice1_pins[] = { 0, 1, };
+ static const int mt7981_wa_aice1_funcs[] = { 2, 2, };
+@@ -632,6 +637,9 @@ static const int mt7981_wo0_jtag_1_funcs
+ static const int mt7981_uart2_0_pins[] = { 4, 5, 6, 7, };
+ static const int mt7981_uart2_0_funcs[] = { 3, 3, 3, 3, };
+ 
++static const int mt7981_uart2_0_tx_rx_pins[] = { 4, 5, };
++static const int mt7981_uart2_0_tx_rx_funcs[] = { 3, 3, };
++
+ /* GBE_LED0 */
+ static const int mt7981_gbe_led0_pins[] = { 8, };
+ static const int mt7981_gbe_led0_funcs[] = { 3, };
+@@ -718,6 +726,17 @@ static const int mt7981_drv_vbus_pins[]
+ static const int mt7981_drv_vbus_funcs[] = { 1, };
+ 
+ /* EMMC */
++static const int mt7981_emmc_reset_pins[] = { 15, };
++static const int mt7981_emmc_reset_funcs[] = { 2, };
++
++static const int mt7981_emmc_4_pins[] = { 16, 17, 18, 19, 24, 25, };
++static const int mt7981_emmc_4_funcs[] = { 2, 2, 2, 2, 2, 2, };
++
++static const int mt7981_emmc_8_pins[] = {
++	16, 17, 18, 19, 20, 21, 22, 23, 24, 25, };
++static const int mt7981_emmc_8_funcs[] = {
++	2, 2, 2, 2, 2, 2, 2, 2, 2, 2, };
++
+ static const int mt7981_emmc_45_pins[] = {
+ 	15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, };
+ static const int mt7981_emmc_45_funcs[] = {
+@@ -754,6 +773,12 @@ static const int mt7981_uart1_0_funcs[]
+ static const int mt7981_uart1_1_pins[] = { 26, 27, 28, 29, };
+ static const int mt7981_uart1_1_funcs[] = { 2, 2, 2, 2, };
+ 
++static const int mt7981_uart1_2_pins[] = { 9, 10, };
++static const int mt7981_uart1_2_funcs[] = { 2, 2, };
++
++static const int mt7981_uart1_3_pins[] = { 26, 27, };
++static const int mt7981_uart1_3_funcs[] = { 2, 2, };
++
+ /* UART2 */
+ static const int mt7981_uart2_1_pins[] = { 22, 23, 24, 25, };
+ static const int mt7981_uart2_1_funcs[] = { 3, 3, 3, 3, };
+@@ -832,6 +857,8 @@ static const struct mtk_group_desc mt798
+ 	PINCTRL_PIN_GROUP("wo0_jtag_0", mt7981_wo0_jtag_0),
+ 	/* @GPIO(4,7) WM_JTAG(3) */
+ 	PINCTRL_PIN_GROUP("uart2_0", mt7981_uart2_0),
++	/* @GPIO(4,5) WM_JTAG(4) */
++	PINCTRL_PIN_GROUP("uart2_0_tx_rx", mt7981_uart2_0_tx_rx),
+ 	/* @GPIO(8) GBE_LED0(3) */
+ 	PINCTRL_PIN_GROUP("gbe_led0", mt7981_gbe_led0),
+ 	/* @GPIO(4,6) PTA_EXT(4) */
+@@ -844,7 +871,7 @@ static const struct mtk_group_desc mt798
+ 	PINCTRL_PIN_GROUP("spi1_0", mt7981_spi1_0),
+ 	/* @GPIO(6,7) I2C(5) */
+ 	PINCTRL_PIN_GROUP("i2c0_0", mt7981_i2c0_0),
+-	/* @GPIO(8): DFD_NTRST(6) */
++	/* @GPIO(0,1,4,5): DFD_NTRST(6) */
+ 	PINCTRL_PIN_GROUP("dfd_ntrst", mt7981_dfd_ntrst),
+ 	/* @GPIO(9,10): WM_AICE(2) */
+ 	PINCTRL_PIN_GROUP("wm_aice1", mt7981_wm_aice1),
+@@ -870,6 +897,12 @@ static const struct mtk_group_desc mt798
+ 	PINCTRL_PIN_GROUP("udi", mt7981_udi),
+ 	/* @GPIO(14) DRV_VBUS(1) */
+ 	PINCTRL_PIN_GROUP("drv_vbus", mt7981_drv_vbus),
++	/* @GPIO(15): EMMC_RSTB(2) */
++	PINCTRL_PIN_GROUP("emmc_reset", mt7981_emmc_reset),
++	/* @GPIO(16,17,18,19,24,25): EMMC_DATx, EMMC_CLK, EMMC_CMD */
++	PINCTRL_PIN_GROUP("emmc_4", mt7981_emmc_4),
++	/* @GPIO(16,17,18,19,20,21,22,23,24,25): EMMC_DATx, EMMC_CLK, EMMC_CMD */
++	PINCTRL_PIN_GROUP("emmc_8", mt7981_emmc_8),
+ 	/* @GPIO(15,25): EMMC(2) */
+ 	PINCTRL_PIN_GROUP("emmc_45", mt7981_emmc_45),
+ 	/* @GPIO(16,21): SNFI(3) */
+@@ -888,8 +921,12 @@ static const struct mtk_group_desc mt798
+ 	PINCTRL_PIN_GROUP("uart1_0", mt7981_uart1_0),
+ 	/* @GPIO(26,29): UART1(2) */
+ 	PINCTRL_PIN_GROUP("uart1_1", mt7981_uart1_1),
++	/* @GPIO(9,10): UART1(2) */
++	PINCTRL_PIN_GROUP("uart1_2", mt7981_uart1_2),
++	/* @GPIO(26,27): UART1(2) */
++	PINCTRL_PIN_GROUP("uart1_3", mt7981_uart1_3),
+ 	/* @GPIO(22,25): UART2(3) */
+-	PINCTRL_PIN_GROUP("uart2_0", mt7981_uart2_1),
++	PINCTRL_PIN_GROUP("uart2_1", mt7981_uart2_1),
+ 	/* @GPIO(22,24) PTA_EXT(4) */
+ 	PINCTRL_PIN_GROUP("pta_ext_1", mt7981_pta_ext_1),
+ 	/* @GPIO(20,21): WM_UART(4) */
+@@ -964,9 +1001,10 @@ static const struct mtk_io_type_desc mt7
+  */
+ static const char *const mt7981_wa_aice_groups[] = { "wa_aice1", "wa_aice2",
+ 	"wm_aice1_1", "wa_aice3", "wm_aice1_2", };
+-static const char *const mt7981_uart_groups[] = { "wm_uart_0", "uart2_0",
+-	"net_wo0_uart_txd_0", "net_wo0_uart_txd_1", "net_wo0_uart_txd_2",
+-	"uart1_0", "uart1_1", "uart2_0", "wm_aurt_1", "wm_aurt_2", "uart0", };
++static const char *const mt7981_uart_groups[] = { "net_wo0_uart_txd_0",
++	"net_wo0_uart_txd_1", "net_wo0_uart_txd_2", "uart0", "uart1_0",
++	"uart1_1", "uart1_2", "uart1_3", "uart2_0", "uart2_0_tx_rx", "uart2_1",
++	"wm_uart_0", "wm_aurt_1", "wm_aurt_2", };
+ static const char *const mt7981_dfd_groups[] = { "dfd", "dfd_ntrst", };
+ static const char *const mt7981_wdt_groups[] = { "watchdog", "watchdog1", };
+ static const char *const mt7981_pcie_groups[] = { "pcie_pereset", "pcie_clk",
+@@ -986,7 +1024,8 @@ static const char *const mt7981_i2c_grou
+ static const char *const mt7981_pcm_groups[] = { "pcm", };
+ static const char *const mt7981_udi_groups[] = { "udi", };
+ static const char *const mt7981_usb_groups[] = { "drv_vbus", };
+-static const char *const mt7981_flash_groups[] = { "emmc_45", "snfi", };
++static const char *const mt7981_flash_groups[] = { "emmc_reset", "emmc_4",
++	"emmc_8", "emmc_45", "snfi", };
+ static const char *const mt7981_ethernet_groups[] = { "smi_mdc_mdio",
+ 	"gbe_ext_mdc_mdio", "wf0_mode1", "wf0_mode3", "mt7531_int", };
+ static const char *const mt7981_ant_groups[] = { "ant_sel", };

package/boot/uboot-mediatek/patches/100-02-drivers-mtd-add-support-for-MediaTek-SPI-NAND-flash-.patch

@@ -49,7 +49,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
  config SYS_NAND_MAX_OOBFREE
 --- a/drivers/mtd/Makefile
 +++ b/drivers/mtd/Makefile
-@@ -40,3 +40,5 @@ obj-$(CONFIG_$(SPL_TPL_)SPI_FLASH_SUPPOR
+@@ -40,3 +40,5 @@ obj-$(CONFIG_$(PHASE_)SPI_FLASH_SUPPORT)
  obj-$(CONFIG_SPL_UBI) += ubispl/
  
  endif

package/boot/uboot-mediatek/patches/100-04-env-add-support-for-generic-MTD-device.patch

@@ -89,14 +89,14 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
  	depends on ENV_IS_IN_UBI
 --- a/env/Makefile
 +++ b/env/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_$(SPL_TPL_)ENV_IS_NOWHERE)
- obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_MMC) += mmc.o
- obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_FAT) += fat.o
- obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_EXT4) += ext4.o
-+obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_MTD) += mtd.o
- obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_NAND) += nand.o
- obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_SPI_FLASH) += sf.o
- obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_FLASH) += flash.o
+@@ -24,6 +24,7 @@ obj-$(CONFIG_$(PHASE_)ENV_IS_NOWHERE) +=
+ obj-$(CONFIG_$(PHASE_)ENV_IS_IN_MMC) += mmc.o
+ obj-$(CONFIG_$(PHASE_)ENV_IS_IN_FAT) += fat.o
+ obj-$(CONFIG_$(PHASE_)ENV_IS_IN_EXT4) += ext4.o
++obj-$(CONFIG_$(PHASE_)ENV_IS_IN_MTD) += mtd.o
+ obj-$(CONFIG_$(PHASE_)ENV_IS_IN_NAND) += nand.o
+ obj-$(CONFIG_$(PHASE_)ENV_IS_IN_SPI_FLASH) += sf.o
+ obj-$(CONFIG_$(PHASE_)ENV_IS_IN_FLASH) += flash.o
 --- a/env/env.c
 +++ b/env/env.c
 @@ -46,6 +46,9 @@ static enum env_location env_locations[]
@@ -370,7 +370,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +};
 --- a/include/env_internal.h
 +++ b/include/env_internal.h
-@@ -107,6 +107,7 @@ enum env_location {
+@@ -108,6 +108,7 @@ enum env_location {
  	ENVL_FAT,
  	ENVL_FLASH,
  	ENVL_MMC,

package/boot/uboot-mediatek/patches/100-06-mtd-add-core-facility-code-of-NMBM.patch

@@ -13,13 +13,13 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
  drivers/mtd/Makefile            |    1 +
  drivers/mtd/nmbm/Kconfig        |   29 +
  drivers/mtd/nmbm/Makefile       |    5 +
- drivers/mtd/nmbm/nmbm-core.c    | 2936 +++++++++++++++++++++++++++++++
+ drivers/mtd/nmbm/nmbm-core.c    | 3040 +++++++++++++++++++++++++++++++
  drivers/mtd/nmbm/nmbm-debug.h   |   37 +
  drivers/mtd/nmbm/nmbm-debug.inl |   39 +
  drivers/mtd/nmbm/nmbm-private.h |  137 ++
- include/nmbm/nmbm-os.h          |   66 +
- include/nmbm/nmbm.h             |  102 ++
- 10 files changed, 3354 insertions(+)
+ include/nmbm/nmbm-os.h          |   68 +
+ include/nmbm/nmbm.h             |  105 ++
+ 10 files changed, 3463 insertions(+)
  create mode 100644 drivers/mtd/nmbm/Kconfig
  create mode 100644 drivers/mtd/nmbm/Makefile
  create mode 100644 drivers/mtd/nmbm/nmbm-core.c
@@ -31,15 +31,15 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
-@@ -282,6 +282,8 @@ source "drivers/mtd/ubi/Kconfig"
- 
- source "drivers/mtd/nvmxip/Kconfig"
+@@ -276,6 +276,8 @@ config SYS_NAND_MAX_CHIPS
+ 	help
+ 	  The maximum number of NAND chips per device to be supported.
  
 +source "drivers/mtd/nmbm/Kconfig"
 +
- endif
+ source "drivers/mtd/spi/Kconfig"
  
- endmenu
+ source "drivers/mtd/ubi/Kconfig"
 --- a/drivers/mtd/Makefile
 +++ b/drivers/mtd/Makefile
 @@ -42,3 +42,4 @@ obj-$(CONFIG_SPL_UBI) += ubispl/
@@ -89,10 +89,10 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +obj-$(CONFIG_NMBM) += nmbm-core.o
 --- /dev/null
 +++ b/drivers/mtd/nmbm/nmbm-core.c
-@@ -0,0 +1,2936 @@
+@@ -0,0 +1,3040 @@
 +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 +/*
-+ * Copyright (C) 2020 MediaTek Inc. All Rights Reserved.
++ * Copyright (C) 2021 MediaTek Inc. All Rights Reserved.
 + *
 + * Author: Weijie Gao <weijie.gao@mediatek.com>
 + */
@@ -349,6 +349,37 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +}
 +
 +/*
++ * nmbm_panic_write_phys_page - Panic write page with retry
++ * @ni: NMBM instance structure
++ * @addr: linear address where the data will be written to
++ * @data: the main data to be written
++ *
++ * Write a page for at most NMBM_TRY_COUNT times.
++ */
++static bool nmbm_panic_write_phys_page(struct nmbm_instance *ni, uint64_t addr,
++				       const void *data)
++{
++	int tries, ret;
++
++	if (ni->lower.flags & NMBM_F_READ_ONLY) {
++		nlog_err(ni, "%s called with NMBM_F_READ_ONLY set\n", addr);
++		return false;
++	}
++
++	for (tries = 0; tries < NMBM_TRY_COUNT; tries++) {
++		ret = ni->lower.panic_write_page(ni->lower.arg, addr, data);
++		if (!ret)
++			return true;
++
++		nmbm_reset_chip(ni);
++	}
++
++	nlog_err(ni, "Panic page write failed at address 0x%08llx\n", addr);
++
++	return false;
++}
++
++/*
 + * nmbm_erase_phys_block - Erase a block with retry
 + * @ni: NMBM instance structure
 + * @addr: Linear address
@@ -752,7 +783,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	addr = ba2addr(ni, ba);
 +
 +	for (off = 0; off < ni->lower.erasesize; off += ni->lower.writesize) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		ret = nmbm_read_phys_page(ni, addr + off, ni->page_cache, NULL,
 +					  NMBM_MODE_PLACE_OOB);
@@ -791,7 +822,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	bool success;
 +
 +	while (ba < limit) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		if (nmbm_get_block_state(ni, ba) != BLOCK_ST_GOOD)
 +			goto next_block;
@@ -842,7 +873,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	addr = ba2addr(ni, ba);
 +
 +	for (off = 0; off < ni->lower.erasesize; off += ni->lower.writesize) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		/* Prepare page data. fill 0xff to unused region */
 +		memcpy(ni->page_cache, data, size);
@@ -886,7 +917,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	bool success;
 +
 +	while (ba > limit) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		if (nmbm_get_block_state(ni, ba) != BLOCK_ST_GOOD)
 +			goto next_block;
@@ -941,7 +972,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	int ret;
 +
 +	while (sizeremain) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		leading = off & ni->writesize_mask;
 +		chunksize = ni->lower.writesize - leading;
@@ -991,7 +1022,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	int ret;
 +
 +	while (sizeremain) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		leading = off & ni->writesize_mask;
 +		chunksize = ni->lower.writesize - leading;
@@ -1047,7 +1078,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	bool success;
 +
 +	while (sizeremain && ba < limit) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		chunksize = sizeremain;
 +		if (chunksize > ni->lower.erasesize)
@@ -1309,7 +1340,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +
 +	/* Try to write new info table next to the existing table */
 +	while (write_ba >= ni->mapping_blocks_ba) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		success = nmbm_write_info_table(ni, write_ba,
 +						ni->mapping_blocks_top_ba,
@@ -1428,7 +1459,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +
 +	/* Try to write temporary info table into spare unmapped blocks */
 +	while (write_ba >= ni->mapping_blocks_ba) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		success = nmbm_write_info_table(ni, write_ba,
 +						ni->mapping_blocks_top_ba,
@@ -1514,7 +1545,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +
 +	/* Write new backup info table. */
 +	while (write_ba >= main_table_end_ba) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		success = nmbm_write_info_table(ni, write_ba,
 +						ni->mapping_blocks_top_ba,
@@ -1903,7 +1934,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	int ret;
 +
 +	while (sizeremain && ba < limit) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		if (nmbm_get_block_state(ni, ba) != BLOCK_ST_GOOD)
 +			goto next_block;
@@ -1996,7 +2027,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	bool success;
 +
 +	while (ba < limit - size2blk(ni, ni->info_table_size)) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		success = nmbm_try_load_info_table(ni, ba, table_end_ba,
 +						   write_count,
@@ -2208,7 +2239,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +		limit = block_count - ni->lower.max_reserved_blocks;
 +
 +	while (ba >= limit) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		ba--;
 +		addr = ba2addr(ni, ba);
@@ -2222,7 +2253,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +		 */
 +		for (off = 0; off < ni->lower.erasesize;
 +		     off += ni->lower.writesize) {
-+			schedule();
++			WATCHDOG_RESET();
 +
 +			ret = nmbn_read_data(ni, addr + off, &sig,
 +					     sizeof(sig));
@@ -2281,7 +2312,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +		return false;
 +	}
 +
-+	if (!nld->oobsize || !is_power_of_2(nld->oobsize)) {
++	if (!nld->oobsize) {
 +		nmbm_log_lower(nld, NMBM_LOG_ERR,
 +			       "Page spare size %u is not valid\n", nld->oobsize);
 +		return false;
@@ -2594,7 +2625,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	end_ba = addr2ba(ni, addr + size - 1);
 +
 +	while (start_ba <= end_ba) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		ret = nmbm_erase_logic_block(ni, start_ba);
 +		if (ret) {
@@ -2726,7 +2757,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	}
 +
 +	while (sizeremain) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		leading = off & ni->writesize_mask;
 +		chunksize = ni->lower.writesize - leading;
@@ -2822,6 +2853,53 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +}
 +
 +/*
++ * nmbm_panic_write_logic_page - Panic write page based on logic address
++ * @ni: NMBM instance structure
++ * @addr: logic linear address
++ * @data: buffer contains main data. optional.
++ */
++static int nmbm_panic_write_logic_page(struct nmbm_instance *ni, uint64_t addr,
++				       const void *data)
++{
++	uint32_t lb, pb, offset;
++	uint64_t paddr;
++	bool success;
++
++	/* Extract block address and in-block offset */
++	lb = addr2ba(ni, addr);
++	offset = addr & ni->erasesize_mask;
++
++	/* Map logic block to physical block */
++	pb = ni->block_mapping[lb];
++
++	/* Whether the logic block is good (has valid mapping) */
++	if ((int32_t)pb < 0) {
++		nlog_debug(ni, "Logic block %u is a bad block\n", lb);
++		return -EIO;
++	}
++
++	/* Fail if physical block is marked bad */
++	if (nmbm_get_block_state(ni, pb) == BLOCK_ST_BAD)
++		return -EIO;
++
++	/* Assemble new address */
++	paddr = ba2addr(ni, pb) + offset;
++
++	success = nmbm_panic_write_phys_page(ni, paddr, data);
++	if (success)
++		return 0;
++
++	/*
++	 * Do not remap bad block here. Just mark this block in state table.
++	 * Remap this block on erasing.
++	 */
++	nmbm_set_block_state(ni, pb, BLOCK_ST_NEED_REMAP);
++	nmbm_update_info_table(ni);
++
++	return -EIO;
++}
++
++/*
 + * nmbm_write_single_page - Write one page based on logic address
 + * @ni: NMBM instance structure
 + * @addr: logic linear address
@@ -2851,6 +2929,32 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +}
 +
 +/*
++ * nmbm_panic_write_single_page - Panic write one page based on logic address
++ * @ni: NMBM instance structure
++ * @addr: logic linear address
++ * @data: buffer contains main data. optional.
++ */
++int nmbm_panic_write_single_page(struct nmbm_instance *ni, uint64_t addr,
++				 const void *data)
++{
++	if (!ni)
++		return -EINVAL;
++
++	/* Sanity check */
++	if (ni->protected || (ni->lower.flags & NMBM_F_READ_ONLY)) {
++		nlog_debug(ni, "Device is forced read-only\n");
++		return -EROFS;
++	}
++
++	if (addr >= ba2addr(ni, ni->data_block_count)) {
++		nlog_err(ni, "Address 0x%llx is invalid\n", addr);
++		return -EINVAL;
++	}
++
++	return nmbm_panic_write_logic_page(ni, addr, data);
++}
++
++/*
 + * nmbm_write_range - Write data without oob
 + * @ni: NMBM instance structure
 + * @addr: logic linear address
@@ -2893,7 +2997,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	}
 +
 +	while (sizeremain) {
-+		schedule();
++		WATCHDOG_RESET();
 +
 +		leading = off & ni->writesize_mask;
 +		chunksize = ni->lower.writesize - leading;
@@ -3250,7 +3354,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +#endif /* _NMBM_PRIVATE_H_ */
 --- /dev/null
 +++ b/include/nmbm/nmbm-os.h
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,68 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
 + * Copyright (C) 2020 MediaTek Inc. All Rights Reserved.
@@ -3265,7 +3369,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +
 +#include <div64.h>
 +#include <stdbool.h>
-+#include <watchdog.h>
++#include <cyclic.h>
 +#include <u-boot/crc.h>
 +#include <linux/errno.h>
 +#include <linux/log2.h>
@@ -3316,10 +3420,12 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +#define NMBM_DEFAULT_LOG_LEVEL		1
 +#endif
 +
++#define WATCHDOG_RESET			schedule
++
 +#endif /* _NMBM_OS_H_ */
 --- /dev/null
 +++ b/include/nmbm/nmbm.h
-@@ -0,0 +1,102 @@
+@@ -0,0 +1,105 @@
 +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 +/*
 + * Copyright (C) 2020 MediaTek Inc. All Rights Reserved.
@@ -3374,6 +3480,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +	 */
 +	int (*read_page)(void *arg, uint64_t addr, void *buf, void *oob, enum nmbm_oob_mode mode);
 +	int (*write_page)(void *arg, uint64_t addr, const void *buf, const void *oob, enum nmbm_oob_mode mode);
++	int (*panic_write_page)(void *arg, uint64_t addr, const void *buf);
 +	int (*erase_block)(void *arg, uint64_t addr);
 +
 +	int (*is_bad_block)(void *arg, uint64_t addr);
@@ -3410,6 +3517,8 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +int nmbm_write_single_page(struct nmbm_instance *ni, uint64_t addr,
 +			   const void *data, const void *oob,
 +			   enum nmbm_oob_mode mode);
++int nmbm_panic_write_single_page(struct nmbm_instance *ni, uint64_t addr,
++				 const void *data);
 +int nmbm_write_range(struct nmbm_instance *ni, uint64_t addr, size_t size,
 +		     const void *data, enum nmbm_oob_mode mode,
 +		     size_t *retlen);

package/boot/uboot-mediatek/patches/100-08-common-board_r-add-support-to-initialize-NMBM-after-.patch

@@ -13,7 +13,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 
 --- a/common/board_r.c
 +++ b/common/board_r.c
-@@ -372,6 +372,20 @@ static int initr_nand(void)
+@@ -381,6 +381,20 @@ static int initr_nand(void)
  }
  #endif
  
@@ -34,7 +34,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
  #if defined(CONFIG_CMD_ONENAND)
  /* go init the NAND */
  static int initr_onenand(void)
-@@ -663,6 +677,9 @@ static init_fnc_t init_sequence_r[] = {
+@@ -694,6 +708,9 @@ static init_fnc_t init_sequence_r[] = {
  #ifdef CONFIG_CMD_ONENAND
  	initr_onenand,
  #endif