Commit fa2442af authored by Keith Packard's avatar Keith Packard Committed by Stephanos Ioannidis
Browse files

modules/trusted-firmware-m: zephyr/gnu toolchain has a different path 

The SDK has gratuitously moved all gcc toolchains to a subdirectory; adapt
to that by adding 'gnu/' when necessary

Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 0a51bb8a

modules/trusted-firmware-m/CMakeLists.txt

+6 −0
Changes for modules/trusted-firmware-m/CMakeLists.txt: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -224,7 +224,13 @@ if (CONFIG_BUILD_WITH_TFM) 
  if(${ZEPHYR_TOOLCHAIN_VARIANT} STREQUAL "zephyr")

    set(TFM_TOOLCHAIN_FILE "toolchain_GNUARM.cmake")

    set(TFM_TOOLCHAIN_PREFIX "arm-zephyr-eabi")

    if(${TOOLCHAIN_VARIANT_COMPILER} STREQUAL "gnu")

      set(TFM_TOOLCHAIN_PATH ${ZEPHYR_SDK_INSTALL_DIR}/gnu/arm-zephyr-eabi/bin)

    elseif(${TOOLCHAIN_VARIANT_COMPILER} STREQUAL "llvm")

      set(TFM_TOOLCHAIN_PATH ${ZEPHYR_SDK_INSTALL_DIR}/llvm/bin)

    else()

      set(TFM_TOOLCHAIN_PATH ${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin)

    endif()

  elseif(${ZEPHYR_TOOLCHAIN_VARIANT} STREQUAL "gnuarmemb")

    set(TFM_TOOLCHAIN_FILE "toolchain_GNUARM.cmake")

    set(TFM_TOOLCHAIN_PREFIX "arm-none-eabi")

CRA Git | Maintained and supported by SUSTech CRA and CCSE