From: Patrick Delaunay Date: Fri, 5 Jul 2019 15:20:21 +0000 (+0200) Subject: stm32mp1: add check for presence of environment in boot device X-Git-Tag: v2019.10-rc1~30^2~33 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=22bed7ee4988aadfaef0c0da9746bf8541549ed4;hp=03cc423d8ad65a8268e9143129d76b341a383a88;p=oweals%2Fu-boot.git stm32mp1: add check for presence of environment in boot device For boot from flash, check presence of default environment to force save env. Signed-off-by: Patrick Delaunay Tested-by: Pierre-Jean Texier --- diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 637f9bf5b0..ed01d4d9c2 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -103,6 +103,7 @@ "if test ${boot_device} = serial || test ${boot_device} = usb;" \ "then stm32prog ${boot_device} ${boot_instance}; " \ "else " \ + "run env_check;" \ "if test ${boot_device} = mmc;" \ "then env set boot_targets \"mmc${boot_instance}\"; fi;" \ "if test ${boot_device} = nand;" \ @@ -134,6 +135,9 @@ "ramdisk_addr_r=0xc4400000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ + "env_default=1\0" \ + "env_check=if test $env_default -eq 1;"\ + " then env set env_default 0;env save;fi\0" \ STM32MP_BOOTCMD \ STM32MP_MTDPARTS \ BOOTENV