From 7ebbce535c774806b3db0bedd2ba3cfb95c07658 Mon Sep 17 00:00:00 2001 From: Manorit Chawdhry Date: Mon, 25 Sep 2023 11:53:42 +0530 Subject: env: ti: ti_common.env: Fix get_overlaystring for FIT Image After the refactor with conf- nodes in fitImage, overlaystring wasn't didn't handle the new conf- nodes in FIT Booting. Fix get_overlaystring to handle conf- nodes. Fixes: 837833a724b7 ("environment: ti: Add get_fit_config command to get FIT config string") Reported-by: Aniket Limaye Signed-off-by: Manorit Chawdhry Reviewed-by: Andrew Davis --- include/env/ti/ti_armv7_common.env | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/env/ti/ti_armv7_common.env b/include/env/ti/ti_armv7_common.env index e87a41a6590..f5d84216e3c 100644 --- a/include/env/ti/ti_armv7_common.env +++ b/include/env/ti/ti_armv7_common.env @@ -15,10 +15,10 @@ boot_fit=0 addr_fit=0x90000000 name_fit=fitImage update_to_fit=setenv loadaddr ${addr_fit}; setenv bootfile ${name_fit} -get_overlaystring= - for overlay in $name_overlays; - do; - setenv overlaystring ${overlaystring}'#'${overlay}; +get_fit_overlaystring= + for overlay in $name_overlays; do; + setexpr name_fit_overlay gsub / _ conf-${overlay}; + setenv overlaystring ${overlaystring}'#'${name_fit_overlay}; done; get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile} run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring} @@ -28,7 +28,7 @@ bootcmd_ti_mmc= run main_cpsw0_qsgmii_phyinit; run boot_rprocs; #endif if test ${boot_fit} -eq 1; - then run get_fit_${boot}; run get_overlaystring; run run_fit; + then run get_fit_${boot}; run get_fit_overlaystring; run run_fit; else; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; fi; -- cgit v1.3.1 From fa5bde37606356400483cf0c9454cb2eea66264e Mon Sep 17 00:00:00 2001 From: Eduard Strehlau Date: Mon, 25 Sep 2023 13:32:59 -0300 Subject: 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 Signed-off-by: Fabio Estevam --- board/storopack/smegw01/smegw01.env | 4 ++-- configs/smegw01_defconfig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/storopack/smegw01/smegw01.env b/board/storopack/smegw01/smegw01.env index 528310dd810..93de8669109 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 616038387e2..03d403ddc80 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 -- cgit v1.3.1 From ec91a96970e1c4268767777a54ea1747fc0278e9 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 27 Sep 2023 19:22:04 +0200 Subject: configs: iot2050: Disable CONFIG_CONSOLE_MUX We only have serial as console option, and leaving this on turns on SYS_CONSOLE_IS_IN_ENV which is also not true for these devices, leaving an ugly In: No input devices available! Out: No output devices available! Err: No error devices available! behind. Signed-off-by: Jan Kiszka --- configs/iot2050_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/iot2050_defconfig b/configs/iot2050_defconfig index bcbaa92ee89..4fc3bcb56b8 100644 --- a/configs/iot2050_defconfig +++ b/configs/iot2050_defconfig @@ -18,7 +18,6 @@ CONFIG_DM_GPIO=y CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="k3-am6528-iot2050-basic" CONFIG_SPL_TEXT_BASE=0x80080000 -CONFIG_SYS_PROMPT="IOT2050> " CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SPL_SERIAL=y @@ -41,7 +40,6 @@ CONFIG_AUTOBOOT_FLUSH_STDIN=y CONFIG_AUTOBOOT_PROMPT="Hit SPACE to stop autoboot in %d seconds...\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_BOOTCOMMAND="run start_watchdog; run distro_bootcmd" -CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_MAX_SIZE=0x58000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y @@ -62,6 +60,7 @@ CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x380000 +CONFIG_SYS_PROMPT="IOT2050> " CONFIG_SYS_MAXARGS=64 CONFIG_SYS_PBSIZE=1050 CONFIG_CMD_ASKENV=y -- cgit v1.3.1