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

rpi-u-boot-scr: setup rpipart first

Make sure the variable is set first, because other lines in this script
(future commits) will depend on it.

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 a58c443..116f4e4 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,5 +1,6 @@
+if env exists rpipart; then; else setenv rpipart "@@ROOT_PART_A_ID@@"; saveenv; fi
+echo Booting from @@ROOT_PARENT_DEV@@@@ROOT_PART_PREFIX@@${rpipart};
 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}"