[PATCH 1/2] arm: dts: k3-j721e-binman: Add support for HSSE2.0 and HSFS1.1

[Andrew Davis]

On 4/22/24 4:40 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-SE SR2.0 and HS-FS SR1.1 so
> add support for them.
> 
> Reported-by: Suman Anna <s-anna at ti.com>
> Signed-off-by: Neha Malcom Francis <n-francis at ti.com>
> ---
>   arch/arm/dts/k3-j721e-binman.dtsi | 201 +++++++++++++++++++++++++++++-
>   1 file changed, 200 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/dts/k3-j721e-binman.dtsi b/arch/arm/dts/k3-j721e-binman.dtsi
> index 75a6e9599b9..90e4a31329e 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,205 @@
>   	};
>   };
>   
> +&binman {
> +	tiboot3-j721e_sr2-hs-evm.bin {

This already seems to exist in this file, it is hidden up in the
first binman{} GP node at the top. Might just need split out from that.

Andrew

> +		filename = "tiboot3-j721e_sr2-hs-evm.bin";
> +		ti-secure-rom {
> +			content = <&u_boot_spl_sr2>;
> +			core = "public";
> +			core-opts = <2>;
> +			load = <CONFIG_SPL_TEXT_BASE>;
> +			keyfile = "custMpk.pem";
> +		};
> +		u_boot_spl_sr2: u-boot-spl {
> +			no-expanded;
> +		};
> +	};
> +	sysfw_sr2 {
> +		filename = "sysfw.bin_sr2";
> +		ti-secure-rom {
> +			content = <&ti_fs_cert_sr2>;
> +			core = "secure";
> +			load = <0x40000>;
> +			keyfile = "custMpk.pem";
> +			countersign;
> +		};
> +		ti_fs_cert_sr2: ti-fs-cert.bin {
> +			filename = "ti-sysfw/ti-fs-firmware-j721e_sr2-hs-cert.bin";
> +			type = "blob-ext";
> +			optional;
> +		};
> +		ti-fs-firmware-j721e_sr2-hs-enc.bin {
> +			filename = "ti-sysfw/ti-fs-firmware-j721e_sr2-hs-enc.bin";
> +			type = "blob-ext";
> +			optional;
> +		};
> +	};
> +	itb_sr2 {
> +		filename = "sysfw-j721e_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_sr2";
> +					};
> +				};
> +				board-cfg.bin {
> +					description = "board-cfg";
> +					type = "firmware";
> +					arch = "arm";
> +					compression = "none";
> +					ti-secure {
> +						content = <&board_cfg_sr2>;
> +						keyfile = "custMpk.pem";
> +					};
> +					board_cfg_sr2: 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_sr2>;
> +						keyfile = "custMpk.pem";
> +					};
> +					pm_cfg_sr2: 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_sr2>;
> +						keyfile = "custMpk.pem";
> +					};
> +					rm_cfg_sr2: 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_sr2>;
> +						keyfile = "custMpk.pem";
> +					};
> +					sec_cfg_sr2: sec-cfg {
> +						filename = "sec-cfg.bin";
> +						type = "blob-ext";
> +					};
> +				};
> +			};
> +		};
> +	};
> +};
> +
> +&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";