Hi Udit,
On 19:25-20241222, Kumar, Udit wrote:
On 12/17/2024 4:37 PM, Manorit Chawdhry wrote:
From: Neha Malcom Francis n-francis@ti.com
Clean up templatized boot binaries for j784s4 soc. This includes modifying the k3-j784s4-binman.dtsi to use SPL_BOARD_DTB, BOARD_DESCRIPTION and UBOOT_BOARD_DESCRIPTION from the files that include it to further reuse code.
k3-j784s4-binman.dtsi will contain only templates. Only required boot binaries can be built from the templates in the boards' respective -u-boot.dtsi file (or k3-<board>-binman.dtsi if it exists). This allows clear distinction between the SoC common stuff vs. what is additionally needed to boot up a specific board.
Signed-off-by: Neha Malcom Francis n-francis@ti.com [ Do it only for j784s4 ] Signed-off-by: Manorit Chawdhry m-chawdhry@ti.com
arch/arm/dts/k3-am69-sk-u-boot.dtsi | 120 +++++++++++++++++++++++++++------ arch/arm/dts/k3-j784s4-binman.dtsi | 116 +++++++++---------------------- arch/arm/dts/k3-j784s4-evm-u-boot.dtsi | 74 ++++++++++++++++++++ 3 files changed, 203 insertions(+), 107 deletions(-)
diff --git a/arch/arm/dts/k3-am69-sk-u-boot.dtsi b/arch/arm/dts/k3-am69-sk-u-boot.dtsi index 4a82d2fd222669c4b390d4d877bc15329eab8894..b37fa3ceb0e0a6296294aaaaaa561a67e8506064 100644 --- a/arch/arm/dts/k3-am69-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am69-sk-u-boot.dtsi @@ -3,8 +3,106 @@
- Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/
Copyright, please include 2024
*/ +#define SPL_BOARD_DTB "spl/dts/ti/k3-am69-sk.dtb" +#define BOARD_DESCRIPTION "k3-am69-sk" +#define UBOOT_BOARD_DESCRIPTION "U-Boot for AM69 board"
- #include "k3-j784s4-binman.dtsi"
+#if !defined(CONFIG_ARM64)
Cosmetic, I suggest to use #if defined
Would change it to #if defined(CONFIG_CPU_V7R) then
+&binman {
- tiboot3-am69-hs {
insert-template = <&tiboot3_j784s4_hs>;filename = "tiboot3-am69-hs-sk.bin";- };
- tiboot3-am69-hs-fs {
insert-template = <&tiboot3_j784s4_hs_fs>;filename = "tiboot3-am69-hs-fs-sk.bin";symlink = "tiboot3.bin";- };
+};
+&ti_fs_enc {
- filename = "ti-sysfw/ti-fs-firmware-j784s4-hs-enc.bin";
+};
+&sysfw_inner_cert {
- filename = "ti-sysfw/ti-fs-firmware-j784s4-hs-cert.bin";
+};
+&ti_fs_enc_fs {
- filename = "ti-sysfw/ti-fs-firmware-j784s4-hs-fs-enc.bin";
+};
+&sysfw_inner_cert_fs {
- filename = "ti-sysfw/ti-fs-firmware-j784s4-hs-fs-cert.bin";
+};
+#include "k3-binman-capsule-r5.dtsi"
+// Capsule update GUIDs in string form. See j784s4_evm.h +#define AM69_SK_TIBOOT3_IMAGE_GUID_STR "adf49ec5-61bb-4dbe-8b8d-39df4d7ebf46"
+&capsule_tiboot3 {
- efi-capsule {
image-guid = AM69_SK_TIBOOT3_IMAGE_GUID_STR;blob {filename = "tiboot3-am69-hs-fs-sk.bin";};I am wondering, how you plan to take care of capsule for hs devices.
I think this would need to be a separate discussion as I have just moved the existing code around so not really sure how this is all used...
- };
+};
+#else // CONFIG_ARM64
+&binman {
- ti-dm {
filename = "ti-dm.bin";blob-ext {filename = "ti-dm/j784s4/ipc_echo_testb_mcu1_0_release_strip.xer5f";optional;is dm block optional ?
I think this has been marked as optional in other devices as well but would require Neha to comment if it's okay to remove.. don't know the history around it.
};- };
- tispl {
insert-template = <&ti_spl>;- };
- u-boot {
insert-template = <&u_boot>;- };
- tispl-unsigned {
insert-template = <&ti_spl_unsigned>;- };
- u-boot-unsigned {
insert-template = <&u_boot_unsigned>;- };
Do we need unsigned tispl and u-boot here ?
This sometimes help for hs-fs flows as well so I think better to keep it for debug purposes.
Regards, Manorit
[..]