Skip to contentSkip to conversation

conf: machine: am64xx-hs-evm: Include required boot binaries in wic image

PATCH In review Aparna M 2 participants 4 messages Mar 2, 2022 – Mar 3, 2022

lore
Share & tools
lore

Aparna M

author
#0 lore raw

PATCH 1/1 conf: machine: am64xx-hs-evm: Include required boot binaries in wic image

The wic image generated for HS platforms do not contain all required boot files. This happens because the IMAGE_BOOT_FILES variable that contains boot binaries to be included in the wic image is not set correctly. Populate this variable to include all boot binaries required.

All the HS platforms generate the u-boot binary as u-boot.img_HS but the bootloader expects the binary to be named as u-boot.img. Use UBOOT_IMAGE variable to include the binary as u-boot.img in the wic image.

---
 conf/machine/am64xx-hs-evm.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
conf/machine/am64xx-hs-evm.conf +2 -1
index 44e81463..960f63cf 100644
@@ -17,6 +17,7 @@ UBOOT_DTBO_OFFSET =      "0x00010000"
 SPL_BINARY = "tispl.bin_HS"
 SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_IMAGE = "u-boot.img"
+IMAGE_BOOT_FILES = "tiboot3.bin ${SPL_BINARYNAME} ${UBOOT_IMAGE}"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
Signature · 1 line
2.17.1
#1 lore raw

Thanks, Aparna.

Was this tested on the actual HS platform?
Can you describe the boot flow briefly?
Where does fitImage with the kernel and DTBs go? I don't see it in wic. Also, what about other K3 HS platforms? Should they be updated similarly? Thanks.

Quoted 30 lines · Aparna M

The wic image generated for HS platforms do not contain all required boot files. This happens because the IMAGE_BOOT_FILES variable that contains boot binaries to be included in the wic image is not set correctly. Populate this variable to include all boot binaries required.

All the HS platforms generate the u-boot binary as u-boot.img_HS but the bootloader expects the binary to be named as u-boot.img. Use UBOOT_IMAGE variable to include the binary as u-boot.img in the wic image.

---
 conf/machine/am64xx-hs-evm.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
conf/machine/am64xx-hs-evm.conf +2 -1
index 44e81463..960f63cf 100644
@@ -17,6 +17,7 @@ UBOOT_DTBO_OFFSET =      "0x00010000"
 SPL_BINARY = "tispl.bin_HS"
 SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_IMAGE = "u-boot.img"
+IMAGE_BOOT_FILES = "tiboot3.bin ${SPL_BINARYNAME} ${UBOOT_IMAGE}"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
Signature · 1 line
2.17.1
Signature · 4 lines
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964
author
#2 lore raw

On 19:17-20220301, Denys Dmytriyenko wrote:
Hi Denys,

Yes, the wic image was tested on the HS platform and the boot works. This should give you an idea about the boot flow :
https://software-dl.ti.com/processor-sdk-linux/esd/AM65X/08_01_00_01/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html#boot-flow
Boot images are x509 cert signed and the fitImage and DTBs are present in /boot in the rootfs partition of the wic image. Also, yes, I believe the other K3 HS platforms need similar fixes.

Quoted 46 lines

Thanks, Aparna.

Was this tested on the actual HS platform?
Can you describe the boot flow briefly?
Where does fitImage with the kernel and DTBs go? I don't see it in wic. Also, what about other K3 HS platforms? Should they be updated similarly? Thanks.

Quoted 30 lines · Aparna M

The wic image generated for HS platforms do not contain all required boot files. This happens because the IMAGE_BOOT_FILES variable that contains boot binaries to be included in the wic image is not set correctly. Populate this variable to include all boot binaries required.

All the HS platforms generate the u-boot binary as u-boot.img_HS but the bootloader expects the binary to be named as u-boot.img. Use UBOOT_IMAGE variable to include the binary as u-boot.img in the wic image.

---
 conf/machine/am64xx-hs-evm.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
conf/machine/am64xx-hs-evm.conf +2 -1
index 44e81463..960f63cf 100644
@@ -17,6 +17,7 @@ UBOOT_DTBO_OFFSET =      "0x00010000"
 SPL_BINARY = "tispl.bin_HS"
 SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_IMAGE = "u-boot.img"
+IMAGE_BOOT_FILES = "tiboot3.bin ${SPL_BINARYNAME} ${UBOOT_IMAGE}"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
Signature · 1 line
2.17.1
Signature · 4 lines
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964
#3 lore raw
Quoted 6 lines · Aparna M

On 19:17-20220301, Denys Dmytriyenko wrote:
Hi Denys,

Yes, the wic image was tested on the HS platform and the boot works. This should give you an idea about the boot flow :
https://software-dl.ti.com/processor-sdk-linux/esd/AM65X/08_01_00_01/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html#boot-flow

Yeah, I'm well aware of the K3 GP boot flow. I was asking about the same for K3 HS, as few things aren't that clear. E.g. in legacy HS devices OPTEE was part of FIT image loaded by U-boot. Now OPTEE loads much earlier. I was trying to clarify few things like that and how certs and validation are handled...

Quoted 2 lines

Boot images are x509 cert signed and the fitImage and DTBs are present in /boot in the rootfs partition of the wic image. Also, yes, I

Ah, right, see that now.

Quoted 1 line

believe the other K3 HS platforms need similar fixes.

Do you plan to submit similar patches for those platforms?

Thanks.

Quoted 39 lines
Quoted 39 lines

Thanks, Aparna.

Was this tested on the actual HS platform?
Can you describe the boot flow briefly?
Where does fitImage with the kernel and DTBs go? I don't see it in wic. Also, what about other K3 HS platforms? Should they be updated similarly? Thanks.

Quoted 29 lines · Aparna M

The wic image generated for HS platforms do not contain all required boot files. This happens because the IMAGE_BOOT_FILES variable that contains boot binaries to be included in the wic image is not set correctly. Populate this variable to include all boot binaries required.

All the HS platforms generate the u-boot binary as u-boot.img_HS but the bootloader expects the binary to be named as u-boot.img. Use UBOOT_IMAGE variable to include the binary as u-boot.img in the wic image.

---
 conf/machine/am64xx-hs-evm.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
conf/machine/am64xx-hs-evm.conf +2 -1
index 44e81463..960f63cf 100644
@@ -17,6 +17,7 @@ UBOOT_DTBO_OFFSET =      "0x00010000"
 SPL_BINARY = "tispl.bin_HS"
 SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_IMAGE = "u-boot.img"
+IMAGE_BOOT_FILES = "tiboot3.bin ${SPL_BINARYNAME} ${UBOOT_IMAGE}"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
Signature · 1 line
2.17.1
Signature · 4 lines
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964