[PATCH 2/3] arm-bsp/trusted-firmware-a: corstone1000: Upgrade TF-A to 2.12.1
Clement Faure <[email protected]>
| Newsgroups | org.yoctoproject.lists.meta-arm |
|---|---|
| Message-ID | <[email protected]> |
From: Clément Faure <[email protected]> Upgrade trusted-firmware-a to 2.12.1 for Corstone-1000 When GENERATE_COT is enabled, use the Yocto dependency cot-dt2c instead of installing it with Poetry. Signed-off-by: Clément Faure <[email protected]> --- meta-arm-bsp/conf/machine/include/corstone1000.inc | 4 ++-- .../trusted-firmware-a/trusted-firmware-a-corstone1000.inc | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 6d68cd0f..bbaeee29 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -7,8 +7,8 @@ PREFERRED_VERSION_trusted-firmware-m ?= "2.1.%" # TF-A TFA_PLATFORM = "corstone1000" -PREFERRED_VERSION_trusted-firmware-a ?= "2.11.%" -PREFERRED_VERSION_tf-a-tests ?= "2.10.%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.12.%" +PREFERRED_VERSION_tf-a-tests ?= "2.12.%" TFA_BL2_BINARY = "bl2-corstone1000.bin" TFA_FIP_BINARY = "fip-corstone1000.bin" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc index f6677f70..5e41ab6e 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc @@ -56,3 +56,9 @@ EXTRA_OEMAKE:append = " \ FVP_USE_GIC_DRIVER=FVP_GICV2 \ " EXTRA_OEMAKE:append:corstone1000-fvp = "${@bb.utils.contains('MACHINE_FEATURES', 'corstone1000_fvp_smp', ' ENABLE_MULTICORE=1', '', d)}" + +# If GENERATE_COT is set, then TF-A will try to use local poetry install +# to run the python cot-dt2c command. Disable the local poetry and use +# the provided cot-dt2c. +EXTRA_OEMAKE += "POETRY=''" +DEPENDS += "cot-dt2c-native"