]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
ARM: dts: imx: Wrap i.MX8M binman SPL and FIT nodes in CST node if IMX_HAB enabled
authorMarek Vasut <marex@denx.de>
Tue, 21 May 2024 10:48:25 +0000 (12:48 +0200)
committerFabio Estevam <festevam@denx.de>
Fri, 24 May 2024 14:22:02 +0000 (11:22 -0300)
In case CONFIG_IMX_HAB is enabled, extend the binman image description for
all of i.MX8M{Q,M,N,P} with CST wrapper node. This way, if CONFIG_IMX_HAB
is enabled, binman will be automatically used to sign SPL and fitImage.

Reviewed-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Marek Vasut <marex@denx.de>
arch/arm/dts/imx8mm-u-boot.dtsi
arch/arm/dts/imx8mn-u-boot.dtsi
arch/arm/dts/imx8mp-u-boot.dtsi
arch/arm/dts/imx8mq-u-boot.dtsi

index b9b1193823a503852a8cbb925a146458e38f5df7..c02e11def5fd0fc3c8c49b6950b09e943eb8bd89 100644 (file)
                };
 #endif
 
-               binman_imx_spl: nxp-imx8mimage {
-                       filename = "u-boot-spl-mkimage.bin";
-                       nxp,boot-from = "sd";
-                       nxp,rom-version = <1>;
+#ifdef CONFIG_IMX_HAB
+               nxp-imx8mcst@0 {
+                       filename = "u-boot-spl-mkimage.signed.bin";
                        nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
+                       nxp,unlock;
                        args;   /* Needed by mkimage etype superclass */
+#endif
 
-                       section {
-                               align = <4>;
-                               align-size = <4>;
-                               filename = "u-boot-spl-ddr.bin";
-                               pad-byte = <0xff>;
-
-                               u-boot-spl {
-                                       align-end = <4>;
-                                       filename = "u-boot-spl.bin";
-                               };
+                       binman_imx_spl: nxp-imx8mimage {
+                               filename = "u-boot-spl-mkimage.bin";
+                               nxp,boot-from = "sd";
+                               nxp,rom-version = <1>;
+                               nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
+                               args;   /* Needed by mkimage etype superclass */
+
+                               section {
+                                       align = <4>;
+                                       align-size = <4>;
+                                       filename = "u-boot-spl-ddr.bin";
+                                       pad-byte = <0xff>;
+
+                                       u-boot-spl {
+                                               align-end = <4>;
+                                               filename = "u-boot-spl.bin";
+                                       };
 
-                               ddr-1d-imem-fw {
-                                       filename = "lpddr4_pmu_train_1d_imem.bin";
-                                       align-end = <4>;
-                                       type = "blob-ext";
-                               };
+                                       ddr-1d-imem-fw {
+                                               filename = "lpddr4_pmu_train_1d_imem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
 
-                               ddr-1d-dmem-fw {
-                                       filename = "lpddr4_pmu_train_1d_dmem.bin";
-                                       align-end = <4>;
-                                       type = "blob-ext";
-                               };
+                                       ddr-1d-dmem-fw {
+                                               filename = "lpddr4_pmu_train_1d_dmem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
 
-                               ddr-2d-imem-fw {
-                                       filename = "lpddr4_pmu_train_2d_imem.bin";
-                                       align-end = <4>;
-                                       type = "blob-ext";
-                               };
+                                       ddr-2d-imem-fw {
+                                               filename = "lpddr4_pmu_train_2d_imem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
 
-                               ddr-2d-dmem-fw {
-                                       filename = "lpddr4_pmu_train_2d_dmem.bin";
-                                       align-end = <4>;
-                                       type = "blob-ext";
+                                       ddr-2d-dmem-fw {
+                                               filename = "lpddr4_pmu_train_2d_dmem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
                                };
                        };
+#ifdef CONFIG_IMX_HAB
                };
 
-               binman_imx_fit: fit {
-                       description = "Configuration to load ATF before U-Boot";
-#ifndef CONFIG_IMX_HAB
-                       fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
-#endif
-                       fit,fdt-list = "of-list";
-                       #address-cells = <1>;
+               nxp-imx8mcst@1 {
+                       filename = "u-boot-fit.signed.bin";
+                       nxp,loader-address = <CONFIG_SPL_LOAD_FIT_ADDRESS>;
 #ifdef CONFIG_FSPI_CONF_HEADER
                        offset = <0x58C00>;
 #else
                        offset = <0x57c00>;
 #endif
 
-                       images {
-                               uboot {
-                                       arch = "arm64";
-                                       compression = "none";
-                                       description = "U-Boot (64-bit)";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       type = "standalone";
+                       args;   /* Needed by mkimage etype superclass */
+#endif
 
-                                       uboot-blob {
-                                               filename = "u-boot-nodtb.bin";
-                                               type = "blob-ext";
+                       binman_imx_fit: fit {
+                               description = "Configuration to load ATF before U-Boot";
+#ifndef CONFIG_IMX_HAB
+                               fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+#endif
+                               fit,fdt-list = "of-list";
+                               #address-cells = <1>;
+#ifdef CONFIG_FSPI_CONF_HEADER
+                               offset = <0x58C00>;
+#else
+                               offset = <0x57c00>;
+#endif
+
+                               images {
+                                       uboot {
+                                               arch = "arm64";
+                                               compression = "none";
+                                               description = "U-Boot (64-bit)";
+                                               load = <CONFIG_TEXT_BASE>;
+                                               type = "standalone";
+
+                                               uboot-blob {
+                                                       filename = "u-boot-nodtb.bin";
+                                                       type = "blob-ext";
+                                               };
                                        };
-                               };
 
 #ifndef CONFIG_ARMV8_PSCI
-                               atf {
-                                       arch = "arm64";
-                                       compression = "none";
-                                       description = "ARM Trusted Firmware";
-                                       entry = <0x920000>;
-                                       load = <0x920000>;
-                                       type = "firmware";
-
-                                       atf-blob {
-                                               filename = "bl31.bin";
-                                               type = "atf-bl31";
+                                       atf {
+                                               arch = "arm64";
+                                               compression = "none";
+                                               description = "ARM Trusted Firmware";
+                                               entry = <0x920000>;
+                                               load = <0x920000>;
+                                               type = "firmware";
+
+                                               atf-blob {
+                                                       filename = "bl31.bin";
+                                                       type = "atf-bl31";
+                                               };
                                        };
-                               };
 #endif
 
-                               binman_fip: fip {
-                                       arch = "arm64";
-                                       compression = "none";
-                                       description = "Trusted Firmware FIP";
-                                       load = <0x40310000>;
-                                       type = "firmware";
-                               };
+                                       binman_fip: fip {
+                                               arch = "arm64";
+                                               compression = "none";
+                                               description = "Trusted Firmware FIP";
+                                               load = <0x40310000>;
+                                               type = "firmware";
+                                       };
 
-                               @fdt-SEQ {
-                                       compression = "none";
-                                       description = "NAME";
-                                       type = "flat_dt";
+                                       @fdt-SEQ {
+                                               compression = "none";
+                                               description = "NAME";
+                                               type = "flat_dt";
 
-                                       uboot-fdt-blob {
-                                               filename = "u-boot.dtb";
-                                               type = "blob-ext";
+                                               uboot-fdt-blob {
+                                                       filename = "u-boot.dtb";
+                                                       type = "blob-ext";
+                                               };
                                        };
                                };
-                       };
 
-                       configurations {
-                               default = "@config-DEFAULT-SEQ";
+                               configurations {
+                                       default = "@config-DEFAULT-SEQ";
 
-                               @config-SEQ {
-                                       description = "NAME";
-                                       fdt = "fdt-SEQ";
-                                       firmware = "uboot";
+                                       @config-SEQ {
+                                               description = "NAME";
+                                               fdt = "fdt-SEQ";
+                                               firmware = "uboot";
 #ifndef CONFIG_ARMV8_PSCI
-                                       loadables = "atf";
+                                               loadables = "atf";
 #endif
+                                       };
                                };
                        };
+#ifdef CONFIG_IMX_HAB
                };
+#endif
        };
 };
 
index c9fb33cfb73428929fbcb5980f952a5c91674a5d..732191f52053882351707f3b4eb775eb82cd57a7 100644 (file)
                };
 #endif
 
-               binman_imx_spl: nxp-imx8mimage {
-                       filename = "u-boot-spl-mkimage.bin";
-                       nxp,boot-from = "sd";
-                       nxp,rom-version = <2>;
+#ifdef CONFIG_IMX_HAB
+               nxp-imx8mcst@0 {
+                       filename = "u-boot-spl-mkimage.signed.bin";
                        nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
+                       nxp,unlock;
                        args;   /* Needed by mkimage etype superclass */
+#endif
 
-                       section {
-                               filename = "u-boot-spl-ddr.bin";
-                               pad-byte = <0xff>;
-                               align-size = <4>;
-                               align = <4>;
-
-                               u-boot-spl {
-                                       align-end = <4>;
-                                       filename = "u-boot-spl.bin";
-                               };
+                       binman_imx_spl: nxp-imx8mimage {
+                               filename = "u-boot-spl-mkimage.bin";
+                               nxp,boot-from = "sd";
+                               nxp,rom-version = <2>;
+                               nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
+                               args;   /* Needed by mkimage etype superclass */
+
+                               section {
+                                       filename = "u-boot-spl-ddr.bin";
+                                       pad-byte = <0xff>;
+                                       align-size = <4>;
+                                       align = <4>;
+
+                                       u-boot-spl {
+                                               align-end = <4>;
+                                               filename = "u-boot-spl.bin";
+                                       };
 
-                               ddr-1d-imem-fw {
+                                       ddr-1d-imem-fw {
 #ifdef CONFIG_IMX8M_LPDDR4
-                                       filename = "lpddr4_pmu_train_1d_imem.bin";
+                                               filename = "lpddr4_pmu_train_1d_imem.bin";
 #elif CONFIG_IMX8M_DDR4
-                                       filename = "ddr4_imem_1d_201810.bin";
+                                               filename = "ddr4_imem_1d_201810.bin";
 #else
-                                       filename = "ddr3_imem_1d.bin";
+                                               filename = "ddr3_imem_1d.bin";
 #endif
-                                       type = "blob-ext";
-                                       align-end = <4>;
-                               };
+                                               type = "blob-ext";
+                                               align-end = <4>;
+                                       };
 
-                               ddr-1d-dmem-fw {
+                                       ddr-1d-dmem-fw {
 #ifdef CONFIG_IMX8M_LPDDR4
-                                       filename = "lpddr4_pmu_train_1d_dmem.bin";
+                                               filename = "lpddr4_pmu_train_1d_dmem.bin";
 #elif CONFIG_IMX8M_DDR4
-                                       filename = "ddr4_dmem_1d_201810.bin";
+                                               filename = "ddr4_dmem_1d_201810.bin";
 #else
-                                       filename = "ddr3_dmem_1d.bin";
+                                               filename = "ddr3_dmem_1d.bin";
 #endif
-                                       type = "blob-ext";
-                                       align-end = <4>;
-                               };
+                                               type = "blob-ext";
+                                               align-end = <4>;
+                                       };
 
 #if defined(CONFIG_IMX8M_LPDDR4) || defined(CONFIG_IMX8M_DDR4)
-                               ddr-2d-imem-fw {
+                                       ddr-2d-imem-fw {
 #ifdef CONFIG_IMX8M_LPDDR4
-                                       filename = "lpddr4_pmu_train_2d_imem.bin";
+                                               filename = "lpddr4_pmu_train_2d_imem.bin";
 #else
-                                       filename = "ddr4_imem_2d_201810.bin";
+                                               filename = "ddr4_imem_2d_201810.bin";
 #endif
-                                       type = "blob-ext";
-                                       align-end = <4>;
-                               };
+                                               type = "blob-ext";
+                                               align-end = <4>;
+                                       };
 
-                               ddr-2d-dmem-fw {
+                                       ddr-2d-dmem-fw {
 #ifdef CONFIG_IMX8M_LPDDR4
-                                       filename = "lpddr4_pmu_train_2d_dmem.bin";
+                                               filename = "lpddr4_pmu_train_2d_dmem.bin";
 #else
-                                       filename = "ddr4_dmem_2d_201810.bin";
+                                               filename = "ddr4_dmem_2d_201810.bin";
 #endif
-                                       type = "blob-ext";
-                                       align-end = <4>;
-                               };
+                                               type = "blob-ext";
+                                               align-end = <4>;
+                                       };
 #endif
+                               };
                        };
+
+#ifdef CONFIG_IMX_HAB
                };
 
-               binman_imx_fit: fit {
-                       description = "Configuration to load ATF before U-Boot";
-#ifndef CONFIG_IMX_HAB
-                       fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
-#endif
-                       fit,fdt-list = "of-list";
-                       #address-cells = <1>;
+               nxp-imx8mcst@1 {
+                       filename = "u-boot-fit.signed.bin";
+                       nxp,loader-address = <CONFIG_SPL_LOAD_FIT_ADDRESS>;
 #ifdef CONFIG_FSPI_CONF_HEADER
                        offset = <0x59000>;
 #else
                        offset = <0x58000>;
 #endif
+                       args;   /* Needed by mkimage etype superclass */
+#endif
 
-                       images {
-                               uboot {
-                                       arch = "arm64";
-                                       compression = "none";
-                                       description = "U-Boot (64-bit)";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       type = "standalone";
+                       binman_imx_fit: fit {
+                               description = "Configuration to load ATF before U-Boot";
+#ifndef CONFIG_IMX_HAB
+                               fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+#endif
+                               fit,fdt-list = "of-list";
+                               #address-cells = <1>;
+#ifdef CONFIG_FSPI_CONF_HEADER
+                               offset = <0x59000>;
+#else
+                               offset = <0x58000>;
+#endif
 
-                                       uboot-blob {
-                                               filename = "u-boot-nodtb.bin";
-                                               type = "blob-ext";
+                               images {
+                                       uboot {
+                                               arch = "arm64";
+                                               compression = "none";
+                                               description = "U-Boot (64-bit)";
+                                               load = <CONFIG_TEXT_BASE>;
+                                               type = "standalone";
+
+                                               uboot-blob {
+                                                       filename = "u-boot-nodtb.bin";
+                                                       type = "blob-ext";
+                                               };
                                        };
-                               };
 
 #ifndef CONFIG_ARMV8_PSCI
-                               atf {
-                                       arch = "arm64";
-                                       compression = "none";
-                                       description = "ARM Trusted Firmware";
-                                       entry = <0x960000>;
-                                       load = <0x960000>;
-                                       type = "firmware";
-
-                                       atf-blob {
-                                               filename = "bl31.bin";
-                                               type = "atf-bl31";
+                                       atf {
+                                               arch = "arm64";
+                                               compression = "none";
+                                               description = "ARM Trusted Firmware";
+                                               entry = <0x960000>;
+                                               load = <0x960000>;
+                                               type = "firmware";
+
+                                               atf-blob {
+                                                       filename = "bl31.bin";
+                                                       type = "atf-bl31";
+                                               };
                                        };
-                               };
 #endif
 
-                               binman_fip: fip {
-                                       arch = "arm64";
-                                       compression = "none";
-                                       description = "Trusted Firmware FIP";
-                                       load = <0x40310000>;
-                                       type = "firmware";
-                               };
+                                       binman_fip: fip {
+                                               arch = "arm64";
+                                               compression = "none";
+                                               description = "Trusted Firmware FIP";
+                                               load = <0x40310000>;
+                                               type = "firmware";
+                                       };
 
-                               @fdt-SEQ {
-                                       compression = "none";
-                                       description = "NAME";
-                                       type = "flat_dt";
+                                       @fdt-SEQ {
+                                               compression = "none";
+                                               description = "NAME";
+                                               type = "flat_dt";
 
-                                       uboot-fdt-blob {
-                                               filename = "u-boot.dtb";
-                                               type = "blob-ext";
+                                               uboot-fdt-blob {
+                                                       filename = "u-boot.dtb";
+                                                       type = "blob-ext";
+                                               };
                                        };
                                };
-                       };
 
-                       configurations {
-                               default = "@config-DEFAULT-SEQ";
+                               configurations {
+                                       default = "@config-DEFAULT-SEQ";
 
-                               @config-SEQ {
-                                       description = "NAME";
-                                       fdt = "fdt-SEQ";
-                                       firmware = "uboot";
+                                       @config-SEQ {
+                                               description = "NAME";
+                                               fdt = "fdt-SEQ";
+                                               firmware = "uboot";
 #ifndef CONFIG_ARMV8_PSCI
-                                       loadables = "atf";
+                                               loadables = "atf";
 #endif
+                                       };
                                };
                        };
+#ifdef CONFIG_IMX_HAB
                };
+#endif
        };
 };
index 8b5ac3faf1c19eef5cd7f12d647e25e1fbce5c38..f2655a4d0c88d4145dc184c8c952bd0c6c5887b8 100644 (file)
        section {
                pad-byte = <0x00>;
 
-               binman_imx_spl: nxp-imx8mimage {
-                       filename = "u-boot-spl-mkimage.bin";
-                       nxp,boot-from = "sd";
-                       nxp,rom-version = <2>;
+#ifdef CONFIG_IMX_HAB
+               nxp-imx8mcst@0 {
+                       filename = "u-boot-spl-mkimage.signed.bin";
                        nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
+                       nxp,unlock;
                        args;   /* Needed by mkimage etype superclass */
+#endif
 
-                       section {
-                               filename = "u-boot-spl-ddr.bin";
-                               pad-byte = <0xff>;
-                               align-size = <4>;
-                               align = <4>;
-
-                               u-boot-spl {
-                                       align-end = <4>;
-                               };
+                       binman_imx_spl: nxp-imx8mimage {
+                               filename = "u-boot-spl-mkimage.bin";
+                               nxp,boot-from = "sd";
+                               nxp,rom-version = <2>;
+                               nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
+                               args;   /* Needed by mkimage etype superclass */
+
+                               section {
+                                       filename = "u-boot-spl-ddr.bin";
+                                       pad-byte = <0xff>;
+                                       align-size = <4>;
+                                       align = <4>;
+
+                                       u-boot-spl {
+                                               align-end = <4>;
+                                       };
 
-                               ddr-1d-imem-fw {
-                                       filename = "lpddr4_pmu_train_1d_imem_202006.bin";
-                                       type = "blob-ext";
-                                       align-end = <4>;
-                               };
+                                       ddr-1d-imem-fw {
+                                               filename = "lpddr4_pmu_train_1d_imem_202006.bin";
+                                               type = "blob-ext";
+                                               align-end = <4>;
+                                       };
 
-                               ddr-1d-dmem-fw {
-                                       filename = "lpddr4_pmu_train_1d_dmem_202006.bin";
-                                       type = "blob-ext";
-                                       align-end = <4>;
-                               };
+                                       ddr-1d-dmem-fw {
+                                               filename = "lpddr4_pmu_train_1d_dmem_202006.bin";
+                                               type = "blob-ext";
+                                               align-end = <4>;
+                                       };
 
-                               ddr-2d-imem-fw {
-                                       filename = "lpddr4_pmu_train_2d_imem_202006.bin";
-                                       type = "blob-ext";
-                                       align-end = <4>;
-                               };
+                                       ddr-2d-imem-fw {
+                                               filename = "lpddr4_pmu_train_2d_imem_202006.bin";
+                                               type = "blob-ext";
+                                               align-end = <4>;
+                                       };
 
-                               ddr-2d-dmem-fw {
-                                       filename = "lpddr4_pmu_train_2d_dmem_202006.bin";
-                                       type = "blob-ext";
-                                       align-end = <4>;
+                                       ddr-2d-dmem-fw {
+                                               filename = "lpddr4_pmu_train_2d_dmem_202006.bin";
+                                               type = "blob-ext";
+                                               align-end = <4>;
+                                       };
                                };
                        };
+#ifdef CONFIG_IMX_HAB
                };
 
-               binman_imx_fit: fit {
-                       description = "Configuration to load ATF before U-Boot";
-#ifndef CONFIG_IMX_HAB
-                       fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
-#endif
-                       fit,fdt-list = "of-list";
-                       #address-cells = <1>;
+               nxp-imx8mcst@1 {
+                       filename = "u-boot-fit.signed.bin";
+                       nxp,loader-address = <CONFIG_SPL_LOAD_FIT_ADDRESS>;
                        offset = <0x58000>;
+                       args;   /* Needed by mkimage etype superclass */
+#endif
 
-                       images {
-                               uboot {
-                                       description = "U-Boot (64-bit)";
-                                       type = "standalone";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-
-                                       uboot_blob: blob-ext {
-                                               filename = "u-boot-nodtb.bin";
+                       binman_imx_fit: fit {
+                               description = "Configuration to load ATF before U-Boot";
+#ifndef CONFIG_IMX_HAB
+                               fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+#endif
+                               fit,fdt-list = "of-list";
+                               #address-cells = <1>;
+                               offset = <0x58000>;
+
+                               images {
+                                       uboot {
+                                               description = "U-Boot (64-bit)";
+                                               type = "standalone";
+                                               arch = "arm64";
+                                               compression = "none";
+                                               load = <CONFIG_TEXT_BASE>;
+
+                                               uboot_blob: blob-ext {
+                                                       filename = "u-boot-nodtb.bin";
+                                               };
                                        };
-                               };
 
 #ifndef CONFIG_ARMV8_PSCI
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <0x970000>;
-                                       entry = <0x970000>;
-
-                                       atf_blob: atf-blob {
-                                               filename = "bl31.bin";
-                                               type = "atf-bl31";
+                                       atf {
+                                               description = "ARM Trusted Firmware";
+                                               type = "firmware";
+                                               arch = "arm64";
+                                               compression = "none";
+                                               load = <0x970000>;
+                                               entry = <0x970000>;
+
+                                               atf_blob: atf-blob {
+                                                       filename = "bl31.bin";
+                                                       type = "atf-bl31";
+                                               };
                                        };
-                               };
 #endif
 
-                               @fdt-SEQ {
-                                       description = "NAME";
-                                       type = "flat_dt";
-                                       compression = "none";
+                                       @fdt-SEQ {
+                                               description = "NAME";
+                                               type = "flat_dt";
+                                               compression = "none";
 
-                                       blob-ext {
-                                               filename = "u-boot.dtb";
+                                               blob-ext {
+                                                       filename = "u-boot.dtb";
+                                               };
                                        };
                                };
-                       };
 
-                       configurations {
-                               default = "@config-DEFAULT-SEQ";
+                               configurations {
+                                       default = "@config-DEFAULT-SEQ";
 
-                               @config-SEQ {
-                                       description = "NAME";
-                                       fdt = "fdt-SEQ";
-                                       firmware = "uboot";
+                                       @config-SEQ {
+                                               description = "NAME";
+                                               fdt = "fdt-SEQ";
+                                               firmware = "uboot";
 #ifndef CONFIG_ARMV8_PSCI
-                                       loadables = "atf";
+                                               loadables = "atf";
 #endif
+                                       };
                                };
                        };
+#ifdef CONFIG_IMX_HAB
                };
+#endif
        };
 };
index 72da674d245f79b35676d20a69d2170405a0ddb2..e1cd6f8996dcba09a33150848d93c5525982e075 100644 (file)
        section {
                pad-byte = <0x00>;
 
-               binman_imx_spl: nxp-imx8mimage {
-                       filename = "u-boot-spl-mkimage.bin";
-                       nxp,boot-from = "sd";
-                       nxp,rom-version = <1>;
+#ifdef CONFIG_IMX_HAB
+               nxp-imx8mcst@0 {
+                       filename = "u-boot-spl-mkimage.signed.bin";
                        nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
+                       nxp,unlock;
                        args;   /* Needed by mkimage etype superclass */
+#endif
 
-                       section {
-                               align = <4>;
-                               align-size = <4>;
-                               filename = "u-boot-spl-ddr.bin";
-                               pad-byte = <0xff>;
-
-                               u-boot-spl {
-                                       align-end = <4>;
-                                       filename = "u-boot-spl.bin";
-                               };
+                       binman_imx_spl: nxp-imx8mimage {
+                               filename = "u-boot-spl-mkimage.bin";
+                               nxp,boot-from = "sd";
+                               nxp,rom-version = <1>;
+                               nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
+                               args;   /* Needed by mkimage etype superclass */
+
+                               section {
+                                       align = <4>;
+                                       align-size = <4>;
+                                       filename = "u-boot-spl-ddr.bin";
+                                       pad-byte = <0xff>;
+
+                                       u-boot-spl {
+                                               align-end = <4>;
+                                               filename = "u-boot-spl.bin";
+                                       };
 
-                               ddr-1d-imem-fw {
-                                       filename = "lpddr4_pmu_train_1d_imem.bin";
-                                       align-end = <4>;
-                                       type = "blob-ext";
-                               };
+                                       ddr-1d-imem-fw {
+                                               filename = "lpddr4_pmu_train_1d_imem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
 
-                               ddr-1d-dmem-fw {
-                                       filename = "lpddr4_pmu_train_1d_dmem.bin";
-                                       align-end = <4>;
-                                       type = "blob-ext";
-                               };
+                                       ddr-1d-dmem-fw {
+                                               filename = "lpddr4_pmu_train_1d_dmem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
 
-                               ddr-2d-imem-fw {
-                                       filename = "lpddr4_pmu_train_2d_imem.bin";
-                                       align-end = <4>;
-                                       type = "blob-ext";
-                               };
+                                       ddr-2d-imem-fw {
+                                               filename = "lpddr4_pmu_train_2d_imem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
 
-                               ddr-2d-dmem-fw {
-                                       filename = "lpddr4_pmu_train_2d_dmem.bin";
-                                       align-end = <4>;
-                                       type = "blob-ext";
-                               };
+                                       ddr-2d-dmem-fw {
+                                               filename = "lpddr4_pmu_train_2d_dmem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
 
-                               signed-hdmi-imx8m {
-                                       filename = "signed_hdmi_imx8m.bin";
-                                       type = "blob-ext";
+                                       signed-hdmi-imx8m {
+                                               filename = "signed_hdmi_imx8m.bin";
+                                               type = "blob-ext";
+                                       };
                                };
                        };
+#ifdef CONFIG_IMX_HAB
                };
 
-               binman_imx_fit: fit {
-                       description = "Configuration to load ATF before U-Boot";
+               nxp-imx8mcst@1 {
+                       filename = "u-boot-fit.signed.bin";
+                       nxp,loader-address = <CONFIG_SPL_LOAD_FIT_ADDRESS>;
+                       offset = <0x58000>;
+                       args;   /* Needed by mkimage etype superclass */
+#endif
+
+                       binman_imx_fit: fit {
+                               description = "Configuration to load ATF before U-Boot";
 #ifndef CONFIG_IMX_HAB
-                       fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+                               fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
 #endif
-                       #address-cells = <1>;
-
-                       images {
-                               uboot {
-                                       arch = "arm64";
-                                       compression = "none";
-                                       description = "U-Boot (64-bit)";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       type = "standalone";
-
-                                       uboot-blob {
-                                               filename = "u-boot-nodtb.bin";
-                                               type = "blob-ext";
+                               #address-cells = <1>;
+
+                               images {
+                                       uboot {
+                                               arch = "arm64";
+                                               compression = "none";
+                                               description = "U-Boot (64-bit)";
+                                               load = <CONFIG_TEXT_BASE>;
+                                               type = "standalone";
+
+                                               uboot-blob {
+                                                       filename = "u-boot-nodtb.bin";
+                                                       type = "blob-ext";
+                                               };
                                        };
-                               };
 
 #ifndef CONFIG_ARMV8_PSCI
-                               atf {
-                                       arch = "arm64";
-                                       compression = "none";
-                                       description = "ARM Trusted Firmware";
-                                       entry = <0x910000>;
-                                       load = <0x910000>;
-                                       type = "firmware";
-
-                                       atf-blob {
-                                               filename = "bl31.bin";
-                                               type = "blob-ext";
+                                       atf {
+                                               arch = "arm64";
+                                               compression = "none";
+                                               description = "ARM Trusted Firmware";
+                                               entry = <0x910000>;
+                                               load = <0x910000>;
+                                               type = "firmware";
+
+                                               atf-blob {
+                                                       filename = "bl31.bin";
+                                                       type = "blob-ext";
+                                               };
                                        };
-                               };
 #endif
 
-                               fdt {
-                                       compression = "none";
-                                       description = "NAME";
-                                       type = "flat_dt";
+                                       fdt {
+                                               compression = "none";
+                                               description = "NAME";
+                                               type = "flat_dt";
 
-                                       uboot-fdt-blob {
-                                               filename = "u-boot.dtb";
-                                               type = "blob-ext";
+                                               uboot-fdt-blob {
+                                                       filename = "u-boot.dtb";
+                                                       type = "blob-ext";
+                                               };
                                        };
                                };
-                       };
 
-                       configurations {
-                               default = "conf";
+                               configurations {
+                                       default = "conf";
 
-                               conf {
-                                       description = "NAME";
-                                       fdt = "fdt";
-                                       firmware = "uboot";
+                                       conf {
+                                               description = "NAME";
+                                               fdt = "fdt";
+                                               firmware = "uboot";
 #ifndef CONFIG_ARMV8_PSCI
-                                       loadables = "atf";
+                                               loadables = "atf";
 #endif
+                                       };
                                };
                        };
+#ifdef CONFIG_IMX_HAB
                };
+#endif
        };
 };