From be25c94f2286326abda64ee43cd26bc571e84fac Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Sat, 26 Oct 2024 12:46:41 +0900 Subject: [PATCH] modules: trusted-firmware-m: Remove 'xtools' toolchain support This commit removes the TF-M support for the `xtools` toolchain variant, which has been deprecated since Zephyr v3.3.0 and now removed. Note that `zephyr` toolchain variant must be used instead of `xtools` when building with Zephyr SDK. Signed-off-by: Stephanos Ioannidis --- modules/trusted-firmware-m/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/trusted-firmware-m/CMakeLists.txt b/modules/trusted-firmware-m/CMakeLists.txt index fff2be36070..05553a31992 100644 --- a/modules/trusted-firmware-m/CMakeLists.txt +++ b/modules/trusted-firmware-m/CMakeLists.txt @@ -210,10 +210,6 @@ if (CONFIG_BUILD_WITH_TFM) set(TFM_TOOLCHAIN_FILE "toolchain_GNUARM.cmake") set(TFM_TOOLCHAIN_PREFIX "arm-none-eabi") set(TFM_TOOLCHAIN_PATH ${GNUARMEMB_TOOLCHAIN_PATH}/bin) - elseif(${ZEPHYR_TOOLCHAIN_VARIANT} STREQUAL "xtools") - set(TFM_TOOLCHAIN_FILE "toolchain_GNUARM.cmake") - set(TFM_TOOLCHAIN_PREFIX "arm-zephyr-eabi") - set(TFM_TOOLCHAIN_PATH ${XTOOLS_TOOLCHAIN_PATH}/arm-zephyr-eabi/bin) else() message(FATAL_ERROR "Unsupported ZEPHYR_TOOLCHAIN_VARIANT: ${ZEPHYR_TOOLCHAIN_VARIANT}") endif()