]> Git Repo - J-u-boot.git/blobdiff - arch/arm/dts/imx8mm-u-boot.dtsi
Merge tag 'u-boot-imx-master-20250127' of https://gitlab.denx.de/u-boot/custodians...
[J-u-boot.git] / arch / arm / dts / imx8mm-u-boot.dtsi
index 6085128e24ecb9adbddfbe923f44f2a1940ce153..abb3aa5b6354df3e5b444693b32e4ce70de898db 100644 (file)
@@ -5,9 +5,23 @@
 
 / {
        binman: binman {
-               multiple-images;
        };
+
+#ifdef CONFIG_OPTEE
+       firmware {
+               optee {
+                       compatible = "linaro,optee-tz";
+                       method = "smc";
+               };
+       };
+#endif
+};
+
+#ifdef CONFIG_FSL_CAAM
+&crypto {
+       bootph-pre-ram;
 };
+#endif
 
 &soc {
        bootph-all;
 };
 
 &binman {
-       u-boot-spl-ddr {
-               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";
-               };
+       filename = "flash.bin";
+       section {
+               pad-byte = <0x00>;
 
-               ddr-1d-imem-fw {
-                       filename = "lpddr4_pmu_train_1d_imem.bin";
-                       align-end = <4>;
+#ifdef CONFIG_FSPI_CONF_HEADER
+               fspi_conf_block {
+                       filename = CONFIG_FSPI_CONF_FILE;
                        type = "blob-ext";
+                       size = <0x1000>;
                };
+#endif
 
-               ddr-1d-dmem-fw {
-                       filename = "lpddr4_pmu_train_1d_dmem.bin";
-                       align-end = <4>;
-                       type = "blob-ext";
-               };
+#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
 
-               ddr-2d-imem-fw {
-                       filename = "lpddr4_pmu_train_2d_imem.bin";
-                       align-end = <4>;
-                       type = "blob-ext";
-               };
+                       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-2d-dmem-fw {
-                       filename = "lpddr4_pmu_train_2d_dmem.bin";
-                       align-end = <4>;
-                       type = "blob-ext";
-               };
-       };
+                                       ddr-1d-imem-fw {
+                                               filename = "lpddr4_pmu_train_1d_imem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
 
-       spl {
-               filename = "spl.bin";
+                                       ddr-1d-dmem-fw {
+                                               filename = "lpddr4_pmu_train_1d_dmem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
 
-               mkimage {
-                       args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000";
+                                       ddr-2d-imem-fw {
+                                               filename = "lpddr4_pmu_train_2d_imem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
 
-                       blob {
-                               filename = "u-boot-spl-ddr.bin";
+                                       ddr-2d-dmem-fw {
+                                               filename = "lpddr4_pmu_train_2d_dmem.bin";
+                                               align-end = <4>;
+                                               type = "blob-ext";
+                                       };
+                               };
                        };
+#ifdef CONFIG_IMX_HAB
                };
-       };
 
-       itb {
-               filename = "u-boot.itb";
+               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
+
+                       args;   /* Needed by mkimage etype superclass */
+#endif
 
-               fit {
-                       description = "Configuration to load ATF before U-Boot";
+                       binman_imx_fit: fit {
+                               description = "Configuration to load ATF before U-Boot";
+                               filename = "u-boot.itb";
 #ifndef CONFIG_IMX_HAB
-                       fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+                               fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
 #endif
-                       fit,fdt-list = "of-list";
-                       #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";
+                               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";
-                               };
+#ifdef CONFIG_OPTEE
+                                       tee: tee {
+                                               description = "OP-TEE";
+                                               type = "tee";
+                                               arch = "arm64";
+                                               compression = "none";
+                                               os = "tee";
+                                               load = <CONFIG_IMX8M_OPTEE_LOAD_ADDR>;
+                                               entry = <CONFIG_IMX8M_OPTEE_LOAD_ADDR>;
+
+                                               tee-os {
+                                                       filename = "tee.bin";
+                                               };
+                                       };
+#endif
+
+                                       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";
+#ifdef CONFIG_OPTEE
+                                               loadables = "atf", "tee";
+#else
+                                               loadables = "atf";
+#endif
 #endif
+                                       };
                                };
                        };
-               };
-       };
-
-       imx-boot {
-               filename = "flash.bin";
-               pad-byte = <0x00>;
-
-#ifdef CONFIG_FSPI_CONF_HEADER
-               fspi_conf_block {
-                       filename = CONFIG_FSPI_CONF_FILE;
-                       type = "blob-ext";
-                       size = <0x1000>;
-               };
-
-               spl {
-                       filename = "spl.bin";
-                       offset = <0x1000>;
-                       type = "blob-ext";
-               };
-
-               binman_uboot: uboot {
-                       filename = "u-boot.itb";
-                       offset = <0x58C00>;
-                       type = "blob-ext";
-               };
-#else
-               spl {
-                       filename = "spl.bin";
-                       offset = <0x0>;
-                       type = "blob-ext";
-               };
-
-               binman_uboot: uboot {
-                       filename = "u-boot.itb";
-                       offset = <0x57c00>;
-                       type = "blob-ext";
+#ifdef CONFIG_IMX_HAB
                };
 #endif
        };
        bootph-pre-ram;
 };
 
+#ifdef CONFIG_FSL_CAAM
+&sec_jr0 {
+       bootph-pre-ram;
+};
+
+&sec_jr1 {
+       bootph-pre-ram;
+};
+
+&sec_jr2 {
+       bootph-pre-ram;
+};
+#endif
+
 &spba1 {
        bootph-all;
        bootph-pre-ram;
This page took 0.041611 seconds and 4 git commands to generate.