From 1842ac98a14a9f450137c1ec234ec03c03376d36 Mon Sep 17 00:00:00 2001
From: Vincent BENOIT <vincent.benoit@benserv.fr>
Date: Thu, 4 May 2023 11:49:15 +0000
Subject: [PATCH] modification des variables d'environnement u-boot de la
 pengwyn

---
 recipes-bsp/u-boot/files2/uEnv.txt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/u-boot/files2/uEnv.txt b/recipes-bsp/u-boot/files2/uEnv.txt
index ce4079b..02bfc2a 100644
--- a/recipes-bsp/u-boot/files2/uEnv.txt
+++ b/recipes-bsp/u-boot/files2/uEnv.txt
@@ -13,17 +13,19 @@ console=ttyS0,115200n8
 cpu=armv7
 ethact=cpsw
 ethaddr=00:18:30:fc:c0:35
-fdtaddr=0x80F80000
+fdtaddr=0x81200000
 fdtfile=am335x-pengwyn.dtb
 importbootenv=echo Importing environment from mmc ...; env import -t $loadaddr $filesize
 loadaddr=0x80200000
 loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}
 loadfdt=fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}
 loadimage=fatload mmc ${mmcdev} ${loadaddr} ${bootfile}
-mmcargs=setenv bootargs console=${console} ${optargs} root=${mmcroot} rootfstype=${mmcrootfstype}
-mmcboot=mmc dev ${mmcdev}; if mmc rescan; then echo SD/MMC found on device ${mmcdev};if run loadbootenv; then echo Loaded environment from ${bootenv};run importbootenv;fi;if test -n $uenvcmd; then echo Running uenvcmd ...;run uenvcmd;fi;if run loadimage; then run loadfdt;run mmcloados;fi;fi;
+mmcargs=setenv bootargs console=${console} ${optargs} root=${mmcroot} rootfstype=${mmcrootfstype} shell=before:dmverity
+mmcboot=mmc dev ${mmcdev}; if mmc rescan; then echo SD/MMC found on device ${mmcdev};if run loadbootenv; then echo Loaded environment from ${bootenv};run importbootenv;fi;if test -n $uenvcmd; then echo Running uenvcmd ...;run uenvcmd;fi;if run loadimage; then run mmcloados;fi;fi;
+mmcboot_old=mmc dev ${mmcdev}; if mmc rescan; then echo SD/MMC found on device ${mmcdev};if run loadbootenv; then echo Loaded environment from ${bootenv};run importbootenv;fi;if test -n $uenvcmd; then echo Running uenvcmd ...;run uenvcmd;fi;if run loadimage; then run loadfdt;run mmcloados;fi;fi;
 mmcdev=0
-mmcloados=run mmcargs; bootm ${loadaddr} - ${fdtaddr};
+mmcloados=run mmcargs; bootm ${loadaddr};
+mmcloados_old=run mmcargs; bootm ${loadaddr} - ${fdtaddr};
 mmcroot=/dev/mmcblk0p2 ro
 mmcrootfstype=ext4 rootwait
 mtddevname=SPL