Skip to content

Commit a569161

Browse files
mswarowskyVge0rge
authored andcommitted
[nrf fromlist] modules: tf-m: Remove QCBOR path from build
QCBOR is only needed by the TF-M tests, as they are not build separately due to the TF-M split build By still setting it we get a CMake build warning Upstream PR: zephyrproject-rtos/zephyr#68619 Signed-off-by: Markus Swarowsky <[email protected]>
1 parent 0a6e189 commit a569161

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

modules/trusted-firmware-m/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,6 @@ if (CONFIG_BUILD_WITH_TFM)
229229

230230
string(REPLACE "toolchain" "toolchain_ns" TFM_TOOLCHAIN_NS_FILE ${TFM_TOOLCHAIN_FILE})
231231

232-
if (CONFIG_TFM_QCBOR_PATH STREQUAL "DOWNLOAD")
233-
# Change CMake cache type to string to avoid QCBOR_PATH=/absolute/path/DOWNLOAD being set.
234-
set(QCBOR_PATH_TYPE ":STRING")
235-
endif()
236-
# Always set QCBOR_PATH, this will make sure that we don't automatically download this
237-
# dependency in the TF-M build system and it will fail when set to an invalid value.
238-
list(APPEND TFM_CMAKE_ARGS -DQCBOR_PATH${QCBOR_PATH_TYPE}=${CONFIG_TFM_QCBOR_PATH})
239-
240232
if(CONFIG_BOARD_LPCXPRESSO55S69_CPU0)
241233
# Supply path to NXP HAL sources used for TF-M build
242234
set(TFM_PLATFORM_NXP_HAL_FILE_PATH ${ZEPHYR_TRUSTED_FIRMWARE_M_MODULE_DIR}/platform/ext/target/nxp/)

0 commit comments

Comments
 (0)