Support added for HS-SE, HS-FS and GP boot binaries for AM62ax.

HS-SE:
    * tiboot3-am62ax-hs-evm.bin
    * tispl.bin
    * u-boot.img

HS-FS:
    * tiboot3-am62ax-hs-fs-evm.bin
    * tispl.bin
    * u-boot.img

GP:
    * tiboot3.bin --> tiboot3-am62ax-gp-evm.bin
    * tispl.bin_unsigned
    * u-boot.img_unsigned

It is to be noted that the bootflow followed by AM62ax requires:

tiboot3.bin:
        * R5 SPL
        * R5 SPL dtbs
        * TIFS
        * board-cfg
        * pm-cfg
        * sec-cfg
        * rm-cfg

tispl.bin:
        * DM
        * ATF
        * OPTEE
        * A72 SPL
        * A72 SPL dtbs

u-boot.img:
        * A72 U-Boot
        * A72 U-Boot dtbs

Signed-off-by: Neha Malcom Francis <n-fran...@ti.com>
Reviewed-by: Simon Glass <s...@chromium.org>
[a...@ti.com: changed output binary names appropriately]
Signed-off-by: Andrew Davis <a...@ti.com>
---
 arch/arm/dts/k3-am62a-sk-binman.dtsi | 466 +++++++++++++++++++++++++++
 arch/arm/dts/k3-am62a7-r5-sk.dts     |   1 +
 arch/arm/dts/k3-am62a7-sk.dts        |   1 +
 board/ti/am62ax/Kconfig              |   2 +
 4 files changed, 470 insertions(+)
 create mode 100644 arch/arm/dts/k3-am62a-sk-binman.dtsi

