uboot-sign: set load address and entrypoint
PATCH v2 1/4 uboot-sign: set load address and entrypoint
According to the design of uboot-sign.bbclass and kernel-fitimage.bbclass, both of them use an UBOOT_LOADADDRESS variable to set the load address of kernel and u-boot image and use an UBOOT_ENTRYPOINT variable to set the entry address of kernel and u-boot image.
However, users may want to set the different load address of u-boot and kernel image. Therefore, adds UBOOT_FIT_UBOOT_LOADADDRESS and UBOOT_FIT_UBOOT_ENTRYPOINT variables to set the
load address and entry point of u-boot image, respectively.
The value of UBOOT_FIT_UBOOT_ENTRYPOINT is UBOOT_LOADADDRESS by default. The value of UBOOT_FIT_UBOOT_ENTRYPOINT is UBOOT_ENTRYPOINT by default.
--- meta/classes-recipe/uboot-sign.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
meta/classes-recipe/uboot-sign.bbclass +5 -2
@@ -88,6 +88,9 @@ UBOOT_FIT_ADDRESS_CELLS ?= "1" # This is only necessary for determining the signing configuration KERNEL_PN = "${PREFERRED_PROVIDER_virtual/kernel}" +UBOOT_FIT_UBOOT_LOADADDRESS ?= "${UBOOT_LOADADDRESS}" +UBOOT_FIT_UBOOT_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}" + python() { # We need u-boot-tools-native if we're creating a U-Boot fitImage sign = d.getVar('UBOOT_SIGN_ENABLE') == '1'
@@ -248,8 +251,8 @@ uboot_fitimage_assemble() { os = "u-boot"; arch = "${UBOOT_ARCH}"; compression = "none"; - load = <${UBOOT_LOADADDRESS}>; - entry = <${UBOOT_ENTRYPOINT}>; + load = <${UBOOT_FIT_UBOOT_LOADADDRESS}>; + entry = <${UBOOT_FIT_UBOOT_ENTRYPOINT}>; EOF if [ "${SPL_SIGN_ENABLE}" = "1" ] ; then
Signature · 1 line
2.25.1
PATCH v2 2/4 uboot-sign: Fix to install nonexistent dtb file
Add to check dtb file exist, then install it.
--- meta/classes-recipe/uboot-sign.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/classes-recipe/uboot-sign.bbclass +3 -1
@@ -318,7 +318,9 @@ EOF ${SPL_MKIMAGE_SIGN_ARGS} fi - cp ${SPL_DIR}/${SPL_DTB_BINARY} ${SPL_DIR}/${SPL_DTB_SIGNED} + if [ -e "${SPL_DIR}/${SPL_DTB_BINARY}" ]; then + cp ${SPL_DIR}/${SPL_DTB_BINARY} ${SPL_DIR}/${SPL_DTB_SIGNED} + fi } uboot_assemble_fitimage_helper() {
Signature · 1 line
2.25.1
PATCH v2 3/4 u-boot-sign:uboot-config: support to verify signed FIT image
In reply to Jamin LinIt does not verify the signed FIT image of kernel and uboot. To catch the unexpected errors as far as possible at the build time, add uboot-fit-check-sign tool which is provided by u-boot to verify the signed FIT image.
--- meta/classes-recipe/uboot-config.bbclass | 3 +++ meta/classes-recipe/uboot-sign.bbclass | 10 ++++++++++ 2 files changed, 13 insertions(+)
meta/classes-recipe/uboot-config.bbclass +3 -0
@@ -94,6 +94,9 @@ SPL_MKIMAGE_SIGN_ARGS ?= "" UBOOT_DTB ?= "" UBOOT_DTB_BINARY ??= "" +# uboot-fit_check_sign command +UBOOT_FIT_CHECK_SIGN ?= "uboot-fit_check_sign" + python () { ubootmachine = d.getVar("UBOOT_MACHINE") ubootconfigflags = d.getVarFlags('UBOOT_CONFIG')
meta/classes-recipe/uboot-sign.bbclass +10 -0
@@ -112,6 +112,10 @@ concat_dtb() { -K "${UBOOT_DTB_BINARY}" \ -r ${B}/fitImage-linux \ ${UBOOT_MKIMAGE_SIGN_ARGS} + # Verify the kernel image and u-boot dtb + ${UBOOT_FIT_CHECK_SIGN} \ + -k "${UBOOT_DTB_BINARY}" \ + -f ${B}/fitImage-linux cp ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SIGNED} fi
@@ -316,6 +320,12 @@ EOF -K "${SPL_DIR}/${SPL_DTB_BINARY}" \ -r ${UBOOT_FITIMAGE_BINARY} \ ${SPL_MKIMAGE_SIGN_ARGS} + # + # Verify the U-boot FIT image and SPL dtb + # + ${UBOOT_FIT_CHECK_SIGN} \ + -k "${SPL_DIR}/${SPL_DTB_BINARY}" \ + -f ${UBOOT_FITIMAGE_BINARY} fi if [ -e "${SPL_DIR}/${SPL_DTB_BINARY}" ]; then
Signature · 1 line
2.25.1
PATCH v2 4/4 uboot-sign: support to load optee-os and TFA images
In reply to Jamin LinCurrently, u-boot FIT image only support to load u-boot image. To support optee-os and trusted-firmware-a, update ITS file generation scripts, so users are able to use u-boot FIT image to load u-boot, optee-os and treustred-firmware-a images
Add a variable "UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A" to enable trusted-firmware-a image and it is disable by default.
Add a variable "UBOOT_FIT_OPTEE_OS" to enable optee-os image and it is disable by default.
The ITS file creation looks like as following.
1. Both optee-os and trusted-firmware-a are disabled. '''
/dts-v1/;
/ {
images {
uboot {
};
fdt {
};
};
configurations {
default = "conf";
conf {
loadables = "uboot";
fdt = "fdt";
};
};
};'''
2. Only enable optee-os
'''
/dts-v1/;
/ {
images {
uboot {
};
fdt {
};
optee {
};
};
configurations {
default = "conf";
conf {
firmware = "optee";
loadables = "uboot";
fdt = "fdt";
};
};
};'''
3. Both optee-os and trusted-firmware-a are enabled '''
/dts-v1/;
/ {
images {
uboot {
};
fdt {
};
atf {
};
optee {
};
};
configurations {
default = "conf";
conf {
firmware = "atf";
loadables = "uboot", "optee";
fdt = "fdt";
};
};
};'''
--- meta/classes-recipe/uboot-sign.bbclass | 91 +++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-)
meta/classes-recipe/uboot-sign.bbclass +90 -1
@@ -91,6 +91,18 @@ KERNEL_PN = "${PREFERRED_PROVIDER_virtual/kernel}" UBOOT_FIT_UBOOT_LOADADDRESS ?= "${UBOOT_LOADADDRESS}" UBOOT_FIT_UBOOT_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}" +# Trusted Firmware-A (TF-A) provides a reference implementation of +# secure world software for Armv7-A and Armv8-A, +# including a Secure Monitor executing at Exception Level 3 (EL3) +# ATF is used as the initial start code on ARMv8-A cores for all K3 platforms +UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A ?= "0" +UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_IMAGE ?= "bl31.bin" + +# OP-TEE is a Trusted Execution Environment (TEE) designed as +# companion to a non-secure Linux kernel running on Arm +UBOOT_FIT_OPTEE_OS ?= "0" +UBOOT_FIT_OPTEE_OS_IMAGE ?= "tee-raw.bin" + python() { # We need u-boot-tools-native if we're creating a U-Boot fitImage sign = d.getVar('UBOOT_SIGN_ENABLE') == '1'
@@ -237,6 +249,20 @@ addtask uboot_generate_rsa_keys before do_uboot_assemble_fitimage after do_compi # Create a ITS file for the U-boot FIT, for use when # we want to sign it so that the SPL can verify it uboot_fitimage_assemble() { + conf_loadables="\"uboot\"" + conf_firmware="" + + if [ "${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A}" = "1" ]; then + conf_firmware="\"atf\"" + if [ "${UBOOT_FIT_OPTEE_OS}" = "1" ]; then + conf_loadables="\"uboot\", \"optee\"" + fi + else + if [ "${UBOOT_FIT_OPTEE_OS}" = "1" ]; then + conf_firmware="\"optee\"" + fi + fi + rm -f ${UBOOT_ITS} ${UBOOT_FITIMAGE_BINARY} # First we create the ITS script
@@ -289,13 +315,76 @@ EOF cat << EOF >> ${UBOOT_ITS} }; +EOF + if [ "${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + atf { + description = "ARM Trusted Firmware-A"; + data = /incbin/("${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_IMAGE}"); + type = "firmware"; + arch = "${UBOOT_ARCH}"; + os = "arm-trusted-firmware"; + load = <${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_LOADADDRESS}>; + entry = <${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_ENTRYPOINT}>; + compression = "none"; +EOF + + if [ "${SPL_SIGN_ENABLE}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + signature { + algo = "${UBOOT_FIT_HASH_ALG},${UBOOT_FIT_SIGN_ALG}"; + key-name-hint = "${SPL_SIGN_KEYNAME}"; + }; +EOF + fi + + cat << EOF >> ${UBOOT_ITS} + }; +EOF + fi + + if [ "${UBOOT_FIT_OPTEE_OS}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + optee { + description = "OPTEE OS Image"; + data = /incbin/("${UBOOT_FIT_OPTEE_OS_IMAGE}"); + type = "tee"; + arch = "${UBOOT_ARCH}"; + os = "tee"; + load = <${UBOOT_FIT_OPTEE_OS_LOADADDRESS}>; + entry = <${UBOOT_FIT_OPTEE_OS_ENTRYPOINT}>; + compression = "none"; +EOF + + if [ "${SPL_SIGN_ENABLE}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + signature { + algo = "${UBOOT_FIT_HASH_ALG},${UBOOT_FIT_SIGN_ALG}"; + key-name-hint = "${SPL_SIGN_KEYNAME}"; + }; +EOF + fi + + cat << EOF >> ${UBOOT_ITS} + }; +EOF + fi + + cat << EOF >> ${UBOOT_ITS} }; configurations { default = "conf"; conf { description = "Boot with signed U-Boot FIT"; - loadables = "uboot"; +EOF + if [ -n "${conf_firmware}" ]; then + cat << EOF >> ${UBOOT_ITS} + firmware = ${conf_firmware}; +EOF + fi + cat << EOF >> ${UBOOT_ITS} + loadables = ${conf_loadables}; fdt = "fdt"; }; };
Signature · 1 line
2.25.1
Re: [OE-core] [PATCH v2 4/4] uboot-sign: support to load optee-os and TFA images
Quoted 203 lines · Jamin Lin via lists.openembedded.org
Currently, u-boot FIT image only support to load u-boot image. To support optee-os and trusted-firmware-a, update ITS file generation scripts, so users are able to use u-boot FIT image to load u-boot, optee-os and treustred-firmware-a images
Add a variable "
UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A" to enable trusted-firmware-a image and it is disable by default.Add a variable "
UBOOT_FIT_OPTEE_OS" to enable optee-os image and it is disable by default.The ITS file creation looks like as following.
1. Both optee-os and trusted-firmware-a are disabled. '''
/dts-v1/;/ { images { uboot { }; fdt { }; }; configurations { default = "conf"; conf { loadables = "uboot"; fdt = "fdt"; }; }; };'''
2. Only enable optee-os
'''
/dts-v1/;/ { images { uboot { }; fdt { }; optee { }; }; configurations { default = "conf"; conf { firmware = "optee"; loadables = "uboot"; fdt = "fdt"; }; }; };'''
3. Both optee-os and trusted-firmware-a are enabled '''
/dts-v1/;/ { images { uboot { }; fdt { }; atf { }; optee { }; }; configurations { default = "conf"; conf { firmware = "atf"; loadables = "uboot", "optee"; fdt = "fdt"; }; }; };'''
Signed-off-by Jamin Lin <[email protected]>--- meta/classes-recipe/uboot-sign.bbclass | 91 +++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-)meta/classes-recipe/uboot-sign.bbclass +83
-1@@ -91,6 +91,18 @@ KERNEL_PN = "${PREFERRED_PROVIDER_virtual/kernel}" UBOOT_FIT_UBOOT_LOADADDRESS ?= "${UBOOT_LOADADDRESS}" UBOOT_FIT_UBOOT_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}" +# Trusted Firmware-A (TF-A) provides a reference implementation of +# secure world software for Armv7-A and Armv8-A, +# including a Secure Monitor executing at Exception Level 3 (EL3) +# ATF is used as the initial start code on ARMv8-A cores for all K3 platforms +UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A ?= "0" +UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_IMAGE ?= "bl31.bin" + +# OP-TEE is a Trusted Execution Environment (TEE) designed as +# companion to a non-secure Linux kernel running on Arm +UBOOT_FIT_OPTEE_OS ?= "0" +UBOOT_FIT_OPTEE_OS_IMAGE ?= "tee-raw.bin" + python() { # We need u-boot-tools-native if we're creating a U-Boot fitImage sign = d.getVar('UBOOT_SIGN_ENABLE') == '1'@@ -237,6 +249,20 @@ addtask uboot_generate_rsa_keys before do_uboot_assemble_fitimage after do_compi # Create a ITS file for the U-boot FIT, for use when # we want to sign it so that the SPL can verify it uboot_fitimage_assemble() { + conf_loadables="\"uboot\"" + conf_firmware="" + + if [ "${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A}" = "1" ]; then + conf_firmware="\"atf\"" + if [ "${UBOOT_FIT_OPTEE_OS}" = "1" ]; then + conf_loadables="\"uboot\", \"optee\"" + fi + else + if [ "${UBOOT_FIT_OPTEE_OS}" = "1" ]; then + conf_firmware="\"optee\"" + fi + fi + rm -f ${UBOOT_ITS} ${UBOOT_FITIMAGE_BINARY} # First we create the ITS script@@ -289,13 +315,76 @@ EOF cat << EOF >> ${UBOOT_ITS} }; +EOF + if [ "${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + atf { + description = "ARM Trusted Firmware-A"; + data = /incbin/("${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_IMAGE}"); + type = "firmware"; + arch = "${UBOOT_ARCH}"; + os = "arm-trusted-firmware"; + load = <${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_LOADADDRESS}>; + entry = <${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_ENTRYPOINT}>; + compression = "none"; +EOF + + if [ "${SPL_SIGN_ENABLE}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + signature { + algo = "${UBOOT_FIT_HASH_ALG},${UBOOT_FIT_SIGN_ALG}"; + key-name-hint = "${SPL_SIGN_KEYNAME}"; + }; +EOF + fi + + cat << EOF >> ${UBOOT_ITS} + }; +EOF + fi + + if [ "${UBOOT_FIT_OPTEE_OS}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + optee { + description = "OPTEE OS Image"; + data = /incbin/("${UBOOT_FIT_OPTEE_OS_IMAGE}"); + type = "tee"; + arch = "${UBOOT_ARCH}"; + os = "tee"; + load = <${UBOOT_FIT_OPTEE_OS_LOADADDRESS}>; + entry = <${UBOOT_FIT_OPTEE_OS_ENTRYPOINT}>; + compression = "none"; +EOF + + if [ "${SPL_SIGN_ENABLE}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + signature { + algo = "${UBOOT_FIT_HASH_ALG},${UBOOT_FIT_SIGN_ALG}"; + key-name-hint = "${SPL_SIGN_KEYNAME}"; + }; +EOF + fi + + cat << EOF >> ${UBOOT_ITS} + }; +EOF + fi + + cat << EOF >> ${UBOOT_ITS} }; configurations { default = "conf"; conf { description = "Boot with signed U-Boot FIT"; - loadables = "uboot"; +EOF
meta/classes-recipe/uboot-sign.bbclass EOF · line 390
Quoted 10 lines
meta/classes-recipe/uboot-sign.bbclass +7
-0+ if [ -n "${conf_firmware}" ]; then + cat << EOF >> ${UBOOT_ITS} + firmware = ${conf_firmware}; +EOF + fi + cat << EOF >> ${UBOOT_ITS} + loadables = ${conf_loadables}; fdt = "fdt"; }; };
These changes look good thanks. I'm just a bit worried they don't have any test coverage so they're easily going to regress?
There are also no documentation patches?
Cheers,
Richard
RE: [OE-core] [PATCH v2 4/4] uboot-sign: support to load optee-os and TFA images
Quoted 234 lines
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Saturday, January 27, 2024 1:05 AM
To: Jamin Lin <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH v2 4/4] uboot-sign: support to load optee-os and TFA imagesmeta/classes-recipe/uboot-sign.bbclass KERNEL_PN =
Quoted 97 lines · Jamin Lin via lists.openembedded.org
Currently, u-boot FIT image only support to load u-boot image. To support optee-os and trusted-firmware-a, update ITS file generation scripts, so users are able to use u-boot FIT image to load u-boot, optee-os and treustred-firmware-a images
Add a variable "
UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A" to enable trusted-firmware-a image and it is disable by default.Add a variable "
UBOOT_FIT_OPTEE_OS" to enable optee-os image and it is disable by default.The ITS file creation looks like as following.
1. Both optee-os and trusted-firmware-a are disabled. '''
/dts-v1/;/ { images { uboot { }; fdt { }; }; configurations { default = "conf"; conf { loadables = "uboot"; fdt = "fdt"; }; }; };'''
2. Only enable optee-os
'''
/dts-v1/;/ { images { uboot { }; fdt { }; optee { }; }; configurations { default = "conf"; conf { firmware = "optee"; loadables = "uboot"; fdt = "fdt"; }; }; };'''
3. Both optee-os and trusted-firmware-a are enabled ''' /dts-v1/;
/ { images { uboot { }; fdt { }; atf { }; optee { }; }; configurations { default = "conf"; conf { firmware = "atf"; loadables = "uboot", "optee"; fdt = "fdt"; }; }; };'''
Signed-off-by Jamin Lin <[email protected]>--- meta/classes-recipe/uboot-sign.bbclass | 91 +++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-)meta/classes-recipe/uboot-sign.bbclass +0
-0@@ -91,6 +91,18 @@ KERNEL_PN ="${PREFERRED_PROVIDER_virtual/kernel}"
Quoted 41 lines
meta/classes-recipe/uboot-sign.bbclass +12
-0UBOOT_FIT_UBOOT_LOADADDRESS ?= "${UBOOT_LOADADDRESS}" UBOOT_FIT_UBOOT_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}" +# Trusted Firmware-A (TF-A) provides a reference implementation of # +secure world software for Armv7-A and Armv8-A, # including a Secure +Monitor executing at Exception Level 3 (EL3) # ATF is used as the +initial start code on ARMv8-A cores for all K3 platforms +UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A ?= "0" +UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_IMAGE ?= "bl31.bin" + +# OP-TEE is a Trusted Execution Environment (TEE) designed as # +companion to a non-secure Linux kernel running on Arm +UBOOT_FIT_OPTEE_OS ?= "0" +UBOOT_FIT_OPTEE_OS_IMAGE ?= "tee-raw.bin" + python() { # We need u-boot-tools-native if we're creating a U-Boot fitImage sign = d.getVar('UBOOT_SIGN_ENABLE') == '1'@@ -237,6 +249,20 @@ addtask uboot_generate_rsa_keys before
do_uboot_assemble_fitimageafterdo_compi# Create a ITS file for the U-boot FIT, for use when # we want to sign it so that the SPL can verify it
uboot_fitimage_assemble(){meta/classes-recipe/uboot-sign.bbclass +14
-0+ conf_loadables="\"uboot\"" + conf_firmware="" + + if [ "${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A}" = "1" ]; then + conf_firmware="\"atf\"" + if [ "${UBOOT_FIT_OPTEE_OS}" = "1" ]; then + conf_loadables="\"uboot\", \"optee\"" + fi + else + if [ "${UBOOT_FIT_OPTEE_OS}" = "1" ]; then + conf_firmware="\"optee\"" + fi + fi + rm -f ${UBOOT_ITS} ${UBOOT_FITIMAGE_BINARY} # First we create the ITS scriptmeta/classes-recipe/uboot-sign.bbclass EOF · line 323
Quoted 9 lines
meta/classes-recipe/uboot-sign.bbclass +6
-0@@ -289,13 +315,76 @@ EOF cat << EOF >> ${UBOOT_ITS} }; +EOF + if [ "${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + atf { + description = "ARM Trusted Firmware-A"; + data =/incbin/("${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_IMAGE}");
meta/classes-recipe/uboot-sign.bbclass EOF
Quoted 4 lines
meta/classes-recipe/uboot-sign.bbclass +4
-0+ type = "firmware"; + arch = "${UBOOT_ARCH}"; + os = "arm-trusted-firmware"; + load =<${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_LOADADDRESS}>;
meta/classes-recipe/uboot-sign.bbclass EOF · line 328
Quoted 1 line
meta/classes-recipe/uboot-sign.bbclass +1
-0+ entry =<${UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A_ENTRYPOINT}>;
meta/classes-recipe/uboot-sign.bbclass EOF
Quoted 7 lines
meta/classes-recipe/uboot-sign.bbclass +7
-0+ compression = "none"; +EOF + + if [ "${SPL_SIGN_ENABLE}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + signature { + algo ="${UBOOT_FIT_HASH_ALG},${UBOOT_FIT_SIGN_ALG}";
Quoted 17 lines
meta/classes-recipe/uboot-sign.bbclass +17
-0+ key-name-hint = "${SPL_SIGN_KEYNAME}"; + }; +EOF + fi + + cat << EOF >> ${UBOOT_ITS} + }; +EOF + fi + + if [ "${UBOOT_FIT_OPTEE_OS}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + optee { + description = "OPTEE OS Image"; + data = /incbin/("${UBOOT_FIT_OPTEE_OS_IMAGE}"); + type = "tee"; + arch = "${UBOOT_ARCH}";meta/classes-recipe/uboot-sign.bbclass EOF
Quoted 10 lines
meta/classes-recipe/uboot-sign.bbclass +10
-0+ os = "tee"; + load = <${UBOOT_FIT_OPTEE_OS_LOADADDRESS}>; + entry = <${UBOOT_FIT_OPTEE_OS_ENTRYPOINT}>; + compression = "none"; +EOF + + if [ "${SPL_SIGN_ENABLE}" = "1" ] ; then + cat << EOF >> ${UBOOT_ITS} + signature { + algo ="${UBOOT_FIT_HASH_ALG},${UBOOT_FIT_SIGN_ALG}";
Quoted 18 lines
meta/classes-recipe/uboot-sign.bbclass +11
-1+ key-name-hint = "${SPL_SIGN_KEYNAME}"; + }; +EOF + fi + + cat << EOF >> ${UBOOT_ITS} + }; +EOF + fi + + cat << EOF >> ${UBOOT_ITS} }; configurations { default = "conf"; conf { description = "Boot with signed U-Boot FIT"; - loadables = "uboot";meta/classes-recipe/uboot-sign.bbclass EOF · line 390
Quoted 10 lines
meta/classes-recipe/uboot-sign.bbclass +7
-0+EOF + if [ -n "${conf_firmware}" ]; then + cat << EOF >> ${UBOOT_ITS} + firmware = ${conf_firmware}; EOF + fi + cat << EOF >> ${UBOOT_ITS} + loadables = ${conf_loadables}; fdt = "fdt"; }; };These changes look good thanks. I'm just a bit worried they don't have any test coverage so they're easily going to regress?
Quoted 5 lines
There are also no documentation patches?
Cheers,
Richard
Hi Richard,
Thanks for your review and sorry reply you late.
Did you mean I should create a new patch to add test case for fitimage of oe-selftest in this series patch? After I read this document https://docs.yoctoproject.org/test-manual/index.html, it seems oe-selftest support to test the generated u-boot FIT image and the generated u-boot.its here, meta/lib/oeqa/selftest/cases/fitimage.py
Do I need to add more test case to test u-boot.its and u-boot FIT image for my modifications such as optee-os and trusted-firmware-a supported FIT image? According to the design of optee-os and trusted-firmware-a, both recipes were placed in meta-arm meta layer, https://git.yoctoproject.org/meta-arm/tree
Can I add dependencies in both meta/classes-recipe/uboot-sign.bbclass and meta/lib/oeqa/selftest/cases/fitimage.py.
One more question, " There are also no documentation patches?", Did you mean to update Yocto document? If yes, could you please tell me which document I need to update?
Thanks-Jamin
Re: [OE-core] [PATCH v2 4/4] uboot-sign: support to load optee-os and TFA images
Quoted 4 lines · Jamin Lin
Thanks for your review and sorry reply you late.
Did you mean I should create a new patch to add test case for fitimage of oe-selftest in this series patch?
Ideally, yes please, we should really have test coverage for new things we're adding.
Quoted 7 lines
After I read this document https://docs.yoctoproject.org/test-manual/index.html, it seems oe-selftest support to test the generated u-boot FIT image and the generated u-boot.its here,
meta/lib/oeqa/selftest/cases/fitimage.pyDo I need to add more test case to test u-boot.its and u-boot FIT image for my modifications such as optee-os and trusted-firmware-a supported FIT image? According to the design of optee-os and trusted-firmware-a, both recipes were placed in meta-arm meta layer, https://git.yoctoproject.org/meta-arm/tree
Can I add dependencies in both meta/classes-recipe/uboot-sign.bbclass andmeta/lib/oeqa/selftest/cases/fitimage.py.
For this I'm wondering if meta-arm would accept the test case and be able to run it there? I've copied Ross/Jon who might be able to help with ideas on that.
Quoted 4 lines
One more question, " There are also no documentation patches?", Did you mean to update Yocto document? If yes, could you please tell me which document I need to update?
Where you add new variables we need to define them in the manual:
https://git.yoctoproject.org/yocto-docs/tree/documentation/ref-manual/variables.rst
Also, the classes are documented:
https://git.yoctoproject.org/yocto-docs/tree/documentation/ref-manual/classes.rst
so if the variables are class specific, they should probably be referenced from the class documentation itself.
Cheers,
Richard
RE: [OE-core] [PATCH v2 4/4] uboot-sign: support to load optee-os and TFA images
Quoted 18 lines · Jamin Lin
Quoted 4 lines
Thanks for your review and sorry reply you late.
Did you mean I should create a new patch to add test case for fitimage of
oe-selftest in this series patch?
Ideally, yes please, we should really have test coverage for new things we're adding.
Quoted 6 lines
After I read this document
https://docs.yoctoproject.org/test-manual/index.html, it seems oe-selftest support to test the generated u-boot FIT image and the generated u-boot.its here,meta/lib/oeqa/selftest/cases/fitimage.pyDo I need to add more test case to test u-boot.its and u-boot FIT image for
my modifications such as optee-os and trusted-firmware-a supported FIT image?
Quoted 9 lines
Quoted 4 lines
According to the design of optee-os and trusted-firmware-a, both recipes were placed in meta-arm meta layer,
https://git.yoctoproject.org/meta-arm/tree
Can I add dependencies in both meta/classes-recipe/uboot-sign.bbclass and
meta/lib/oeqa/selftest/cases/fitimage.py.For this I'm wondering if meta-arm would accept the test case and be able to run it there? I've copied Ross/Jon who might be able to help with ideas on that.
Richard, Ross and Jon,
It seems that I can refer/modify openembedded-core/meta/lib/oeqa/selftest/cases/fitimage.py(only add test case to test u-boot fit image for optee-os and trustred-firmware-a) and Copy this file into meta-arm layer in this directory, https://git.yoctoproject.org/meta-arm/tree/meta-arm/lib/oeqa/selftest/cases/tests.
Regarding the u-boot fit image generation dependency, can I add optee-os and tructred-firmeare dependency in meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend and the contents of u-boot_%.bbappend as following.
do_compile[depends] += " \
${@bb.utils.contains('UBOOT_FIT_OPTEE_OS', '1', 'optee-os:do_deploy', '', d)} \
${@bb.utils.contains('UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A', '1', 'trusted-firmware-a:do_deploy', '', d)} \
"Any suggestion will be appreciated.
Quoted 11 lines
Quoted 2 lines
One more question, " There are also no documentation patches?", Did you
mean to update Yocto document?
Quoted 2 lines
If yes, could you please tell me which document I need to update?
Where you add new variables we need to define them in the manual:
https://git.yoctoproject.org/yocto-docs/tree/documentation/ref-manual/variabl
es.rst
Quoted 8 lines
Also, the classes are documented:
https://git.yoctoproject.org/yocto-docs/tree/documentation/ref-manual/classes
.rstso if the variables are class specific, they should probably be referenced from the class documentation itself.
Will update Yocto ref-manual.
Thanks-Jamin
Quoted 3 lines
Cheers,
Richard
Re: [OE-core] [PATCH v2 4/4] uboot-sign: support to load optee-os and TFA images
Quoted 9 lines · Jamin Lin
It seems that I can refer/modify openembedded-core/meta/lib/oeqa/selftest/cases/fitimage.py(only add test case to test u-boot fit image for optee-os and trustred-firmware-a) and Copy this file into meta-arm layer in this directory, https://git.yoctoproject.org/meta-arm/tree/meta-arm/lib/oeqa/selftest/cases/tests.
Regarding the u-boot fit image generation dependency, can I add optee-os and tructred-firmeare dependency in meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend and the contents of u-boot_%.bbappend as following.
do_compile[depends] += " \ ${@bb.utils.contains('UBOOT_FIT_OPTEE_OS', '1', 'optee-os:do_deploy', '', d)} \ ${@bb.utils.contains('UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A', '1', 'trusted-firmware-a:do_deploy', '', d)} \ “
It feels to me that we’re slowly creating two parallel generalised fit image classes, one called “uboot_sign” and the other called “kernel-fitimage”... Surely there should be just _one_ fit image creation class that can do everything in a generalised way?
Ross
RE: [OE-core] [PATCH v2 4/4] uboot-sign: support to load optee-os and TFA images
Quoted 26 lines
-----Original Message-----
From: Ross Burton <[email protected]>
Sent: Friday, February 9, 2024 2:03 AM
To: Jamin Lin <[email protected]>
Cc: Richard Purdie <[email protected]>; [email protected]; Jon Mason <[email protected]>
Subject: Re: [OE-core] [PATCH v2 4/4] uboot-sign: support to load optee-os and TFA imagesQuoted 2 lines · Jamin Lin
It seems that I can refer/modify openembedded-core/meta/lib/oeqa/selftest/cases/fitimage.py(only add test
case to test u-boot fit image for optee-os and trustred-firmware-a) and Copy this file into meta-arm layer in this directory,
https://git.yoctoproject.org/meta-arm/tree/meta-arm/lib/oeqa/selftest/cases/
tests.Quoted 2 lines
Regarding the u-boot fit image generation dependency, can I add optee-os
and tructred-firmeare dependency in meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend and the contents of u-boot_%.bbappend as following.
Quoted 3 lines
do_compile[depends] += " \ ${@bb.utils.contains('UBOOT_FIT_OPTEE_OS', '1', 'optee-os:do_deploy','', d)} \
Quoted 9 lines
Quoted 1 line
${@bb.utils.contains('UBOOT_FIT_ARM_TRUSTED_FIRMWARE_A', '1','trusted-firmware-a:do_deploy', '', d)} \
Quoted 1 line
“
It feels to me that we’re slowly creating two parallel generalised fit image classes, one called “uboot_sign” and the other called “kernel-fitimage”... Surely there should be just _one_ fit image creation class that can do everything in a generalised way?
Hi Ross,
I am not the maintainer of uboot-sign.bbcalss and kernel-fitimage.bbclass.
I don't know whether the only one .bbclass for u-boot and kernel fit image generation is a good solution or not.
It seems that a single .bbclass to create two fit image is too complicate.
1. only u-boot fit image has TFA
2. only kernel fit image has ramdisc
Thanks-Jamin
Quoted 1 line
Ross