From d9fcbfc5850f1faafd266b81af2ffeb17faf91dd Mon Sep 17 00:00:00 2001
From: Stefan Reisinger <dev@stefan-reisinger.at>
Date: Wed, 16 Sep 2026 09:17:50 +0200
Subject: [PATCH] uboot-envtools: fix BPI-R2 boot device

Resolve the production partition through fit.sh so the generated
environment configuration uses the actual MMC block device.

Migrate legacy /dev/p1 device fields in place while preserving custom
geometry, additional entries, and unrelated configurations.

Fixes: de2df0f2c5b7 ("base-files: remove fitblk_get_bootdev() from /lib/upgrade/common.sh")
Signed-off-by: Stefan Reisinger <dev@stefan-reisinger.at>
Link: https://github.com/openwrt/openwrt/pull/25197
Signed-off-by: Robert Marko <robimarko@gmail.com>
---
 package/boot/uboot-tools/Makefile             |  2 +-
 .../uboot-envtools/files/mediatek_mt7623      | 37 +++++++++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/package/boot/uboot-tools/Makefile b/package/boot/uboot-tools/Makefile
index 756c099d6dc..e2df5eddf69 100644
--- a/package/boot/uboot-tools/Makefile
+++ b/package/boot/uboot-tools/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_DISTNAME:=u-boot
 PKG_VERSION:=2026.07
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
diff --git a/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7623 b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7623
index 008aff57853..83fcdd8095f 100644
--- a/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7623
+++ b/package/boot/uboot-tools/uboot-envtools/files/mediatek_mt7623
@@ -2,10 +2,6 @@
 # Copyright (C) 2021 OpenWrt.org
 #
 
-[ -e /etc/config/ubootenv ] && exit 0
-
-touch /etc/config/ubootenv
-
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
@@ -13,13 +9,40 @@ board=$(board_name)
 
 case "$board" in
 bananapi,bpi-r2)
-	. /lib/upgrade/common.sh
-	bootdev="$(fitblk_get_bootdev)"
-	ubootenv_add_uci_config "/dev/${bootdev%p[0-9]*}p1" "0xb0000" "0x10000" "0x10000" "1"
+	. /lib/upgrade/fit.sh
+	export_fitblk_bootdev
+	[ -n "$EMMC_KERN_DEV" ] || exit 1
+	bootdev=${EMMC_KERN_DEV%%p[0-9]*}
+	newdev="${bootdev}p1"
+	if [ -e /etc/config/ubootenv ]; then
+		if [ "$(uci -q get ubootenv.@ubootenv[0].dev)" = "/dev/p1" ]; then
+			if [ -s /etc/fw_env.config ]; then
+				if grep -q '^[[:space:]]*/dev/p1[[:space:]]' /etc/fw_env.config; then
+					sed -i "s|^\([[:space:]]*\)/dev/p1\([[:space:]]\)|\1$newdev\2|" /etc/fw_env.config || exit 1
+				elif ! grep -q "^[[:space:]]*$newdev[[:space:]]" /etc/fw_env.config; then
+					exit 0
+				fi
+			fi
+			uci set ubootenv.@ubootenv[0].dev="$newdev" || exit 1
+			uci commit ubootenv || exit 1
+			[ -s /etc/fw_env.config ] && exit 0
+		else
+			exit 0
+		fi
+	else
+		touch /etc/config/ubootenv
+		ubootenv_add_uci_config "$newdev" "0xb0000" "0x10000" "0x10000" "1"
+	fi
 	;;
 unielec,u7623-02)
+	[ -e /etc/config/ubootenv ] && exit 0
+	touch /etc/config/ubootenv
 	ubootenv_add_uci_config "/dev/mmcblk0p1" "0xc0000" "0x10000" "0x10000" "1"
 	;;
+*)
+	[ -e /etc/config/ubootenv ] && exit 0
+	touch /etc/config/ubootenv
+	;;
 esac
 
 config_load ubootenv