diff --git a/arch/arm/dts/k3-am62a-sk-binman.dtsi 
b/arch/arm/dts/k3-am62a-sk-binman.dtsi
new file mode 100644
index 0000000000..abbac8f084
--- /dev/null
+++ b/arch/arm/dts/k3-am62a-sk-binman.dtsi
@@ -0,0 +1,466 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+#include "k3-binman.dtsi"
+
+#ifdef CONFIG_TARGET_AM62A7_R5_EVM
+
+&rcfg_yaml_tifs {
+       config = "tifs-rm-cfg.yaml";
+};
+
+&binman {
+       tiboot3-am62ax-hs-evm.bin {
+               filename = "tiboot3-am62ax-hs-evm.bin";
+               ti-secure-rom {
+                       content = <&u_boot_spl>, <&ti_fs_enc>, 
<&combined_tifs_cfg>,
+                               <&combined_dm_cfg>, <&sysfw_inner_cert>;
+                       combined;
+                       dm-data;
+                       sysfw-inner-cert;
+                       keyfile = "custMpk.pem";
+                       sw-rev = <1>;
+                       content-sbl = <&u_boot_spl>;
+                       content-sysfw = <&ti_fs_enc>;
+                       content-sysfw-data = <&combined_tifs_cfg>;
+                       content-sysfw-inner-cert = <&sysfw_inner_cert>;
+                       content-dm-data = <&combined_dm_cfg>;
+                       load = <0x43c00000>;
+                       load-sysfw = <0x40000>;
+                       load-sysfw-data = <0x67000>;
+                       load-dm-data = <0x43c3a800>;
+               };
+               u_boot_spl: u-boot-spl {
+                       no-expanded;
+               };
+               ti_fs_enc: ti-fs-enc.bin {
+                       filename = "ti-sysfw/ti-fs-firmware-am62ax-hs-enc.bin";
+                       type = "blob-ext";
+                       optional;
+               };
+               combined_tifs_cfg: combined-tifs-cfg.bin {
+                       filename = "combined-tifs-cfg.bin";
+                       type = "blob-ext";
+               };
+               sysfw_inner_cert: sysfw-inner-cert {
+                       filename = "ti-sysfw/ti-fs-firmware-am62ax-hs-cert.bin";
+                       type = "blob-ext";
+                       optional;
+               };
+               combined_dm_cfg: combined-dm-cfg.bin {
+                       filename = "combined-dm-cfg.bin";
+                       type = "blob-ext";
+               };
+       };
+};
+
+&binman {
+       tiboot3-am62ax-hs-fs-evm.bin {
+               filename = "tiboot3-am62ax-hs-fs-evm.bin";
+               symlink = "tiboot3.bin";
+               ti-secure-rom {
+                       content = <&u_boot_spl_fs>, <&ti_fs_enc_fs>, 
<&combined_tifs_cfg_fs>,
+                               <&combined_dm_cfg_fs>, <&sysfw_inner_cert_fs>;
+                       combined;
+                       dm-data;
+                       sysfw-inner-cert;
+                       keyfile = "custMpk.pem";
+                       sw-rev = <1>;
+                       content-sbl = <&u_boot_spl_fs>;
+                       content-sysfw = <&ti_fs_enc_fs>;
+                       content-sysfw-data = <&combined_tifs_cfg_fs>;
+                       content-sysfw-inner-cert = <&sysfw_inner_cert_fs>;
+                       content-dm-data = <&combined_dm_cfg_fs>;
+                       load = <0x43c00000>;
+                       load-sysfw = <0x40000>;
+                       load-sysfw-data = <0x67000>;
+                       load-dm-data = <0x43c3a800>;
+               };
+               u_boot_spl_fs: u-boot-spl {
+                       no-expanded;
+               };
+               ti_fs_enc_fs: ti-fs-enc.bin {
+                       filename = 
"ti-sysfw/ti-fs-firmware-am62ax-hs-fs-enc.bin";
+                       type = "blob-ext";
+                       optional;
+               };
+               combined_tifs_cfg_fs: combined-tifs-cfg.bin {
+                       filename = "combined-tifs-cfg.bin";
+                       type = "blob-ext";
+               };
+               sysfw_inner_cert_fs: sysfw-inner-cert {
+                       filename = 
"ti-sysfw/ti-fs-firmware-am62ax-hs-fs-cert.bin";
+                       type = "blob-ext";
+                       optional;
+               };
+               combined_dm_cfg_fs: combined-dm-cfg.bin {
+                       filename = "combined-dm-cfg.bin";
+                       type = "blob-ext";
+               };
+       };
+};
+
+&binman {
+       tiboot3-am62ax-gp-evm.bin {
+               filename = "tiboot3-am62ax-gp-evm.bin";
+               ti-secure-rom {
+                       content = <&u_boot_spl_unsigned>, <&ti_fs_gp>,
+                               <&combined_tifs_cfg_gp>, <&combined_dm_cfg_gp>;
+                       combined;
+                       dm-data;
+                       content-sbl = <&u_boot_spl_unsigned>;
+                       load = <0x43c00000>;
+                       content-sysfw = <&ti_fs_gp>;
+                       load-sysfw = <0x40000>;
+                       content-sysfw-data = <&combined_tifs_cfg_gp>;
+                       load-sysfw-data = <0x67000>;
+                       content-dm-data = <&combined_dm_cfg_gp>;
+                       load-dm-data = <0x43c3a800>;
+                       sw-rev = <1>;
+                       keyfile = "ti-degenerate-key.pem";
+               };
+               u_boot_spl_unsigned: u-boot-spl {
+                       no-expanded;
+               };
+               ti_fs_gp: ti-fs-gp.bin {
+                       filename = "ti-sysfw/ti-fs-firmware-am62ax-gp.bin";
+                       type = "blob-ext";
+                       optional;
+               };
+               combined_tifs_cfg_gp: combined-tifs-cfg-gp.bin {
+                       filename = "combined-tifs-cfg.bin";
+                       type = "blob-ext";
+               };
+               combined_dm_cfg_gp: combined-dm-cfg-gp.bin {
+                       filename = "combined-dm-cfg.bin";
+                       type = "blob-ext";
+               };
+       };
+};
+
+#endif
+
+#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 "arch/arm/dts/k3-am62a7-sk.dtb"
+
+&binman {
+       ti-dm {
+               filename = "ti-dm.bin";
+               blob-ext {
+                       filename = 
"ti-dm/am62axx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+               };
+       };
+       ti-spl {
+               filename = "tispl.bin";
+               pad-byte = <0xff>;
+
+               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 = "OPTEE";
+                                       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-am62a7-sk";
+                                       type = "flat_dt";
+                                       arch = "arm";
+                                       compression = "none";
+                                       ti-secure {
+                                               content = <&spl_am62a7_sk_dtb>;
+                                               keyfile = "custMpk.pem";
+                                       };
+                                       spl_am62a7_sk_dtb: blob-ext {
+                                               filename = SPL_AM62A7_SK_DTB;
+                                       };
+
+                               };
+
+                       };
+
+                       configurations {
+                               default = "conf-0";
+
+                               conf-0 {
+                                       description = "k3-am62a7-sk";
+                                       firmware = "atf";
+                                       loadables = "tee", "dm", "spl";
+                                       fdt = "fdt-0";
+                               };
+                       };
+               };
+       };
+};
+
+&binman {
+       u-boot {
+               filename = "u-boot.img";
+               pad-byte = <0xff>;
+
+               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";
+                                       };
+                               };
+
+                               fdt-0 {
+                                       description = "k3-am62a7-sk";
+                                       type = "flat_dt";
+                                       arch = "arm";
+                                       compression = "none";
+                                       ti-secure {
+                                               content = <&am62a7_sk_dtb>;
+                                               keyfile = "custMpk.pem";
+                                       };
+                                       am62a7_sk_dtb: blob-ext {
+                                               filename = AM62A7_SK_DTB;
+                                       };
+                                       hash {
+                                               algo = "crc32";
+                                       };
+                               };
+                       };
+
+                       configurations {
+                               default = "conf-0";
+
+                               conf-0 {
+                                       description = "k3-am62a7-sk";
+                                       firmware = "uboot";
+                                       loadables = "uboot";
+                                       fdt = "fdt-0";
+                               };
+
+                       };
+               };
+       };
+};
+
+&binman {
+       ti-spl_unsigned {
+               filename = "tispl.bin_unsigned";
+               pad-byte = <0xff>;
+
+               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 = "OPTEE";
+                                       type = "tee";
+                                       arch = "arm64";
+                                       compression = "none";
+                                       os = "tee";
+                                       load = <0x9e800000>;
+                                       entry = <0x9e800000>;
+                                       tee-os {
+                                               filename = "tee-pager_v2.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";
+                                       arch = "arm";
+                                       compression = "none";
+                                       blob {
+                                               filename = SPL_AM62A7_SK_DTB;
+                                       };
+                               };
+                       };
+
+                       configurations {
+                               default = "conf-0";
+
+                               conf-0 {
+                                       description = "k3-am62a7-sk";
+                                       firmware = "atf";
+                                       loadables = "tee", "dm", "spl";
+                                       fdt = "fdt-0";
+                               };
+                       };
+               };
+       };
+};
+
+&binman {
+       u-boot_unsigned {
+               filename = "u-boot.img_unsigned";
+               pad-byte = <0xff>;
+
+               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";
+                                       };
+                               };
+
+                               fdt-0 {
+                                       description = "k3-am62a7-sk";
+                                       type = "flat_dt";
+                                       arch = "arm";
+                                       compression = "none";
+                                       blob {
+                                               filename = AM62A7_SK_DTB;
+                                       };
+                                       hash {
+                                               algo = "crc32";
+                                       };
+                               };
+                       };
+
+                       configurations {
+                               default = "conf-0";
+
+                               conf-0 {
+                                       description = "k3-am62a7-sk";
+                                       firmware = "uboot";
+                                       loadables = "uboot";
+                                       fdt = "fdt-0";
+                               };
+                       };
+               };
+       };
+};
+#endif
diff --git a/arch/arm/dts/k3-am62a7-r5-sk.dts b/arch/arm/dts/k3-am62a7-r5-sk.dts
index cc4b179e27..bbbd9e51d6 100644
--- a/arch/arm/dts/k3-am62a7-r5-sk.dts
+++ b/arch/arm/dts/k3-am62a7-r5-sk.dts
@@ -7,6 +7,7 @@
 #include "k3-am62a7-sk.dts"
 #include "k3-am62a-ddr-1866mhz-32bit.dtsi"
 #include "k3-am62a-ddr.dtsi"
