summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduard Strehlau <eduard@lionizers.com>2023-09-25 13:32:59 -0300
committerTom Rini <trini@konsulko.com>2023-09-28 16:31:43 -0400
commitfa5bde37606356400483cf0c9454cb2eea66264e (patch)
tree4d055d1ca4a03192306bf1d1b9f426d930bdbc9c
parent7ebbce535c774806b3db0bedd2ba3cfb95c07658 (diff)
downloadu-boot-fa5bde37606356400483cf0c9454cb2eea66264e.tar.gz
u-boot-fa5bde37606356400483cf0c9454cb2eea66264e.tar.bz2
u-boot-fa5bde37606356400483cf0c9454cb2eea66264e.zip
smegw01: Fix inverted CONFIG_SYS_BOOT_LOCKED logic
CONFIG_SYS_BOOT_LOCKED means that a restricted boot environment will be used. In this case, hab_auth_img_or_fail should be called to prevent U-Boot to continue running when the fitImage authentication fails. Fix the logic accordingly. Additionally, select CONFIG_SYS_BOOT_LOCKED by default. Signed-off-by: Eduard Strehlau <eduard@lionizers.com> Signed-off-by: Fabio Estevam <festevam@denx.de>
-rw-r--r--board/storopack/smegw01/smegw01.env4
-rw-r--r--configs/smegw01_defconfig2
2 files changed, 3 insertions, 3 deletions
diff --git a/board/storopack/smegw01/smegw01.env b/board/storopack/smegw01/smegw01.env
index 528310dd81..93de866910 100644
--- a/board/storopack/smegw01/smegw01.env
+++ b/board/storopack/smegw01/smegw01.env
@@ -67,9 +67,9 @@ mmcboot=
run altbootcmd;
fi;
#ifdef CONFIG_SYS_BOOT_LOCKED
- hab_auth_img ${fileaddr} ${filesize};
-#else
hab_auth_img_or_fail ${fileaddr} ${filesize};
+#else
+ hab_auth_img ${fileaddr} ${filesize};
#endif
run mmcargs;
if bootm; then
diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig
index 616038387e..03d403ddc8 100644
--- a/configs/smegw01_defconfig
+++ b/configs/smegw01_defconfig
@@ -7,7 +7,7 @@ CONFIG_ENV_OFFSET=0x100000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="imx7d-smegw01"
CONFIG_TARGET_SMEGW01=y
-# CONFIG_SYS_BOOT_LOCKED is not set
+CONFIG_SYS_BOOT_LOCKED=y
CONFIG_ENV_OFFSET_REDUND=0x110000
CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
# CONFIG_ARMV7_VIRT is not set