Merge branch 'fixes/11' into 'main'

u-boot: add recovery option

See merge request beaglev-fire/BeagleV-Fire-ubuntu!11

03_build_u-boot.sh

@@ -10,6 +10,7 @@ if [ ! -f ./.patched ] ; then
 	if [ -f configs/beaglev_fire_defconfig ] ; then
 		git am ../patches/u-boot/0001-drivers-mailbox-mpfs-mbox-add-missing-include.patch
 		git am ../patches/u-boot/0002-board-beagle-beaglev_fire-fix-compilation-warning.patch
+		git am ../patches/u-boot/0003-board-beagle-beaglev_fire-add-recovery-option.patch
 	fi
 	touch .patched
 fi

06_generate_debian_console_root.sh

@@ -50,6 +50,7 @@ tar xfp ./deploy/${distro}-${version}-console-riscv64-${datestamp}/riscv64-rootf
 sync
 
 mkdir -p ./deploy/input/ || true
+cp -v ./deploy/recovery.scr deploy/input/
 cp -v ./deploy/boot.scr deploy/input/
 cp -v ./deploy/sysconf.txt deploy/input/
 

06_generate_ubuntu_console_root.sh

@@ -50,6 +50,7 @@ tar xfp ./deploy/${distro}-${version}-console-riscv64-${datestamp}/riscv64-rootf
 sync
 
 mkdir -p ./deploy/input/ || true
+cp -v ./deploy/recovery.scr deploy/input/
 cp -v ./deploy/boot.scr deploy/input/
 cp -v ./deploy/sysconf.txt deploy/input/
 

deploy/genimage.cfg

@@ -4,6 +4,7 @@ image boot.vfat {
 	vfat {
 		files = {
 			"beaglev_fire.itb",
+			"recovery.scr",
 			"boot.scr",
 			"sysconf.txt"
 		}

patches/u-boot/0003-board-beagle-beaglev_fire-add-recovery-option.patch

@@ -0,0 +1,37 @@
+From da52a15fc720b91b39c126a2753192dddd075b17 Mon Sep 17 00:00:00 2001
+From: Lars Randers <lranders@mail.dk>
+Date: Wed, 30 Jul 2025 20:10:28 +0000
+Subject: [PATCH] board: beagle: beaglev_fire: add recovery option
+
+Signed-off-by: Lars Randers <lranders@mail.dk>
+---
+ include/configs/beaglev_fire.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/include/configs/beaglev_fire.h b/include/configs/beaglev_fire.h
+index e3ee0f02..b9ab650a 100644
+--- a/include/configs/beaglev_fire.h
++++ b/include/configs/beaglev_fire.h
+@@ -42,6 +42,11 @@
+ 		"done; " \
+ 	"fi;\0 " \
+ 
++#define BOOTENV_RECOVERY \
++	"recovery=" \
++	"setenv boot_scripts recovery.scr; " \
++	"boot;\0"
++
+ #include <config_distro_bootcmd.h>
+ 
+ #define CFG_EXTRA_ENV_SETTINGS \
+@@ -52,6 +57,7 @@
+ 	"ramdisk_addr_r=0x8aa00000\0" \
+ 	"scriptaddr=0x8e000000\0" \
+ 	BOOTENV_DESIGN_OVERLAYS \
++	BOOTENV_RECOVERY \
+ 	BOOTENV \
+ 
+ #endif /* __CONFIG_H */
+-- 
+2.39.2
+