| Message ID | 20240425220659.2056955-2-n-francis@ti.com |
|---|---|
| State | Accepted |
| Commit | 2bae48df5be3830af662e163e3a99c426ee7e81c |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Generate all SR boot binaries | expand |
On 4/25/24 5:06 PM, Neha Malcom Francis wrote: > J721E has SR1.1 and SR2.0 having three variants of each GP, HS-FS and > HS-SE. Current build does not generate HS-FS SR1.1 so add support for > them. > > Reported-by: Suman Anna <s-anna@ti.com> > Signed-off-by: Neha Malcom Francis <n-francis@ti.com> > --- > Changes since v1: > - removed redundant HS-SE SR2.0 generation > Looks good to me now, Reviewed-by: Andrew Davis <afd@ti.com> > arch/arm/dts/k3-j721e-binman.dtsi | 90 ++++++++++++++++++++++++++++++- > 1 file changed, 89 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/dts/k3-j721e-binman.dtsi b/arch/arm/dts/k3-j721e-binman.dtsi > index 75a6e9599b9..1514d897634 100644 > --- a/arch/arm/dts/k3-j721e-binman.dtsi > +++ b/arch/arm/dts/k3-j721e-binman.dtsi > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0 > /* > - * Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ > + * Copyright (C) 2022-2024 Texas Instruments Incorporated - https://www.ti.com/ > */ > > #include "k3-binman.dtsi" > @@ -129,6 +129,94 @@ > }; > }; > > +&binman { > + tiboot3-j721e_sr1_1-hs-fs-evm.bin { > + filename = "tiboot3-j721e_sr1_1-hs-fs-evm.bin"; > + ti-secure-rom { > + content = <&u_boot_spl_fs_sr1_1>; > + core = "public"; > + core-opts = <2>; > + load = <CONFIG_SPL_TEXT_BASE>; > + keyfile = "custMpk.pem"; > + }; > + u_boot_spl_fs_sr1_1: u-boot-spl { > + no-expanded; > + }; > + }; > + sysfw_fs_sr1_1 { > + filename = "sysfw.bin_fs_sr1_1"; > + ti-fs-cert-fs.bin { > + filename = "ti-sysfw/ti-fs-firmware-j721e_sr1_1-hs-fs-cert.bin"; > + type = "blob-ext"; > + optional; > + }; > + ti-fs-firmware-j721e-hs-fs-enc.bin { > + filename = "ti-sysfw/ti-fs-firmware-j721e_sr1_1-hs-fs-enc.bin"; > + type = "blob-ext"; > + optional; > + }; > + }; > + itb_fs_sr1_1 { > + filename = "sysfw-j721e_sr1_1-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_sr1_1"; > + }; > + }; > + 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"; > + }; > + }; > + }; > + }; > + }; > +}; > + > &binman { > tiboot3-j721e_sr2-hs-fs-evm.bin { > filename = "tiboot3-j721e_sr2-hs-fs-evm.bin";
diff --git a/arch/arm/dts/k3-j721e-binman.dtsi b/arch/arm/dts/k3-j721e-binman.dtsi index 75a6e9599b9..1514d897634 100644 --- a/arch/arm/dts/k3-j721e-binman.dtsi +++ b/arch/arm/dts/k3-j721e-binman.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ + * Copyright (C) 2022-2024 Texas Instruments Incorporated - https://www.ti.com/ */ #include "k3-binman.dtsi" @@ -129,6 +129,94 @@ }; }; +&binman { + tiboot3-j721e_sr1_1-hs-fs-evm.bin { + filename = "tiboot3-j721e_sr1_1-hs-fs-evm.bin"; + ti-secure-rom { + content = <&u_boot_spl_fs_sr1_1>; + core = "public"; + core-opts = <2>; + load = <CONFIG_SPL_TEXT_BASE>; + keyfile = "custMpk.pem"; + }; + u_boot_spl_fs_sr1_1: u-boot-spl { + no-expanded; + }; + }; + sysfw_fs_sr1_1 { + filename = "sysfw.bin_fs_sr1_1"; + ti-fs-cert-fs.bin { + filename = "ti-sysfw/ti-fs-firmware-j721e_sr1_1-hs-fs-cert.bin"; + type = "blob-ext"; + optional; + }; + ti-fs-firmware-j721e-hs-fs-enc.bin { + filename = "ti-sysfw/ti-fs-firmware-j721e_sr1_1-hs-fs-enc.bin"; + type = "blob-ext"; + optional; + }; + }; + itb_fs_sr1_1 { + filename = "sysfw-j721e_sr1_1-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_sr1_1"; + }; + }; + 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"; + }; + }; + }; + }; + }; +}; + &binman { tiboot3-j721e_sr2-hs-fs-evm.bin { filename = "tiboot3-j721e_sr2-hs-fs-evm.bin";
J721E has SR1.1 and SR2.0 having three variants of each GP, HS-FS and HS-SE. Current build does not generate HS-FS SR1.1 so add support for them. Reported-by: Suman Anna <s-anna@ti.com> Signed-off-by: Neha Malcom Francis <n-francis@ti.com> --- Changes since v1: - removed redundant HS-SE SR2.0 generation arch/arm/dts/k3-j721e-binman.dtsi | 90 ++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-)