To show what is the end goal of this patch series. While u-boot.img_unsigned and tispl.bin_unsigned are generated as expected, nodes with signing within aren't.
Signed-off-by: Neha Malcom Francis <n-fran...@ti.com> --- arch/arm/dts/k3-j721e-binman.dtsi | 155 ++++++------------------------ 1 file changed, 31 insertions(+), 124 deletions(-) diff --git a/arch/arm/dts/k3-j721e-binman.dtsi b/arch/arm/dts/k3-j721e-binman.dtsi index 339e909501..d392a030df 100644 --- a/arch/arm/dts/k3-j721e-binman.dtsi +++ b/arch/arm/dts/k3-j721e-binman.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0; /* * Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ */ @@ -316,6 +316,8 @@ fit { description = "Configuration to load ATF and SPL"; #address-cells = <1>; + fit,fdt-list = "of-list"; + fit,fdt-indir = "spl/dts"; images { @@ -386,51 +388,25 @@ }; }; - fdt-0 { - description = "k3-j721e-common-proc-board"; + @fdt-SEQ { + description = "NAME"; type = "flat_dt"; arch = "arm"; compression = "none"; ti-secure { - content = <&spl_j721e_evm_dtb>; keyfile = "custMpk.pem"; }; - spl_j721e_evm_dtb: blob-ext { - filename = SPL_J721E_EVM_DTB; - }; - }; - - fdt-1 { - description = "k3-j721e-sk"; - type = "flat_dt"; - arch = "arm"; - compression = "none"; - ti-secure { - content = <&spl_j721e_sk_dtb>; - keyfile = "custMpk.pem"; - - }; - spl_j721e_sk_dtb: blob-ext { - filename = SPL_J721E_SK_DTB; - }; }; }; configurations { - default = "conf-0"; - - conf-0 { - description = "k3-j721e-common-proc-board"; - firmware = "atf"; - loadables = "tee", "dm", "spl"; - fdt = "fdt-0"; - }; + default = "@conf-DEFAULT-SEQ"; - conf-1 { - description = "k3-j721e-sk"; + @conf-SEQ { + description = "NAME"; firmware = "atf"; loadables = "tee", "dm", "spl"; - fdt = "fdt-1"; + fdt = "fdt-SEQ"; }; }; }; @@ -444,6 +420,7 @@ fit { description = "FIT image with multiple configurations"; + fit,fdt-list = "of-list"; images { uboot { @@ -464,36 +441,13 @@ }; }; - fdt-0 { - description = "k3-j721e-common-proc-board"; - type = "flat_dt"; - arch = "arm"; - compression = "none"; - ti-secure { - content = <&j721e_evm_dtb>; - keyfile = "custMpk.pem"; - - }; - j721e_evm_dtb: blob-ext { - filename = J721E_EVM_DTB; - }; - hash { - algo = "crc32"; - }; - }; - - fdt-1 { - description = "k3-j721e-sk"; + @fdt-SEQ { + description = "NAME"; type = "flat_dt"; arch = "arm"; compression = "none"; ti-secure { - content = <&j721e_sk_dtb>; keyfile = "custMpk.pem"; - - }; - j721e_sk_dtb: blob-ext { - filename = J721E_SK_DTB; }; hash { algo = "crc32"; @@ -502,20 +456,13 @@ }; configurations { - default = "conf-0"; + default = "@conf-DEFAULT-SEQ"; - conf-0 { - description = "k3-j721e-common-proc-board"; + @conf-SEQ { + description = "NAME"; firmware = "uboot"; loadables = "uboot"; - fdt = "fdt-0"; - }; - - conf-1 { - description = "k3-j721e-sk"; - firmware = "uboot"; - loadables = "uboot"; - fdt = "fdt-1"; + fdt = "fdt-SEQ"; }; }; }; @@ -530,6 +477,8 @@ fit { description = "Configuration to load ATF and SPL"; #address-cells = <1>; + fit,fdt-list = "of-list"; + fit,fdt-indir = "spl/dts"; images { @@ -585,42 +534,22 @@ }; }; - fdt-0 { - description = "k3-j721e-common-proc-board"; - type = "flat_dt"; - arch = "arm"; - compression = "none"; - blob { - filename = SPL_J721E_EVM_DTB; - }; - }; - - fdt-1 { - description = "k3-j721e-sk"; + @fdt-SEQ { + description = "NAME"; type = "flat_dt"; arch = "arm"; compression = "none"; - blob { - filename = SPL_J721E_SK_DTB; - }; }; }; configurations { - default = "conf-0"; - - conf-0 { - description = "k3-j721e-common-proc-board"; - firmware = "atf"; - loadables = "tee", "dm", "spl"; - fdt = "fdt-0"; - }; + default = "@conf-DEFAULT-SEQ"; - conf-1 { - description = "k3-j721e-sk"; + @conf-SEQ { + description = "NAME"; firmware = "atf"; loadables = "tee", "dm", "spl"; - fdt = "fdt-1"; + fdt = "fdt-SEQ"; }; }; }; @@ -634,6 +563,7 @@ fit { description = "FIT image with multiple configurations"; + fit,fdt-list = "of-list"; images { uboot { @@ -651,27 +581,11 @@ }; }; - fdt-0 { - description = "k3-j721e-common-proc-board"; + @fdt-SEQ { + description = "NAME"; type = "flat_dt"; arch = "arm"; compression = "none"; - blob { - filename = J721E_EVM_DTB; - }; - hash { - algo = "crc32"; - }; - }; - - fdt-1 { - description = "k3-j721e-sk"; - type = "flat_dt"; - arch = "arm"; - compression = "none"; - blob { - filename = J721E_SK_DTB; - }; hash { algo = "crc32"; }; @@ -679,20 +593,13 @@ }; configurations { - default = "conf-0"; - - conf-0 { - description = "k3-j721e-common-proc-board"; - firmware = "uboot"; - loadables = "uboot"; - fdt = "fdt-0"; - }; + default = "@conf-DEFAULT-SEQ"; - conf-1 { - description = "k3-j721e-sk"; + @conf-SEQ { + description = "NAME"; firmware = "uboot"; loadables = "uboot"; - fdt = "fdt-1"; + fdt = "fdt-SEQ"; }; }; }; -- 2.34.1
