From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sat, 13 Dec 2025 18:19:18 +0000 (-0500)
Subject: rpi-u-boot-scr: remove unconditional environment save
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=a026bc53689d122ebbc0ce2a010275f6ae938971;p=yocto%2Fmeta-hvmpd.git

rpi-u-boot-scr: remove unconditional environment save

Signed-off-by: Hugo Villeneuve <hugo@hugovil.com>
---

diff --git a/raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.in b/raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.in
index a630e63..a58c443 100644
--- a/raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.in
+++ b/raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.in
@@ -1,6 +1,6 @@
-saveenv
 fdt addr ${fdt_addr} && fdt get value bootargs /chosen bootargs
 if env exists rpipart;then echo Booting from mmcblk0p${rpipart};else setenv rpipart @@ROOT_PART_A_ID@@;echo rpipart not set, default to ${rpipart};fi
 load @@BOOT_MEDIA@@ 0:${rpipart} ${kernel_addr_r} boot/@@KERNEL_IMAGETYPE@@
+if test ! -e mmc 0:1 uboot.env; then saveenv; fi;
 setenv bootargs "${bootargs} root=@@ROOT_PARENT_DEV@@@@ROOT_PART_PREFIX@@${rpipart}"
 @@KERNEL_BOOTCMD@@ ${kernel_addr_r} - ${fdt_addr}