ti-sci-fw: Allow build to continue without TI_SECURE_DEV_PKG set
PATCH 1/2 ti-sci-fw: Allow build to continue without TI_SECURE_DEV_PKG set
If we do not have TI_SECURE_DEV_PKG set then SYSFW generation will fail if we are building for the HS platform. When TI_SECURE_DEV_PKG is not set we assume the builder is only interested in the GP boards, so fake generating the HS SYSFW images. These will be non-functional on HS boards, but they would have been just as non-functional if built without TI_SECURE_DEV_PKG set.
--- recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 5 +++++ 1 file changed, 5 insertions(+)
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +5 -0
@@ -66,6 +66,11 @@ EXTRA_OEMAKE_remove_j7-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl. EXTRA_OEMAKE_remove_j7-hs-evm-k3r5-sr1-1 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" do_compile() { + if [ ! "${SYSFW_SUFFIX}" = "gp" ] && [ ! -f ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ]; then + echo "Warning: TI_SECURE_DEV_PKG not set, skipping HS SYSFW generation." + touch ${WORKDIR}/imggen/${SYSFW_TIBOOT3} + exit 0 + fi cd ${WORKDIR}/imggen/ oe_runmake }
Signature · 1 line
2.36.1
PATCH 2/2 conf: machine: am64xx-evm: Make HS-SE the default
The HS-SE AM64xx machine can now be run on GP devices and built without needing the TI_SECURE_DEV_PKG for the same. AM64xx will only be available in the HS-FS type going forward. Make the HS-SE the default and remove the original GP machine.
---
...m-k3r5-gp.conf => am64xx-evm-k3r5-gp.conf} | 6 ++++-
conf/machine/am64xx-evm-k3r5-hs-se.conf | 14 +++++++++++
conf/machine/am64xx-evm-k3r5.conf | 11 --------
conf/machine/am64xx-evm.conf | 6 +++++
conf/machine/am64xx-hs-evm-k3r5.conf | 12 ---------
conf/machine/am64xx-hs-evm.conf | 25 -------------------
conf/machine/include/am64xx.inc | 5 ++--
conf/multiconfig/k3r5-hs-se.conf | 3 +++
.../trusted-firmware-a_%.bbappend | 2 +-
recipes-security/optee/optee-os_%.bbappend | 2 +-
10 files changed, 33 insertions(+), 53 deletions(-)
rename conf/machine/{am64xx-hs-evm-k3r5-gp.conf => am64xx-evm-k3r5-gp.conf} (78%)
create mode 100644 conf/machine/am64xx-evm-k3r5-hs-se.conf
delete mode 100644 conf/machine/am64xx-evm-k3r5.conf
delete mode 100644 conf/machine/am64xx-hs-evm-k3r5.conf
delete mode 100644 conf/machine/am64xx-hs-evm.conf
create mode 100644 conf/multiconfig/k3r5-hs-se.confconf/machine/am64xx-evm-k3r5-gp.conf renamed from conf/machine/am64xx-hs-evm-k3r5-gp.conf +5 -1
@@ -4,12 +4,16 @@ # Booting GP requires different SYSFW, the rest is handled at runtime -require conf/machine/am64xx-hs-evm-k3r5.conf +require conf/machine/include/k3r5.inc SOC_FAMILY_append = ":k3r5-gp" +SYSFW_SOC = "am64x" +SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" SYSFW_TIBOOT3_SYMLINK = "" +UBOOT_MACHINE = "am64x_evm_r5_defconfig" + SPL_BINARY = "" UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
conf/machine/am64xx-evm-k3r5-hs-se.conf new file +14 -0
@@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM64xx HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx HS-SE EVM (R5F core) + +# Booting HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-hs-se" + +SYSFW_SOC = "am64x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig"
conf/machine/am64xx-evm-k3r5.conf deleted +0 -11
@@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig"
conf/machine/am64xx-evm.conf +6 -0
@@ -9,3 +9,9 @@ UBOOT_MACHINE = "am64x_evm_a53_defconfig" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" + +# Since default tiboot3.bin on AM64x is for HS-SE, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
conf/machine/am64xx-hs-evm-k3r5.conf deleted +0 -12
@@ -1,12 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig"
conf/machine/am64xx-hs-evm.conf deleted +0 -25
@@ -1,25 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM - -require conf/machine/include/am64xx.inc - -UBOOT_MACHINE = "am64x_evm_a53_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" - -# Since default tiboot3.bin on AM64x is for HS, add a version for GP -BBMULTICONFIG += "k3r5-gp" -IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
conf/machine/include/am64xx.inc +3 -2
@@ -14,8 +14,9 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm-nand.dtbo \ " -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +BBMULTICONFIG = "k3r5-hs-se" +do_image_wic[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x"
conf/multiconfig/k3r5-hs-se.conf new file +3 -0
@@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE_append = "-hs-se"
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +1 -1
@@ -27,7 +27,7 @@ do_compile_append_am65xx-hs-evm() { tfa_sign_k3hs } -do_compile_append_am64xx-hs-evm() { +do_compile_append_am64xx-evm() { tfa_sign_k3hs }
recipes-security/optee/optee-os_%.bbappend +1 -1
@@ -66,7 +66,7 @@ do_compile_append_am65xx-hs-evm() { optee_sign_k3hs } -do_compile_append_am64xx-hs-evm() { +do_compile_append_am64xx-evm() { optee_sign_k3hs }
Signature · 1 line
2.36.1
Re: [meta-ti][dunfell][PATCH 2/2] conf: machine: am64xx-evm: Make HS-SE the default
Quoted 4 lines · Andrew Davis via lists.yoctoproject.org
The HS-SE AM64xx machine can now be run on GP devices and built without needing the
TI_SECURE_DEV_PKGfor the same. AM64xx will only be available in the HS-FS type going forward. Make the HS-SE the default and remove the original GP machine.
Why create another multiconfig? Can all this be done in regular -k3r5?
Quoted 199 lines
Signed-off-by Andrew Davis <[email protected]>--- ...m-k3r5-gp.conf => am64xx-evm-k3r5-gp.conf} | 6 ++++- conf/machine/am64xx-evm-k3r5-hs-se.conf | 14 +++++++++++ conf/machine/am64xx-evm-k3r5.conf | 11 -------- conf/machine/am64xx-evm.conf | 6 +++++ conf/machine/am64xx-hs-evm-k3r5.conf | 12 --------- conf/machine/am64xx-hs-evm.conf | 25 ------------------- conf/machine/include/am64xx.inc | 5 ++-- conf/multiconfig/k3r5-hs-se.conf | 3 +++ .../trusted-firmware-a_%.bbappend | 2 +- recipes-security/optee/optee-os_%.bbappend | 2 +- 10 files changed, 33 insertions(+), 53 deletions(-) rename conf/machine/{am64xx-hs-evm-k3r5-gp.conf => am64xx-evm-k3r5-gp.conf} (78%) create mode 100644 conf/machine/am64xx-evm-k3r5-hs-se.conf delete mode 100644 conf/machine/am64xx-evm-k3r5.conf delete mode 100644 conf/machine/am64xx-hs-evm-k3r5.conf delete mode 100644 conf/machine/am64xx-hs-evm.conf create mode 100644 conf/multiconfig/k3r5-hs-se.confconf/machine/am64xx-evm-k3r5-gp.conf renamed from conf/machine/am64xx-hs-evm-k3r5-gp.conf +5
-1@@ -4,12 +4,16 @@ # Booting GP requires different SYSFW, the rest is handled at runtime -require conf/machine/am64xx-hs-evm-k3r5.conf +require conf/machine/include/k3r5.inc SOC_FAMILY_append = ":k3r5-gp" +SYSFW_SOC = "am64x" +SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" SYSFW_TIBOOT3_SYMLINK = "" +UBOOT_MACHINE = "am64x_evm_r5_defconfig" + SPL_BINARY = "" UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"conf/machine/am64xx-evm-k3r5-hs-se.conf new file +14
-0@@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM64xx HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx HS-SE EVM (R5F core) + +# Booting HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-hs-se" + +SYSFW_SOC = "am64x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig"conf/machine/am64xx-evm-k3r5.conf deleted +0
-11@@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig"conf/machine/am64xx-evm.conf +6
-0@@ -9,3 +9,9 @@ UBOOT_MACHINE = "am64x_evm_a53_defconfig" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" + +# Since default tiboot3.bin on AM64x is for HS-SE, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"conf/machine/am64xx-hs-evm-k3r5.conf deleted +0
-12@@ -1,12 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig"conf/machine/am64xx-hs-evm.conf deleted +0
-25@@ -1,25 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM - -require conf/machine/include/am64xx.inc - -UBOOT_MACHINE = "am64x_evm_a53_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" - -# Since default tiboot3.bin on AM64x is for HS, add a version for GP -BBMULTICONFIG += "k3r5-gp" -IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"conf/machine/include/am64xx.inc +3
-2@@ -14,8 +14,9 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm-nand.dtbo \ " -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +BBMULTICONFIG = "k3r5-hs-se" +do_image_wic[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x"conf/multiconfig/k3r5-hs-se.conf new file +3
-0@@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE_append = "-hs-se"recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +1
-1@@ -27,7 +27,7 @@ do_compile_append_am65xx-hs-evm() { tfa_sign_k3hs } -do_compile_append_am64xx-hs-evm() { +do_compile_append_am64xx-evm() { tfa_sign_k3hs }recipes-security/optee/optee-os_%.bbappend +1
-1@@ -66,7 +66,7 @@ do_compile_append_am65xx-hs-evm() { optee_sign_k3hs } -do_compile_append_am64xx-hs-evm() { +do_compile_append_am64xx-evm() { optee_sign_k3hs }Signature · 1 line
2.36.1
Re: [meta-ti][dunfell][PATCH 2/2] conf: machine: am64xx-evm: Make HS-SE the default
Quoted 8 lines · Denys Dmytriyenko
Quoted 4 lines · Andrew Davis via lists.yoctoproject.org
The HS-SE AM64xx machine can now be run on GP devices and built without needing the
TI_SECURE_DEV_PKGfor the same. AM64xx will only be available in the HS-FS type going forward. Make the HS-SE the default and remove the original GP machine.Why create another multiconfig? Can all this be done in regular -k3r5?
Two reasons, first it is more clear what config builds for what. Eventually the GP can be compleatly dropped, and we will have a single SYSFW bin for both HS-FS and HS-SE, but until then we will have 3 different tiboot3.bin files.
Then it gets worse, AM64x has a PG2.0 that we will support in my next patchset. So in the end, yes we will only have one supported config, but during the transision we will have 5(!):
conf/machine/am64xx-evm-k3r5-gp.confconf/machine/am64xx-evm-k3r5-hs-fs.confconf/machine/am64xx-evm-k3r5-hs-se.confconf/machine/am64xx-evm-k3r5-sr2-hs-fs.confconf/machine/am64xx-evm-k3r5-sr2-hs-se.conf
So wanting to make the names clear from the start.
Andrew
Quoted 200 lines
Quoted 200 lines
Signed-off-by Andrew Davis <[email protected]>--- ...m-k3r5-gp.conf => am64xx-evm-k3r5-gp.conf} | 6 ++++- conf/machine/am64xx-evm-k3r5-hs-se.conf | 14 +++++++++++ conf/machine/am64xx-evm-k3r5.conf | 11 -------- conf/machine/am64xx-evm.conf | 6 +++++ conf/machine/am64xx-hs-evm-k3r5.conf | 12 --------- conf/machine/am64xx-hs-evm.conf | 25 ------------------- conf/machine/include/am64xx.inc | 5 ++-- conf/multiconfig/k3r5-hs-se.conf | 3 +++ .../trusted-firmware-a_%.bbappend | 2 +- recipes-security/optee/optee-os_%.bbappend | 2 +- 10 files changed, 33 insertions(+), 53 deletions(-)rename
conf/machine/{am64xx-hs-evm-k3r5-gp.conf=> am64xx-evm-k3r5-gp.conf} (78%) create mode 100644conf/machine/am64xx-evm-k3r5-hs-se.conf
delete mode 100644conf/machine/am64xx-evm-k3r5.conf
delete mode 100644conf/machine/am64xx-hs-evm-k3r5.conf
delete mode 100644conf/machine/am64xx-hs-evm.conf
create mode 100644conf/multiconfig/k3r5-hs-se.confconf/machine/am64xx-evm-k3r5-gp.conf renamed from conf/machine/am64xx-hs-evm-k3r5-gp.conf +5
-1@@ -4,12 +4,16 @@ # Booting GP requires different SYSFW, the rest is handled at runtime -require conf/machine/am64xx-hs-evm-k3r5.conf +require conf/machine/include/k3r5.inc SOC_FAMILY_append = ":k3r5-gp" +SYSFW_SOC = "am64x" +SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" SYSFW_TIBOOT3_SYMLINK = "" +UBOOT_MACHINE = "am64x_evm_r5_defconfig" + SPL_BINARY = "" UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"conf/machine/am64xx-evm-k3r5-hs-se.conf new file +14
-0@@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM64xx HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx HS-SE EVM (R5F core) + +# Booting HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-hs-se" + +SYSFW_SOC = "am64x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig"conf/machine/am64xx-evm-k3r5.conf deleted +0
-11@@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig"conf/machine/am64xx-evm.conf +6
-0@@ -9,3 +9,9 @@ UBOOT_MACHINE = "am64x_evm_a53_defconfig" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" + +# Since default tiboot3.bin on AM64x is for HS-SE, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"conf/machine/am64xx-hs-evm-k3r5.conf deleted +0
-12@@ -1,12 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig"conf/machine/am64xx-hs-evm.conf deleted +0
-25@@ -1,25 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM - -require conf/machine/include/am64xx.inc - -UBOOT_MACHINE = "am64x_evm_a53_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" - -# Since default tiboot3.bin on AM64x is for HS, add a version for GP -BBMULTICONFIG += "k3r5-gp" -IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"conf/machine/include/am64xx.inc +3
-2@@ -14,8 +14,9 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm-nand.dtbo \ " -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +BBMULTICONFIG = "k3r5-hs-se" +do_image_wic[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x"conf/multiconfig/k3r5-hs-se.conf new file +3
-0@@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE_append = "-hs-se"recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +1
-1@@ -27,7 +27,7 @@ do_compile_append_am65xx-hs-evm() { tfa_sign_k3hs } -do_compile_append_am64xx-hs-evm() { +do_compile_append_am64xx-evm() { tfa_sign_k3hs }recipes-security/optee/optee-os_%.bbappend +1
-1@@ -66,7 +66,7 @@ do_compile_append_am65xx-hs-evm() { optee_sign_k3hs } -do_compile_append_am64xx-hs-evm() { +do_compile_append_am64xx-evm() { optee_sign_k3hs }Signature · 1 line
2.36.1
Quoted 6 lines · Andrew Davis
If we do not have
TI_SECURE_DEV_PKGset then SYSFW generation will fail if we are building for the HS platform. WhenTI_SECURE_DEV_PKGis not set we assume the builder is only interested in the GP boards, so fake generating the HS SYSFW images. These will be non-functional on HS boards, but they would have been just as non-functional if built withoutTI_SECURE_DEV_PKGset.
Have you tested what happens if they do not have it set and build the "dummy" files, and then realize their mistake, set the variable and build again? Do the files then build correctly, or does the sstate cache prevent them from getting the correct thing without clearing the cache and rebuilding everything?
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Quoted 11 lines · Ryan Eatmon
Quoted 6 lines · Andrew Davis
If we do not have
TI_SECURE_DEV_PKGset then SYSFW generation will fail if we are building for the HS platform. WhenTI_SECURE_DEV_PKGis not set we assume the builder is only interested in the GP boards, so fake generating the HS SYSFW images. These will be non-functional on HS boards, but they would have been just as non-functional if built withoutTI_SECURE_DEV_PKGset.
Quoted 3 lines
Have you tested what happens if they do not have it set and build the "dummy" files, and then realize their mistake, set the variable and build again? Do the files then build correctly, or does the sstate cache prevent them from getting the correct thing without clearing the cache and rebuilding everything?
Yes, changing the value of the TI_SECURE_DEV_PKG causes all packages that use it to get rebuilt. I was surprised bitbake was smart enough to do that but seems like it is.
Andrew
Quoted 12 lines · Andrew Davis
Quoted 11 lines · Ryan Eatmon
Quoted 6 lines · Andrew Davis
If we do not have
TI_SECURE_DEV_PKGset then SYSFW generation will fail if we are building for the HS platform. WhenTI_SECURE_DEV_PKGis not set we assume the builder is only interested in the GP boards, so fake generating the HS SYSFW images. These will be non-functional on HS boards, but they would have been just as non-functional if built withoutTI_SECURE_DEV_PKGset.
Quoted 7 lines
Quoted 3 lines
Have you tested what happens if they do not have it set and build the "dummy" files, and then realize their mistake, set the variable and build again? Do the files then build correctly, or does the sstate cache prevent them from getting the correct thing without clearing the cache and rebuilding everything?
Yes, changing the value of the
TI_SECURE_DEV_PKGcauses all packages that use it to get rebuilt. I was surprised bitbake was smart enough to do that but seems like it is.
Nice!
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Denys, Ryan,
I'm not really happy with this patch to be honest. Nor with how we handle TI_SECURE_DEV_PKG in general.
So a little history (Denys correct me if my memory has faded any here). We use TI_SECURE_DEV_PKG for legacy platforms as the SECDEV tools are NDA-only, so they *had* to be feed into the SDK from an external location. This carried over to the K3 machines.
But with K3 we don't have this NDA-only restriction. The K3 TI_SECURE_DEV_PKG tools are fully open source and publicly available on git.ti.com. Now that we are bringing HS to the board market with AM64x, it is time we fix things.
My idea is to treat TI_SECURE_DEV_PKG like the other toolchains. If we define it in our environment then we use that version. If it is not defined then we fetch it for the user. I've got a simple recipe to build a tik3secdev-native package, and am working to use that everywhere we use TI_SECURE_DEV_PKG in recipes today. Then we can use preferred providers to pick which SECDEV to use, the legacy ones, or the K3 one.
The legacy tisecdev-native will require TI_SECURE_DEV_PKG_CAT/AUTO set as required today, but the tik3secdev-native will download it for you if not set.
So my questions are, does this sound like a reasonable approach, and if so do you have any guidance on this? This will require me to dig down into the deeper parts of the build system and I've not done that before. Any pointers welcome.
I'm also thinking on making a dummy secdev package, that just copies the images instead of signing them. That should be the default preferred provider for the non-HS machines, then we can drop the various checks we have based -hs-evm vs -evm. All machines take the same path, then based on the secdev package provider they do the right thing.
Thanks,
Andrew
Quoted 28 lines · Andrew Davis
If we do not have
TI_SECURE_DEV_PKGset then SYSFW generation will fail if we are building for the HS platform. WhenTI_SECURE_DEV_PKGis not set we assume the builder is only interested in the GP boards, so fake generating the HS SYSFW images. These will be non-functional on HS boards, but they would have been just as non-functional if built withoutTI_SECURE_DEV_PKGset.Signed-off-by Andrew Davis <[email protected]>--- recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 5 +++++ 1 file changed, 5 insertions(+)recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +5
-0@@ -66,6 +66,11 @@ EXTRA_OEMAKE_remove_j7-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl. EXTRA_OEMAKE_remove_j7-hs-evm-k3r5-sr1-1 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" do_compile() { + if [ ! "${SYSFW_SUFFIX}" = "gp" ] && [ ! -f ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ]; then + echo "Warning: TI_SECURE_DEV_PKG not set, skipping HS SYSFW generation." + touch ${WORKDIR}/imggen/${SYSFW_TIBOOT3} + exit 0 + fi cd ${WORKDIR}/imggen/ oe_runmake }
Quoted 30 lines · Andrew Davis
Denys, Ryan,
I'm not really happy with this patch to be honest. Nor with how we handle
TI_SECURE_DEV_PKGin general.So a little history (Denys correct me if my memory has faded any here). We use
TI_SECURE_DEV_PKGfor legacy platforms as the SECDEV tools are NDA-only, so they *had* to be feed into the SDK from an external location. This carried over to the K3 machines.But with K3 we don't have this NDA-only restriction. The K3
TI_SECURE_DEV_PKGtools are fully open source and publicly available on git.ti.com. Now that we are bringing HS to the board market with AM64x, it is time we fix things.My idea is to treat
TI_SECURE_DEV_PKGlike the other toolchains. If we define it in our environment then we use that version. If it is not defined then we fetch it for the user. I've got a simple recipe to build a tik3secdev-native package, and am working to use that everywhere we useTI_SECURE_DEV_PKGin recipes today. Then we can use preferred providers to pick which SECDEV to use, the legacy ones, or the K3 one.The legacy tisecdev-native will require TI_SECURE_DEV_PKG_CAT/AUTO set as required today, but the tik3secdev-native will download it for you if not set.
So my questions are, does this sound like a reasonable approach, and if so do you have any guidance on this? This will require me to dig down into the deeper parts of the build system and I've not done that before. Any pointers welcome.
Quoted 9 lines
I'm also thinking on making a dummy secdev package, that just copies the images instead of signing them. That should be the default preferred provider for the non-HS machines, then we can drop the various checks we have based -hs-evm vs -evm. All machines take the same path, then based on the secdev package provider they do the right thing.
Thanks,
Andrew
Okay, gave this a quick attempt, see
https://lore.kernel.org/yocto-meta-ti/[email protected]/
and for its use
https://lore.kernel.org/yocto-meta-ti/[email protected]/
If we like it, we can start to add for the non-K3 machines and drop a bunch of machine specific checks. Move them all to a single preferred provider set in the top level machine configs, instead of out in the recipes.
Andrew
Quoted 28 lines · Andrew Davis
Quoted 27 lines
If we do not have
TI_SECURE_DEV_PKGset then SYSFW generation will fail if we are building for the HS platform. WhenTI_SECURE_DEV_PKGis not set we assume the builder is only interested in the GP boards, so fake generating the HS SYSFW images. These will be non-functional on HS boards, but they would have been just as non-functional if built withoutTI_SECURE_DEV_PKGset.Signed-off-by Andrew Davis <[email protected]>---
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 5 +++++1 file changed, 5 insertions(+)recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +0
-0@@ -66,6 +66,11 @@ EXTRA_OEMAKE_remove_j7-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.EXTRA_OEMAKE_remove_j7-hs-evm-k3r5-sr1-1 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
do_compile(){
+ if [ ! "${SYSFW_SUFFIX}" = "gp" ] && [ ! -f${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh]; then + echo "Warning:TI_SECURE_DEV_PKGnot set, skipping HS SYSFW generation."
+ touch ${WORKDIR}/imggen/${SYSFW_TIBOOT3}
+ exit 0
+ fi
cd ${WORKDIR}/imggen/
oe_runmake
}