[PATCH v2 2/2] arm: dts: k3-am625: add template for tispl.bin
Anshul Dalal <[email protected]>
| Newsgroups | gmane.comp.boot-loaders.u-boot |
|---|---|
| Message-ID | <[email protected]> |
This patch addresses the duplication of the binman nodes responsible for generating tispl.bin and tispl.bin_unsigned for TI's AM625 SoC based boards. The common nodes are factored out into a template in the SoC level k3-am625-binman.dtsi that each board in-turn includes. No functional change is intended from the patch asides from the addition of tifsstub-hs and tifsstub-fs nodes in beagleplay's tispl.bin which should have no consequence asides from growing the binary size by few kilo bytes. Signed-off-by: Anshul Dalal <[email protected]> --- arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 92 +------ arch/arm/dts/k3-am625-binman.dtsi | 240 +++++++++++++++++ arch/arm/dts/k3-am625-phycore-som-binman.dtsi | 241 +---------------- arch/arm/dts/k3-am625-sk-binman.dtsi | 313 +++------------------- arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi | 185 +------------ 5 files changed, 282 insertions(+), 789 deletions(-) diff --git a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi index 78d69499314e..d06cbd899c2a 100644 --- a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi +++ b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi @@ -63,99 +63,11 @@ #define AM625_BEAGLEPLAY_DTB "dts/upstream/src/arm64/ti/k3-am625-beagleplay.dtb" &binman { - tifsstub-gp { - filename = "tifsstub.bin_gp"; - ti-secure-rom { - content = <&tifsstub_gp>; - core = "secure"; - load = <0x60000>; - sw-rev = <CONFIG_K3_X509_SWRV>; - keyfile = "ti-degenerate-key.pem"; - tifsstub; - }; - tifsstub_gp: tifsstub-gp.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-gp.bin"; - type = "blob-ext"; - optional; - }; - }; - ti-spl_unsigned { - filename = "tispl.bin_unsigned"; + insert-template = <&ti_spl_unsigned_am625_template>; symlink = "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>; - atf-bl31 { - filename = "bl31.bin"; - }; - }; - - tee { - description = "OP-TEE"; - type = "tee"; - arch = "arm64"; - compression = "none"; - os = "tee"; - load = <CONFIG_K3_OPTEE_LOAD_ADDR>; - entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; - tee-os { - filename = "tee-raw.bin"; - }; - }; - - tifsstub-gp { - description = "tifsstub"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-gp"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_gp"; - }; - }; - - dm { - description = "DM binary"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "DM"; - load = <0x89000000>; - entry = <0x89000000>; - ti-dm { - filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; - }; - }; - - 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-beagleplay"; type = "flat_dt"; @@ -166,10 +78,8 @@ }; }; }; - configurations { default = "conf-0"; - conf-0 { description = "k3-am625-beagleplay"; firmware = "atf"; diff --git a/arch/arm/dts/k3-am625-binman.dtsi b/arch/arm/dts/k3-am625-binman.dtsi index a96a2006a087..78ea422b85d9 100644 --- a/arch/arm/dts/k3-am625-binman.dtsi +++ b/arch/arm/dts/k3-am625-binman.dtsi @@ -120,3 +120,243 @@ }; }; }; + +#ifdef CONFIG_ARM64 + +&binman { + tifsstub-hs { + filename = "tifsstub.bin_hs"; + ti-secure-rom { + content = <&tifsstub_hs_cert>; + core = "secure"; + load = <0x40000>; + sw-rev = <CONFIG_K3_X509_SWRV>; + keyfile = "custMpk.pem"; + countersign; + tifsstub; + }; + tifsstub_hs_cert: tifsstub-hs-cert.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; + type = "blob-ext"; + optional; + }; + tifsstub_hs_enc: tifsstub-hs-enc.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; + type = "blob-ext"; + optional; + }; + }; + + tifsstub-fs { + filename = "tifsstub.bin_fs"; + tifsstub_fs_cert: tifsstub-fs-cert.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; + type = "blob-ext"; + optional; + }; + tifsstub_fs_enc: tifsstub-fs-enc.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; + type = "blob-ext"; + optional; + }; + }; + + tifsstub-gp { + filename = "tifsstub.bin_gp"; + ti-secure-rom { + content = <&tifsstub_gp>; + core = "secure"; + load = <0x60000>; + sw-rev = <CONFIG_K3_X509_SWRV>; + keyfile = "ti-degenerate-key.pem"; + tifsstub; + }; + tifsstub_gp: tifsstub-gp.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-gp.bin"; + type = "blob-ext"; + optional; + }; + }; + + ti_falcon_am625_template: template-ti-falcon { + insert-template = <&ti_falcon_template>; + fit { + images { + tifsstub-hs { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-hs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_hs"; + }; + }; + tifsstub-fs { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-fs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_fs"; + }; + }; + tifsstub-gp { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-gp"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_gp"; + }; + }; + dm { + ti-secure { + content = <&dm_falcon>; + keyfile = "custMpk.pem"; + }; + dm_falcon: ti-dm { + filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; + }; + }; + }; + }; + }; + + ti_spl_am625_template: template-ti-spl { + insert-template = <&ti_spl_template>; + fit { + images { + atf { + ti-secure { + auth-in-place = <0xa02>; + firewall-1-0 { + insert-template = <&firewall_bg_3>; + id = <1>; + region = <0>; + }; + firewall-1-1 { + insert-template = <&firewall_armv8_atf_fg>; + id = <1>; + region = <1>; + }; + }; + }; + tee { + ti-secure { + auth-in-place = <0xa02>; + firewall-1-2 { + insert-template = <&firewall_armv8_optee_fg>; + id = <1>; + region = <2>; + }; + }; + }; + tifsstub-hs { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-hs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_hs"; + }; + }; + tifsstub-fs { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-fs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_fs"; + }; + }; + tifsstub-gp { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-gp"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_gp"; + }; + }; + dm { + ti-secure { + content = <&dm>; + keyfile = "custMpk.pem"; + }; + dm: ti-dm { + filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; + }; + }; + }; + }; + }; + + ti_spl_unsigned_am625_template: template-ti-spl_unsigned { + insert-template = <&ti_spl_unsigned_template>; + fit { + images { + tifsstub-hs { + description = "tifsstub"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-hs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_hs"; + }; + }; + tifsstub-fs { + description = "tifsstub"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-fs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_fs"; + }; + }; + tifsstub-gp { + description = "tifsstub"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-gp"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_gp"; + }; + }; + dm { + ti-dm { + filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; + }; + }; + }; + }; + }; +}; + +#endif diff --git a/arch/arm/dts/k3-am625-phycore-som-binman.dtsi b/arch/arm/dts/k3-am625-phycore-som-binman.dtsi index d09bdf29a95d..12f8acffc4a4 100644 --- a/arch/arm/dts/k3-am625-phycore-som-binman.dtsi +++ b/arch/arm/dts/k3-am625-phycore-som-binman.dtsi @@ -50,146 +50,10 @@ #define AM625_PHYBOARD_LYRA_DTB "u-boot.dtb" &binman { - tifsstub-hs { - filename = "tifsstub.bin_hs"; - ti-secure-rom { - content = <&tifsstub_hs_cert>; - core = "secure"; - load = <0x40000>; - sw-rev = <CONFIG_K3_X509_SWRV>; - keyfile = "custMpk.pem"; - countersign; - tifsstub; - }; - tifsstub_hs_cert: tifsstub-hs-cert.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; - type = "blob-ext"; - optional; - }; - tifsstub_hs_enc: tifsstub-hs-enc.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; - type = "blob-ext"; - optional; - }; - }; - - tifsstub-fs { - filename = "tifsstub.bin_fs"; - tifsstub_fs_cert: tifsstub-fs-cert.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; - type = "blob-ext"; - optional; - }; - tifsstub_fs_enc: tifsstub-fs-enc.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; - type = "blob-ext"; - optional; - }; - - }; - - tifsstub-gp { - filename = "tifsstub.bin_gp"; - ti-secure-rom { - content = <&tifsstub_gp>; - core = "secure"; - load = <0x60000>; - sw-rev = <CONFIG_K3_X509_SWRV>; - keyfile = "ti-degenerate-key.pem"; - tifsstub; - }; - tifsstub_gp: tifsstub-gp.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-gp.bin"; - type = "blob-ext"; - optional; - }; - }; - - ti-spl { - insert-template = <&ti_spl_template>; - + insert-template = <&ti_spl_am625_template>; fit { - images { - atf { - ti-secure { - auth-in-place = <0xa02>; - - firewall-1-0 { - insert-template = <&firewall_bg_3>; - id = <1>; - region = <0>; - }; - - firewall-1-1 { - insert-template = <&firewall_armv8_atf_fg>; - id = <1>; - region = <1>; - }; - }; - }; - - tee { - ti-secure { - auth-in-place = <0xa02>; - - firewall-1-2 { - insert-template = <&firewall_armv8_optee_fg>; - id = <1>; - region = <2>; - }; - }; - }; - - tifsstub-hs { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-hs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_hs"; - }; - }; - - tifsstub-fs { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-fs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_fs"; - }; - }; - - tifsstub-gp { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-gp"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_gp"; - }; - }; - dm { - ti-secure { - content = <&dm>; - keyfile = "custMpk.pem"; - }; - dm: ti-dm { - filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; - }; - }; - fdt-0 { description = "k3-am625-phyboard-lyra-rdk"; type = "flat_dt"; @@ -338,111 +202,10 @@ }; &binman { - tifsstub-hs { - filename = "tifsstub.bin_hs"; - ti-secure-rom { - content = <&tifsstub_hs_cert>; - core = "secure"; - load = <0x40000>; - sw-rev = <CONFIG_K3_X509_SWRV>; - keyfile = "custMpk.pem"; - countersign; - tifsstub; - }; - tifsstub_hs_cert: tifsstub-hs-cert.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; - type = "blob-ext"; - optional; - }; - tifsstub_hs_enc: tifsstub-hs-enc.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; - type = "blob-ext"; - optional; - }; - }; - - tifsstub-fs { - filename = "tifsstub.bin_fs"; - tifsstub_fs_cert: tifsstub-fs-cert.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; - type = "blob-ext"; - optional; - }; - tifsstub_fs_enc: tifsstub-fs-enc.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; - type = "blob-ext"; - optional; - }; - - }; - - tifsstub-gp { - filename = "tifsstub.bin_gp"; - ti-secure-rom { - content = <&tifsstub_gp>; - core = "secure"; - load = <0x60000>; - sw-rev = <CONFIG_K3_X509_SWRV>; - keyfile = "ti-degenerate-key.pem"; - tifsstub; - }; - tifsstub_gp: tifsstub-gp.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-gp.bin"; - type = "blob-ext"; - optional; - }; - }; - ti-spl_unsigned { - insert-template = <&ti_spl_unsigned_template>; - + insert-template = <&ti_spl_unsigned_am625_template>; fit { images { - tifsstub-hs { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-hs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_hs"; - }; - }; - - tifsstub-fs { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-fs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_fs"; - }; - }; - - tifsstub-gp { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-gp"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_gp"; - }; - }; - - dm { - ti-dm { - filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; - }; - }; - fdt-0 { description = "k3-am625-phyboard-lyra-rdk"; type = "flat_dt"; diff --git a/arch/arm/dts/k3-am625-sk-binman.dtsi b/arch/arm/dts/k3-am625-sk-binman.dtsi index 9ac0c36f8645..08edf7f32519 100644 --- a/arch/arm/dts/k3-am625-sk-binman.dtsi +++ b/arch/arm/dts/k3-am625-sk-binman.dtsi @@ -46,113 +46,9 @@ #define AM625_SK_DTB "u-boot.dtb" &binman { - tifsstub-hs { - filename = "tifsstub.bin_hs"; - ti-secure-rom { - content = <&tifsstub_hs_cert>; - core = "secure"; - load = <0x40000>; - sw-rev = <CONFIG_K3_X509_SWRV>; - keyfile = "custMpk.pem"; - countersign; - tifsstub; - }; - tifsstub_hs_cert: tifsstub-hs-cert.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; - type = "blob-ext"; - optional; - }; - tifsstub_hs_enc: tifsstub-hs-enc.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; - type = "blob-ext"; - optional; - }; - }; - - tifsstub-fs { - filename = "tifsstub.bin_fs"; - tifsstub_fs_cert: tifsstub-fs-cert.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; - type = "blob-ext"; - optional; - }; - tifsstub_fs_enc: tifsstub-fs-enc.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; - type = "blob-ext"; - optional; - }; - - }; - - tifsstub-gp { - filename = "tifsstub.bin_gp"; - ti-secure-rom { - content = <&tifsstub_gp>; - core = "secure"; - load = <0x60000>; - sw-rev = <CONFIG_K3_X509_SWRV>; - keyfile = "ti-degenerate-key.pem"; - tifsstub; - }; - tifsstub_gp: tifsstub-gp.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-gp.bin"; - type = "blob-ext"; - optional; - }; - }; - ti-falcon { - insert-template = <&ti_falcon_template>; - + insert-template = <&ti_falcon_am625_template>; fit { - images { - tifsstub-hs { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-hs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_hs"; - }; - }; - tifsstub-fs { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-fs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_fs"; - }; - }; - tifsstub-gp { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-gp"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_gp"; - }; - }; - dm { - ti-secure { - content = <&dm_falcon>; - keyfile = "custMpk.pem"; - }; - dm_falcon: ti-dm { - filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; - }; - }; - }; - configurations { default = "conf-hs-fs"; conf-hs-fs { @@ -175,109 +71,63 @@ }; ti-spl { - insert-template = <&ti_spl_template>; - + insert-template = <&ti_spl_am625_template>; fit { images { - atf { - ti-secure { - auth-in-place = <0xa02>; - - firewall-1-0 { - insert-template = <&firewall_bg_3>; - id = <1>; - region = <0>; - }; - - firewall-1-1 { - insert-template = <&firewall_armv8_atf_fg>; - id = <1>; - region = <1>; - }; - }; - }; - - tee { + fdt-0 { + description = "k3-am625-sk"; + type = "flat_dt"; + arch = "arm"; + compression = "none"; ti-secure { - auth-in-place = <0xa02>; - - firewall-1-2 { - insert-template = <&firewall_armv8_optee_fg>; - id = <1>; - region = <2>; - }; + content = <&spl_am625_sk_dtb>; + keyfile = "custMpk.pem"; }; - }; - - tifsstub-hs { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-hs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_hs"; + spl_am625_sk_dtb: blob-ext { + filename = SPL_AM625_SK_DTB; }; }; - - tifsstub-fs { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-fs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_fs"; - }; + }; + configurations { + default = "conf-hs-fs"; + conf-hs-fs { + description = "k3-am625-sk-hs-fs"; + firmware = "atf"; + loadables = "tee", "tifsstub-fs", "dm", "spl"; + fdt = "fdt-0"; }; - - tifsstub-gp { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-gp"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_gp"; - }; + conf-hs-se { + description = "k3-am625-sk-hs-se"; + firmware = "atf"; + loadables = "tee", "tifsstub-hs", "dm", "spl"; + fdt = "fdt-0"; }; - - dm { - ti-secure { - content = <&dm>; - keyfile = "custMpk.pem"; - }; - dm: ti-dm { - filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; - }; + conf-gp { + description = "k3-am625-sk-gp"; + firmware = "atf"; + loadables = "tee", "tifsstub-gp", "dm", "spl"; + fdt = "fdt-0"; }; + }; + }; + }; + ti-spl_unsigned { + insert-template = <&ti_spl_unsigned_am625_template>; + fit { + images { fdt-0 { description = "k3-am625-sk"; type = "flat_dt"; arch = "arm"; compression = "none"; - ti-secure { - content = <&spl_am625_sk_dtb>; - keyfile = "custMpk.pem"; - }; - spl_am625_sk_dtb: blob-ext { + spl_am625_sk_dtb_unsigned: blob { filename = SPL_AM625_SK_DTB; }; - }; - }; - configurations { default = "conf-hs-fs"; - conf-hs-fs { description = "k3-am625-sk-hs-fs"; firmware = "atf"; @@ -344,95 +194,6 @@ }; }; -&binman { - ti-spl_unsigned { - insert-template = <&ti_spl_unsigned_template>; - - fit { - images { - - tifsstub-hs { - description = "tifsstub"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-hs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_hs"; - }; - }; - - tifsstub-fs { - description = "tifsstub"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-fs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_fs"; - }; - }; - - tifsstub-gp { - description = "tifsstub"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-gp"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_gp"; - }; - }; - - dm { - ti-dm { - filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; - }; - }; - - fdt-0 { - description = "k3-am625-sk"; - type = "flat_dt"; - arch = "arm"; - compression = "none"; - spl_am625_sk_dtb_unsigned: blob { - filename = SPL_AM625_SK_DTB; - }; - }; - }; - - configurations { - default = "conf-hs-fs"; - - conf-hs-fs { - description = "k3-am625-sk-hs-fs"; - firmware = "atf"; - loadables = "tee", "tifsstub-fs", "dm", "spl"; - fdt = "fdt-0"; - }; - conf-hs-se { - description = "k3-am625-sk-hs-se"; - firmware = "atf"; - loadables = "tee", "tifsstub-hs", "dm", "spl"; - fdt = "fdt-0"; - }; - conf-gp { - description = "k3-am625-sk-gp"; - firmware = "atf"; - loadables = "tee", "tifsstub-gp", "dm", "spl"; - fdt = "fdt-0"; - }; - }; - }; - }; -}; - &binman { u-boot_unsigned { insert-template = <&u_boot_unsigned_template>; diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi index c57780d876d6..527b04936fcb 100644 --- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi +++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi @@ -35,146 +35,10 @@ #define VERDIN_AM62_DTB "u-boot.dtb" &binman { - tifsstub-hs { - filename = "tifsstub.bin_hs"; - ti-secure-rom { - content = <&tifsstub_hs_cert>; - core = "secure"; - load = <0x40000>; - sw-rev = <CONFIG_K3_X509_SWRV>; - keyfile = "custMpk.pem"; - countersign; - tifsstub; - }; - tifsstub_hs_cert: tifsstub-hs-cert.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; - type = "blob-ext"; - optional; - }; - tifsstub_hs_enc: tifsstub-hs-enc.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; - type = "blob-ext"; - optional; - }; - }; - - tifsstub-fs { - filename = "tifsstub.bin_fs"; - tifsstub_fs_cert: tifsstub-fs-cert.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; - type = "blob-ext"; - optional; - }; - tifsstub_fs_enc: tifsstub-fs-enc.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; - type = "blob-ext"; - optional; - }; - - }; - - tifsstub-gp { - filename = "tifsstub.bin_gp"; - ti-secure-rom { - content = <&tifsstub_gp>; - core = "secure"; - load = <0x60000>; - sw-rev = <CONFIG_K3_X509_SWRV>; - keyfile = "ti-degenerate-key.pem"; - tifsstub; - }; - tifsstub_gp: tifsstub-gp.bin { - filename = "ti-sysfw/ti-fs-stub-firmware-am62x-gp.bin"; - type = "blob-ext"; - optional; - }; - }; - ti-spl { - insert-template = <&ti_spl_template>; - + insert-template = <&ti_spl_am625_template>; fit { - images { - atf { - ti-secure { - auth-in-place = <0xa02>; - - firewall-1-0 { - insert-template = <&firewall_bg_3>; - id = <1>; - region = <0>; - }; - - firewall-1-1 { - insert-template = <&firewall_armv8_atf_fg>; - id = <1>; - region = <1>; - }; - }; - }; - - tee { - ti-secure { - auth-in-place = <0xa02>; - - firewall-1-2 { - insert-template = <&firewall_armv8_optee_fg>; - id = <1>; - region = <2>; - }; - }; - }; - - tifsstub-hs { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-hs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_hs"; - }; - }; - - tifsstub-fs { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-fs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_fs"; - }; - }; - - tifsstub-gp { - description = "TIFSSTUB"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-gp"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_gp"; - }; - }; - - dm { - ti-secure { - content = <&dm>; - keyfile = "custMpk.pem"; - }; - dm: ti-dm { - filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; - }; - }; - fdt-0 { description = "k3-am625-verdin-wifi-dev"; type = "flat_dt"; @@ -260,55 +124,10 @@ &binman { ti-spl_unsigned { - insert-template = <&ti_spl_unsigned_template>; + insert-template = <&ti_spl_unsigned_am625_template>; fit { images { - tifsstub-hs { - description = "tifsstub"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-hs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_hs"; - }; - }; - - tifsstub-fs { - description = "tifsstub"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-fs"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_fs"; - }; - }; - - tifsstub-gp { - description = "tifsstub"; - type = "firmware"; - arch = "arm32"; - compression = "none"; - os = "tifsstub-gp"; - load = <0x9dc00000>; - entry = <0x9dc00000>; - blob-ext { - filename = "tifsstub.bin_gp"; - }; - }; - - dm { - ti-dm { - filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; - }; - }; - fdt-0 { description = "k3-am625-verdin-wifi-dev"; type = "flat_dt"; -- 2.55.0