diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-29 07:49:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-29 07:49:24 -0400 |
| commit | a574e05d39138fed62889c1f2e3936e69322855e (patch) | |
| tree | f985f9bed9a249cfa2865b5f67709b90adfe043e | |
| parent | 964aae164414b15ef91a0319decb13e7e2c06b52 (diff) | |
| parent | ec91a96970e1c4268767777a54ea1747fc0278e9 (diff) | |
| download | u-boot-a574e05d39138fed62889c1f2e3936e69322855e.zip u-boot-a574e05d39138fed62889c1f2e3936e69322855e.tar.gz u-boot-a574e05d39138fed62889c1f2e3936e69322855e.tar.bz2 | |
Merge branch '2023-09-28-assorted-minor-fixes'
- Fixes for two board builds and a script fix for many TI platforms
| -rw-r--r-- | board/storopack/smegw01/smegw01.env | 4 | ||||
| -rw-r--r-- | configs/iot2050_defconfig | 3 | ||||
| -rw-r--r-- | configs/smegw01_defconfig | 2 | ||||
| -rw-r--r-- | include/env/ti/ti_armv7_common.env | 10 |
4 files changed, 9 insertions, 10 deletions
diff --git a/board/storopack/smegw01/smegw01.env b/board/storopack/smegw01/smegw01.env index 528310d..93de866 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/iot2050_defconfig b/configs/iot2050_defconfig index bcbaa92..4fc3bcb 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 diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index 6160383..03d403d 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 diff --git a/include/env/ti/ti_armv7_common.env b/include/env/ti/ti_armv7_common.env index e87a41a..f5d8421 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; |