Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dey-toolchain: fix including machine-specific SDK tools 

Fixes commit b143804dbb, since in nativesdk
context MACHINE_FEATURES is reset to SDK_MACHINE_FEATURES, causing OP-TEE
building tools to be missing from the generated SDK.

https://onedigi.atlassian.net/browse/DEL-9663

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2025-06-06 12:30:33 +02:00
parent a2153e44ef
commit 0fa18775ad
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/conf/machine/include/ccimx8m.inc
View File

@ -54,6 +54,10 @@ MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip mca optee" MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip mca optee"
# For nativesdk packages that need to go to the toolchain depending on an
# specific machine feature.
SDK_MACHINE_FEATURES:append = " optee"
# TrustFence # TrustFence
TRUSTFENCE_SIGN_MODE = "HAB" TRUSTFENCE_SIGN_MODE = "HAB"

4
meta-digi-arm/conf/machine/include/ccimx9.inc
View File

@ -40,6 +40,10 @@ DDR_FIRMWARE_NAME = " \
MACHINE_FEATURES += "pci wifi bluetooth" MACHINE_FEATURES += "pci wifi bluetooth"
MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse" MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse"
# For nativesdk packages that need to go to the toolchain depending on an
# specific machine feature.
SDK_MACHINE_FEATURES:append = " optee"
STORAGE_MEDIA = "mmc" STORAGE_MEDIA = "mmc"
WLAN_P2P_INTERFACE = "wfd0" WLAN_P2P_INTERFACE = "wfd0"

2
meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend
View File

@ -1,6 +1,6 @@
# Copyright (C) 2016-2025, Digi International Inc. # Copyright (C) 2016-2025, Digi International Inc.
IMX_OPTEE_SDK_RDEPENDS ?= "${@bb.utils.contains('MACHINE_FEATURES', 'optee', \ IMX_OPTEE_SDK_RDEPENDS ?= "${@bb.utils.contains('SDK_MACHINE_FEATURES', 'optee', \
'nativesdk-python3-cryptography nativesdk-python3-pyelftools', \ 'nativesdk-python3-cryptography nativesdk-python3-pyelftools', \
'', d)}" '', d)}"