+#include "k3-am62a-sk-binman.dtsi"
 
 #include "k3-am62a7-sk-u-boot.dtsi"
 
diff --git a/arch/arm/dts/k3-am62a7-sk.dts b/arch/arm/dts/k3-am62a7-sk.dts
index b08a083d72..270e669f65 100644
--- a/arch/arm/dts/k3-am62a7-sk.dts
+++ b/arch/arm/dts/k3-am62a7-sk.dts
@@ -10,6 +10,7 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/gpio/gpio.h>
 #include "k3-am62a7.dtsi"
+#include "k3-am62a-sk-binman.dtsi"
 
 / {
        compatible =  "ti,am62a7-sk", "ti,am62a7";
diff --git a/board/ti/am62ax/Kconfig b/board/ti/am62ax/Kconfig
index 9b868e4553..61f289facc 100644
--- a/board/ti/am62ax/Kconfig
+++ b/board/ti/am62ax/Kconfig
@@ -10,6 +10,7 @@ choice
 config TARGET_AM62A7_A53_EVM
        bool "TI K3 based AM62A7 EVM running on A53"
        select ARM64
+       select BINMAN
        imply BOARD
        imply SPL_BOARD
        imply TI_I2C_BOARD_DETECT
@@ -22,6 +23,7 @@ config TARGET_AM62A7_R5_EVM
        select RAM
        select SPL_RAM
        select K3_DDRSS
+       select BINMAN
        imply SYS_K3_SPL_ATF
        imply TI_I2C_BOARD_DETECT
 
-- 
2.34.1

Reply via email to