]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: dts: k3-*-binman: Move to using templated FITs
authorNeha Malcom Francis <n-francis@ti.com>
Wed, 15 Nov 2023 10:10:24 +0000 (15:40 +0530)
committerTom Rini <trini@konsulko.com>
Wed, 22 Nov 2023 18:48:20 +0000 (13:48 -0500)
Reduce redundancy in code by using templates to generate the A72 boot
binaries (tispl.bin and u-boot.img) as well as R5 boot binary sysfw.itb
(for legacy boot following devices J721E and AM65x).

Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
Acked-by: Andrew Davis <afd@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Manorit Chawdhry <m-chawdhry@ti.com>
arch/arm/dts/k3-am625-sk-binman.dtsi
arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
arch/arm/dts/k3-am62a-sk-binman.dtsi
arch/arm/dts/k3-am64x-binman.dtsi
arch/arm/dts/k3-am65x-binman.dtsi
arch/arm/dts/k3-j7200-binman.dtsi
arch/arm/dts/k3-j721e-binman.dtsi
arch/arm/dts/k3-j721s2-binman.dtsi

index 41277bf4bfdb4342b68fbf748581aea78fa183e9..b7b5368886ac2d8db62f2a2c20daa089ad3a1c40 100644 (file)
 
 #ifdef CONFIG_TARGET_AM625_A53_EVM
 
-#define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
 #define SPL_AM625_SK_DTB "spl/dts/k3-am625-sk.dtb"
