Merge tag 'u-boot-imx-20230923' of https://source.denx.de/u-boot/custodians/u-boot-imx

Fixes for 2023.10
-----------------

CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/17831

diff --git a/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi b/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi
index 52aa875..57ca28e 100644 (file)
--- a/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi
@@ -3,6 +3,8 @@
  * Copyright 2020-2022 Toradex
  */
 
+#include "imx7s-u-boot.dtsi"
+
 &{/aliases} {
        /* SDHCI instance order: eMMC, SD/MMC */
        mmc0 = &usdhc3;

diff --git a/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi
index 67b41ae..843b458 100644 (file)
--- a/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi
@@ -1,3 +1,5 @@
+#include "imx7s-u-boot.dtsi"
+
 /{
     aliases {
         mmc0 = &usdhc3;

diff --git a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
index 62cdcba..896c8bc 100644 (file)
--- a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi
@@ -3,6 +3,8 @@
  * Copyright 2018 NXP
  */
 
+#include "imx7s-u-boot.dtsi"
+
 &qspi {
        flash0: mx25l51245g@0 {
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
index ac1d6e2..e4a27b8 100644 (file)
--- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
@@ -1,3 +1,5 @@
+#include "imx7s-u-boot.dtsi"
+
 &fec2 {
        status = "disable";
 };

diff --git a/arch/arm/dts/imx7d-smegw01-u-boot.dtsi b/arch/arm/dts/imx7d-smegw01-u-boot.dtsi
new file mode 100644 (file)
index 0000000..90f7500
--- /dev/null
+++ b/arch/arm/dts/imx7d-smegw01-u-boot.dtsi
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "imx7s-u-boot.dtsi"

diff --git a/arch/arm/dts/imx7s-u-boot.dtsi b/arch/arm/dts/imx7s-u-boot.dtsi
new file mode 100644 (file)
index 0000000..c4c1da3
--- /dev/null
+++ b/arch/arm/dts/imx7s-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+
+&crypto {
+       sec_jr0: jr@1000 {
+               status = "disabled";
+       };
+};

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index d94b582..fda7624 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -32,6 +32,7 @@ config IMX_RDC
 config IMX_BOOTAUX
        bool "Support boot auxiliary core"
        depends on ARCH_MX7 || ARCH_MX6 || ARCH_VF610 || ARCH_IMX8 || ARCH_IMX8M
+       select LIB_ELF
        help
          bootaux [addr] to boot auxiliary core.
 

diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index b3ef36c..27e053e 100644 (file)
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -662,7 +662,7 @@ static int do_authenticate_image_or_failover(struct cmd_tbl *cmdtp, int flag,
 {
        int ret = CMD_RET_FAILURE;
 
-       if (argc != 4) {
+       if (argc < 3) {
                ret = CMD_RET_USAGE;
                goto error;
        }
@@ -703,7 +703,7 @@ U_BOOT_CMD(
                "addr length ivt_offset\n"
                "addr - image hex address\n"
                "length - image hex length\n"
-               "ivt_offset - hex offset of IVT in the image"
+               "ivt_offset - hex offset of IVT in the image (optional)"
          );
 
 U_BOOT_CMD(
@@ -715,11 +715,11 @@ U_BOOT_CMD(
 U_BOOT_CMD(
                hab_auth_img_or_fail, 4, 0,
                do_authenticate_image_or_failover,
-               "authenticate image via HAB on failure drop to USB BootROM mode",
+               "authenticate image via HAB. Switch to USB BootROM mode on failure",
                "addr length ivt_offset\n"
                "addr - image hex address\n"
                "length - image hex length\n"
-               "ivt_offset - hex offset of IVT in the image"
+               "ivt_offset - hex offset of IVT in the image (optional)"
          );
 
 U_BOOT_CMD(

diff --git a/board/storopack/smegw01/smegw01.env b/board/storopack/smegw01/smegw01.env
index 1263dda..528310d 100644 (file)
--- a/board/storopack/smegw01/smegw01.env
+++ b/board/storopack/smegw01/smegw01.env
@@ -48,13 +48,8 @@ commit_mmc=
                saveenv;
        fi;
 console=ttymxc0
-fdt_addr=0x83000000
-fdtfile=imx7d-smegw01.dtb
-fit_addr=0x88000000
-image=fitImage
-loadaddr=0x80800000
 loadbootpart=mmc partconf 1 boot_part
-loadimage=load mmc ${mmcdev}:${gpt_partition_entry} ${fit_addr} boot/${image}
+loadimage=load mmc ${mmcdev}:${gpt_partition_entry}
 loadpart=gpt setenv mmc ${mmcdev} rootfs-${mmcpart_committed}
 mmcargs=
        setenv bootargs console=${console},${baudrate} root=/dev/mmcblk${mmcdev}p${gpt_partition_entry} rootwait rw SM_ROOT_DEV=${mmcdev} SM_ROOT_PART=${gpt_partition_entry} SM_BOOT_PART=${boot_part}
@@ -71,8 +66,13 @@ mmcboot=
        else
                run altbootcmd;
        fi;
+#ifdef CONFIG_SYS_BOOT_LOCKED
+       hab_auth_img ${fileaddr} ${filesize};
+#else
+       hab_auth_img_or_fail ${fileaddr} ${filesize};
+#endif
        run mmcargs;
-       if bootm ${fit_addr}; then
+       if bootm; then
                ;
        else
                run altbootcmd;

diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig
index 7f1b2be..6160383 100644 (file)
--- a/configs/smegw01_defconfig
+++ b/configs/smegw01_defconfig
@@ -14,6 +14,7 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_IMX_HAB=y
+CONFIG_SYS_LOAD_ADDR=0x88000000
 CONFIG_SYS_MEMTEST_START=0x80000000
 CONFIG_SYS_MEMTEST_END=0xa0000000
 CONFIG_FIT=y
@@ -54,6 +55,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_WRITEABLE_LIST=y
 CONFIG_ENV_ACCESS_IGNORE_FORCE=y
+CONFIG_USE_BOOTFILE=y
+CONFIG_BOOTFILE="boot/fitImage"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_BOOTCOUNT_LIMIT=y