-
-#define UBOOT_NODTB "u-boot-nodtb.bin"
 #define AM625_SK_DTB "u-boot.dtb"
 
 &binman {
                };
        };
        ti-spl {
-               filename = "tispl.bin";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
-
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       ti-secure {
-                                               content = <&atf>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       atf: atf-bl31 {
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       ti-secure {
-                                               content = <&tee>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       tee: tee-os {
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        ti-secure {
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_spl_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_spl_nodtb: blob-ext {
-                                               filename = SPL_NODTB;
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-am625-sk";
                                        type = "flat_dt";
 
 &binman {
        u-boot {
-               filename = "u-boot.img";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for AM625 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_nodtb: u-boot-nodtb {
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for AM625 Board";
                                };
 
                                fdt-0 {
 
 &binman {
        ti-spl_unsigned {
-               filename = "tispl.bin_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_unsigned_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
 
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       atf-bl31 {
-                                               filename = "bl31.bin";
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       tee-os {
-                                               filename = "tee-raw.bin";
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        blob-ext {
                                                filename = "ti-dm.bin";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       blob {
-                                               filename = "spl/u-boot-spl-nodtb.bin";
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-am625-sk";
                                        type = "flat_dt";
 
 &binman {
        u-boot_unsigned {
-               filename = "u-boot.img_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_unsigned_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for AM625 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       blob {
-                                               filename = UBOOT_NODTB;
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for AM625 Board";
                                };
 
                                fdt-0 {
index 9c2d1df6b7ace4887503ee455b38ea3d5c3f86cb..ed2c4482ef044432821e1329908ec4f503c71d0c 100644 (file)
 
 #ifdef CONFIG_TARGET_VERDIN_AM62_A53
 
-#define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
 #define SPL_VERDIN_AM62_DTB "spl/dts/k3-am625-verdin-wifi-dev.dtb"
-
-#define UBOOT_NODTB "u-boot-nodtb.bin"
 #define VERDIN_AM62_DTB "u-boot.dtb"
 
 &binman {
                };
        };
        ti-spl {
-               filename = "tispl.bin";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
 
                        images {
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       ti-secure {
-                                               content = <&atf>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       atf: atf-bl31 {
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       ti-secure {
-                                               content = <&tee>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       tee: tee-os {
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        ti-secure {
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_spl_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_spl_nodtb: blob-ext {
-                                               filename = SPL_NODTB;
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-am625-verdin-wifi-dev";
                                        type = "flat_dt";
 
 &binman {
        u-boot {
-               filename = "u-boot.img";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for AM625 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_nodtb: u-boot-nodtb {
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot fot AM625 Verdin Board";
                                };
 
                                fdt-0 {
 
 &binman {
        ti-spl_unsigned {
-               filename = "tispl.bin_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_unsigned_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       atf-bl31 {
-                                               filename = "bl31.bin";
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       tee-os {
-                                               filename = "tee-raw.bin";
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        blob-ext {
                                                filename = "ti-dm.bin";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       blob {
-                                               filename = "spl/u-boot-spl-nodtb.bin";
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-am625-verdin-wifi-dev";
                                        type = "flat_dt";
 
 &binman {
        u-boot_unsigned {
-               filename = "u-boot.img_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_unsigned_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for AM625 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       blob {
-                                               filename = UBOOT_NODTB;
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for AM625 Verdin Board";
                                };
 
                                fdt-0 {
index de09430d936059154a6ba264025c6384da28211f..c5e027d44dac404d57fa6b6b51e44834cb5e1b5f 100644 (file)
 
 #ifdef CONFIG_TARGET_AM62A7_A53_EVM
 
-#define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
 #define SPL_AM62A7_SK_DTB "spl/dts/k3-am62a7-sk.dtb"
-
-#define UBOOT_NODTB "u-boot-nodtb.bin"
 #define AM62A7_SK_DTB "u-boot.dtb"
 
 &binman {
                };
        };
        ti-spl {
-               filename = "tispl.bin";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
-
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       ti-secure {
-                                               content = <&atf>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       atf: atf-bl31 {
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       ti-secure {
-                                               content = <&tee>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       tee: tee-os {
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        ti-secure {
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_spl_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_spl_nodtb: blob-ext {
-                                               filename = SPL_NODTB;
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-am62a7-sk";
                                        type = "flat_dt";
 
 &binman {
        u-boot {
-               filename = "u-boot.img";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for AM62Ax board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_nodtb: u-boot-nodtb {
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for AM62Ax Board";
                                };
 
                                fdt-0 {
 
 &binman {
        ti-spl_unsigned {
-               filename = "tispl.bin_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_unsigned_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
-
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       atf-bl31 {
-                                               filename = "bl31.bin";
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       tee-os {
-                                               filename = "tee-raw.bin";
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        blob-ext {
                                                filename = "ti-dm.bin";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       blob {
-                                               filename = "spl/u-boot-spl-nodtb.bin";
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-am62a7-sk";
                                        type = "flat_dt";
 
 &binman {
        u-boot_unsigned {
-               filename = "u-boot.img_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_unsigned_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for AM62Ax board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       blob {
-                                               filename = UBOOT_NODTB;
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for AM62Ax Board";
                                };
 
                                fdt-0 {
index a5e54006b44dc5e37add6bdad8681f08d693f562..88df2149545c87e57b715e6fba39149dda43a8c0 100644 (file)
 
 #ifdef CONFIG_TARGET_AM642_A53_EVM
 
-#define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
 #define SPL_AM642_EVM_DTB "spl/dts/k3-am642-evm.dtb"
 #define SPL_AM642_SK_DTB "spl/dts/k3-am642-sk.dtb"
 
-#define UBOOT_NODTB "u-boot-nodtb.bin"
 #define AM642_EVM_DTB "u-boot.dtb"
 #define AM642_SK_DTB "arch/arm/dts/k3-am642-sk.dtb"
 
 &binman {
        ti-spl {
-               filename = "tispl.bin";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_template>;
 
                fit {
                        description = "Configuration to load ATF and SPL";
                        #address-cells = <1>;
 
                        images {
-
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       ti-secure {
-                                               content = <&atf>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       atf: atf-bl31 {
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       ti-secure {
-                                               content = <&tee>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       tee: tee-os {
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        blob-ext {
                                                filename = "/dev/null";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_spl_nodtb>;
-                                               keyfile = "custMpk.pem";
-
-                                       };
-                                       u_boot_spl_nodtb: blob-ext {
-                                               filename = SPL_NODTB;
-                                       };
-                               };
 
                                fdt-0 {
                                        description = "k3-am642-evm";
 
 &binman {
        u-boot {
-               filename = "u-boot.img";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for AM64 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_nodtb: u-boot-nodtb {
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for AM64 Board";
                                };
 
                                fdt-0 {
 
 &binman {
        ti-spl_unsigned {
-               filename = "tispl.bin_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_unsigned_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
 
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       atf-bl31 {
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       tee-os {
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        blob-ext {
                                                filename = "/dev/null";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       blob {
-                                               filename = "spl/u-boot-spl-nodtb.bin";
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-am642-evm";
                                        type = "flat_dt";
 
 &binman {
        u-boot_unsigned {
-               filename = "u-boot.img_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_unsigned_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for AM64 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       blob {
-                                               filename = UBOOT_NODTB;
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for AM64 Board";
                                };
 
                                fdt-0 {
index 59605ca597bd32650d2ac44e196867fcec9f810f..8cc24da1f3fad5b5407c1f2eace489cc03f53660 100644 (file)
        };
        itb {
                filename = "sysfw-am65x_sr2-hs-evm.itb";
-               fit {
-                       description = "SYSFW and Config fragments";
-                       #address-cells = <1>;
-                       images {
-                               sysfw.bin {
-                                       description = "sysfw";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       blob-ext {
-                                           filename = "sysfw.bin";
-                                       };
-                               };
-                               board-cfg.bin {
-                                       description = "board-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       ti-secure {
-                                               content = <&board_cfg>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       board_cfg: board-cfg {
-                                               filename = "board-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-                               };
-                               pm-cfg.bin {
-                                       description = "pm-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       ti-secure {
-                                               content = <&pm_cfg>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       pm_cfg: pm-cfg {
-                                               filename = "pm-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-                               };
-                               rm-cfg.bin {
-                                       description = "rm-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       ti-secure {
-                                               content = <&rm_cfg>;
-                                               keyfile = "custMpk.pem";\
-                                       };
-                                       rm_cfg: rm-cfg {
-                                               filename = "rm-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-                               };
-                               sec-cfg.bin {
-                                       description = "sec-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       ti-secure {
-                                               content = <&sec_cfg>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       sec_cfg: sec-cfg {
-                                               filename = "sec-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-                               };
-                       };
-               };
+               insert-template = <&itb_template>;
        };
 };
 
        itb_gp {
                filename = "sysfw-am65x_sr2-gp-evm.itb";
                symlink = "sysfw.itb";
+               insert-template = <&itb_unsigned_template>;
                fit {
-                       description = "SYSFW and Config fragments";
-                       #address-cells = <1>;
                        images {
                                sysfw.bin {
-                                       description = "sysfw";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
                                        blob-ext {
                                            filename = "sysfw.bin_gp";
                                        };
                                };
-                               board-cfg.bin {
-                                       description = "board-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       blob-ext {
-                                               filename = "board-cfg.bin";
-                                       };
-                               };
-                               pm-cfg.bin {
-                                       description = "pm-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       blob-ext {
-                                               filename = "pm-cfg.bin";
-                                       };
-                               };
-                               rm-cfg.bin {
-                                       description = "rm-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       blob-ext {
-                                               filename = "rm-cfg.bin";
-                                       };
-                               };
-                               sec-cfg.bin {
-                                       description = "sec-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       blob-ext {
-                                               filename = "sec-cfg.bin";
-                                       };
-                               };
                        };
                };
        };
 
 #ifdef CONFIG_TARGET_AM654_A53_EVM
 
-#define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
 #define SPL_AM654_EVM_DTB "spl/dts/k3-am654-base-board.dtb"
-
-#define UBOOT_NODTB "u-boot-nodtb.bin"
 #define AM654_EVM_DTB "u-boot.dtb"
 
 &binman {
        ti-spl {
-               filename = "tispl.bin";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
 
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       ti-secure {
-                                               content = <&atf>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       atf: atf-bl31 {
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       ti-secure {
-                                               content = <&tee>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       tee: tee-os {
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        blob-ext {
                                                filename = "/dev/null";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_spl_nodtb>;
-                                               keyfile = "custMpk.pem";
-
-                                       };
-                                       u_boot_spl_nodtb: blob-ext {
-                                               filename = SPL_NODTB;
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-am654-base-board";
                                        type = "flat_dt";
 
 &binman {
        u-boot {
-               filename = "u-boot.img";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for AM65 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_nodtb: u-boot-nodtb {
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for AM65 Board";
                                };
 
                                fdt-0 {
 
 &binman {
        ti-spl_unsigned {
-               filename = "tispl.bin_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_unsigned_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
-
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       atf-bl31 {
-                                               filename = "bl31.bin";
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       tee-os {
-                                               filename = "tee-raw.bin";
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        blob-ext {
                                                filename = "/dev/null";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       blob-ext {
-                                               filename = SPL_NODTB;
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-j721e-common-proc-board";
                                        type = "flat_dt";
 
 &binman {
        u-boot_unsigned {
-               filename = "u-boot.img_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_unsigned_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for AM65 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       blob {
-                                               filename = UBOOT_NODTB;
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for AM65 Board";
                                };
 
                                fdt-0 {
index 14f7dea65ee3e1bccf5fc219fa7d48c3d19c9cd9..10c9d6cba7aa980d8c1016b7491696f1566ac873 100644 (file)
 
 #ifdef CONFIG_TARGET_J7200_A72_EVM
 
-#define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
 #define SPL_J7200_EVM_DTB "spl/dts/k3-j7200-common-proc-board.dtb"
-
-#define UBOOT_NODTB "u-boot-nodtb.bin"
 #define J7200_EVM_DTB "u-boot.dtb"
 
 &binman {
                };
        };
        ti-spl {
-               filename = "tispl.bin";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
-
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       ti-secure {
-                                               content = <&atf>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       atf: atf-bl31 {
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       ti-secure {
-                                               content = <&tee>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       tee: tee-os {
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        ti-secure {
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
-
                                        dm: blob-ext {
                                                filename = "ti-dm.bin";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_spl_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_spl_nodtb: blob-ext {
-                                               filename = SPL_NODTB;
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-j7200-common-proc-board";
                                        type = "flat_dt";
 
 &binman {
        u-boot {
-               filename = "u-boot.img";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for J7200 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_nodtb: u-boot-nodtb {
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for J7200 Board";
                                };
 
                                fdt-0 {
 
 &binman {
        ti-spl_unsigned {
-               filename = "tispl.bin_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_unsigned_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
-
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       atf-bl31 {
-                                               filename = "bl31.bin";
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       tee-os {
-                                               filename = "tee-raw.bin";
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        blob-ext {
                                                filename = "ti-dm.bin";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       blob {
-                                               filename = SPL_NODTB;
-                                       };
-                               };
-
                                fdt-1 {
                                        description = "k3-j7200-common-proc-board";
                                        type = "flat_dt";
 
 &binman {
        u-boot_unsigned {
-               filename = "u-boot.img_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_unsigned_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for J7200 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       blob {
-                                               filename = UBOOT_NODTB;
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for J7200 Board";
                                };
 
                                fdt-1 {
index 4f566c21a9afa10bb5db2c115ec0d0bb20289e39..5ddb474e3a41e96bee57ae2fefd5ad14c1e7f3c9 100644 (file)
        };
        itb {
                filename = "sysfw-j721e_sr1_1-hs-evm.itb";
-               fit {
-                       description = "SYSFW and Config fragments";
-                       #address-cells = <1>;
-                       images {
-                               sysfw.bin {
-                                       description = "sysfw";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       blob-ext {
-                                           filename = "sysfw.bin";
-                                       };
-                               };
-                               board-cfg.bin {
-                                       description = "board-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       ti-secure {
-                                               content = <&board_cfg>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       board_cfg: board-cfg {
-                                               filename = "board-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-
-                               };
-                               pm-cfg.bin {
-                                       description = "pm-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       ti-secure {
-                                               content = <&pm_cfg>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       pm_cfg: pm-cfg {
-                                               filename = "pm-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-                               };
-                               rm-cfg.bin {
-                                       description = "rm-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       ti-secure {
-                                               content = <&rm_cfg>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       rm_cfg: rm-cfg {
-                                               filename = "rm-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-                               };
-                               sec-cfg.bin {
-                                       description = "sec-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       ti-secure {
-                                               content = <&sec_cfg>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       sec_cfg: sec-cfg {
-                                               filename = "sec-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-                               };
-                       };
-               };
+               insert-template = <&itb_template>;
        };
 };
 
        };
        itb_fs {
                filename = "sysfw-j721e_sr2-hs-fs-evm.itb";
-               fit {
-                       description = "SYSFW and Config fragments";
-                       #address-cells = <1>;
-                       images {
-                               sysfw.bin {
-                                       description = "sysfw";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       blob-ext {
-                                           filename = "sysfw.bin_fs";
-                                       };
-                               };
-                               board-cfg.bin {
-                                       description = "board-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       board-cfg {
-                                               filename = "board-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-
-                               };
-                               pm-cfg.bin {
-                                       description = "pm-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       pm-cfg {
-                                               filename = "pm-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-                               };
-                               rm-cfg.bin {
-                                       description = "rm-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       rm-cfg {
-                                               filename = "rm-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-                               };
-                               sec-cfg.bin {
-                                       description = "sec-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       sec-cfg {
-                                               filename = "sec-cfg.bin";
-                                               type = "blob-ext";
-                                       };
-                               };
-                       };
-               };
+               insert-template = <&itb_unsigned_template>;
        };
 };
 
        itb_gp {
                filename = "sysfw-j721e-gp-evm.itb";
                symlink = "sysfw.itb";
+               insert-template = <&itb_unsigned_template>;
+
                fit {
-                       description = "SYSFW and Config fragments";
-                       #address-cells = <1>;
                        images {
                                sysfw.bin {
-                                       description = "sysfw";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
                                        blob-ext {
                                            filename = "sysfw.bin_gp";
                                        };
                                };
-                               board-cfg.bin {
-                                       description = "board-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       blob-ext {
-                                               filename = "board-cfg.bin";
-                                       };
-                               };
-                               pm-cfg.bin {
-                                       description = "pm-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       blob-ext {
-                                               filename = "pm-cfg.bin";
-                                       };
-                               };
-                               rm-cfg.bin {
-                                       description = "rm-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       blob-ext {
-                                               filename = "rm-cfg.bin";
-                                       };
-                               };
-                               sec-cfg.bin {
-                                       description = "sec-cfg";
-                                       type = "firmware";
-                                       arch = "arm";
-                                       compression = "none";
-                                       blob-ext {
-                                               filename = "sec-cfg.bin";
-                                       };
-                               };
                        };
                };
        };
 
 #ifdef CONFIG_TARGET_J721E_A72_EVM
 
-#define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
 #define SPL_J721E_EVM_DTB "spl/dts/k3-j721e-common-proc-board.dtb"
 #define SPL_J721E_SK_DTB "spl/dts/k3-j721e-sk.dtb"
 
-#define UBOOT_NODTB "u-boot-nodtb.bin"
 #define J721E_EVM_DTB "u-boot.dtb"
 #define J721E_SK_DTB "arch/arm/dts/k3-j721e-sk.dtb"
 
                };
        };
        ti-spl {
-               filename = "tispl.bin";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
-
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       ti-secure {
-                                               content = <&atf>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       atf: atf-bl31 {
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       ti-secure {
-                                               content = <&tee>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       tee: tee-os {
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        ti-secure {
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_spl_nodtb>;
-                                               keyfile = "custMpk.pem";
-
-                                       };
-                                       u_boot_spl_nodtb: blob-ext {
-                                               filename = SPL_NODTB;
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-j721e-common-proc-board";
                                        type = "flat_dt";
 
 &binman {
        u-boot {
-               filename = "u-boot.img";
-               pad-byte = <0xff>;
-
+               insert-template = <&u_boot_template>;
                fit {
-                       description = "FIT image with multiple configurations";
 
                        images {
                                uboot {
-                                       description = "U-Boot for j721e board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_nodtb: u-boot-nodtb {
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for J721E Board";
                                };
 
                                fdt-0 {
 
 &binman {
        ti-spl_unsigned {
-               filename = "tispl.bin_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_unsigned_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
-
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       atf-bl31 {
-                                               filename = "bl31.bin";
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       tee-os {
-                                               filename = "tee-raw.bin";
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        blob-ext {
                                                filename = "ti-dm.bin";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       blob-ext {
-                                               filename = SPL_NODTB;
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-j721e-common-proc-board";
                                        type = "flat_dt";
 
 &binman {
        u-boot_unsigned {
-               filename = "u-boot.img_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_unsigned_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for j721e board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       blob {
-                                               filename = UBOOT_NODTB;
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for J721E Board";
                                };
 
                                fdt-0 {
index 5bca4e94ecf9d95896a63d9f535510d0915c2f35..3922007b3b7a495f3a27e3b85cdf9c66ceae045a 100644 (file)
 
 #ifdef CONFIG_TARGET_J721S2_A72_EVM
 
-#define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
 #define SPL_J721S2_EVM_DTB "spl/dts/k3-j721s2-common-proc-board.dtb"
 #define SPL_AM68_SK_DTB "spl/dts/k3-am68-sk-base-board.dtb"
 
-#define UBOOT_NODTB "u-boot-nodtb.bin"
 #define J721S2_EVM_DTB "u-boot.dtb"
 #define AM68_SK_DTB "arch/arm/dts/k3-am68-sk-base-board.dtb"
 
                };
        };
        ti-spl {
-               filename = "tispl.bin";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
-
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       ti-secure {
-                                               content = <&atf>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       atf: atf-bl31 {
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       ti-secure {
-                                               content = <&tee>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       tee: tee-os {
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        ti-secure {
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_spl_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_spl_nodtb: blob-ext {
-                                               filename = SPL_NODTB;
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-j721s2-common-proc-board";
                                        type = "flat_dt";
 
 &binman {
        u-boot {
-               filename = "u-boot.img";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for J721S2 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       ti-secure {
-                                               content = <&u_boot_nodtb>;
-                                               keyfile = "custMpk.pem";
-                                       };
-                                       u_boot_nodtb: u-boot-nodtb {
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for J721S2 Board";
                                };
 
                                fdt-0 {
 
 &binman {
        ti-spl_unsigned {
-               filename = "tispl.bin_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&ti_spl_unsigned_template>;
 
                fit {
-                       description = "Configuration to load ATF and SPL";
-                       #address-cells = <1>;
-
                        images {
-
-                               atf {
-                                       description = "ARM Trusted Firmware";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "arm-trusted-firmware";
-                                       load = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       entry = <CONFIG_K3_ATF_LOAD_ADDR>;
-                                       atf-bl31 {
-                                               filename = "bl31.bin";
-                                       };
-                               };
-
-                               tee {
-                                       description = "OP-TEE";
-                                       type = "tee";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       os = "tee";
-                                       load = <0x9e800000>;
-                                       entry = <0x9e800000>;
-                                       tee-os {
-                                               filename = "tee-raw.bin";
-                                       };
-                               };
-
                                dm {
-                                       description = "DM binary";
-                                       type = "firmware";
-                                       arch = "arm32";
-                                       compression = "none";
-                                       os = "DM";
-                                       load = <0x89000000>;
-                                       entry = <0x89000000>;
                                        blob-ext {
                                                filename = "ti-dm.bin";
                                        };
                                };
 
-                               spl {
-                                       description = "SPL (64-bit)";
-                                       type = "standalone";
-                                       os = "U-Boot";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <CONFIG_SPL_TEXT_BASE>;
-                                       entry = <CONFIG_SPL_TEXT_BASE>;
-                                       blob {
-                                               filename = "spl/u-boot-spl-nodtb.bin";
-                                       };
-                               };
-
                                fdt-0 {
                                        description = "k3-j721s2-common-proc-board";
                                        type = "flat_dt";
 
 &binman {
        u-boot_unsigned {
-               filename = "u-boot.img_unsigned";
-               pad-byte = <0xff>;
+               insert-template = <&u_boot_unsigned_template>;
 
                fit {
-                       description = "FIT image with multiple configurations";
-
                        images {
                                uboot {
-                                       description = "U-Boot for J721S2 board";
-                                       type = "firmware";
-                                       os = "u-boot";
-                                       arch = "arm";
-                                       compression = "none";
-                                       load = <CONFIG_TEXT_BASE>;
-                                       blob {
-                                               filename = UBOOT_NODTB;
-                                       };
-                                       hash {
-                                               algo = "crc32";
-                                       };
+                                       description = "U-Boot for J721S2 Board";
                                };
 
                                fdt-0 {