diff --git a/cmake/toolchain/zephyr/0.11/Kconfig b/cmake/toolchain/zephyr/0.11/Kconfig deleted file mode 100644 index f8a37312de4..00000000000 --- a/cmake/toolchain/zephyr/0.11/Kconfig +++ /dev/null @@ -1,8 +0,0 @@ -# Zephyr 0.11 SDK Toolchain - -# Copyright (c) 2020 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -config TOOLCHAIN_ZEPHYR_0_11 - def_bool y - select HAS_NEWLIB_LIBC_NANO if (ARC || ARM || RISCV) diff --git a/cmake/toolchain/zephyr/0.11/generic.cmake b/cmake/toolchain/zephyr/0.11/generic.cmake deleted file mode 100644 index 0224d5ad9c0..00000000000 --- a/cmake/toolchain/zephyr/0.11/generic.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -set(TOOLCHAIN_HOME ${ZEPHYR_SDK_INSTALL_DIR}) - -set(COMPILER gcc) -set(LINKER ld) -set(BINTOOLS gnu) - -# Find some toolchain that is distributed with this particular SDK - -file(GLOB toolchain_paths - LIST_DIRECTORIES true - ${TOOLCHAIN_HOME}/xtensa/*/*-zephyr-elf - ${TOOLCHAIN_HOME}/*-zephyr-elf - ${TOOLCHAIN_HOME}/*-zephyr-eabi - ) - -if(toolchain_paths) - list(GET toolchain_paths 0 some_toolchain_path) - - get_filename_component(one_toolchain_root "${some_toolchain_path}" DIRECTORY) - get_filename_component(one_toolchain "${some_toolchain_path}" NAME) - - set(CROSS_COMPILE_TARGET ${one_toolchain}) - set(SYSROOT_TARGET ${one_toolchain}) -endif() - -if(NOT CROSS_COMPILE_TARGET) - message(FATAL_ERROR "Unable to find 'x86_64-zephyr-elf' or any other architecture in ${TOOLCHAIN_HOME}") -endif() - -set(CROSS_COMPILE ${one_toolchain_root}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-) -set(SYSROOT_DIR ${one_toolchain_root}/${SYSROOT_TARGET}/${SYSROOT_TARGET}) -set(TOOLCHAIN_HAS_NEWLIB ON CACHE BOOL "True if toolchain supports newlib") diff --git a/cmake/toolchain/zephyr/0.11/host-tools.cmake b/cmake/toolchain/zephyr/0.11/host-tools.cmake deleted file mode 100644 index 604c8ade4ca..00000000000 --- a/cmake/toolchain/zephyr/0.11/host-tools.cmake +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -set(HOST_TOOLS_HOME ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${TOOLCHAIN_ARCH}-pokysdk-linux) - -# Path used for searching by the find_*() functions, with appropriate -# suffixes added. Ensures that the SDK's host tools will be found when -# we call, e.g. find_program(QEMU qemu-system-x86) -list(APPEND CMAKE_PREFIX_PATH ${HOST_TOOLS_HOME}/usr) - -# TODO: Use find_* somehow for these as well? -set_ifndef(QEMU_BIOS ${HOST_TOOLS_HOME}/usr/share/qemu) -set_ifndef(OPENOCD_DEFAULT_PATH ${HOST_TOOLS_HOME}/usr/share/openocd/scripts) diff --git a/cmake/toolchain/zephyr/0.11/target.cmake b/cmake/toolchain/zephyr/0.11/target.cmake deleted file mode 100644 index 5f2d97109f4..00000000000 --- a/cmake/toolchain/zephyr/0.11/target.cmake +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -set(CROSS_COMPILE_TARGET_arm arm-zephyr-eabi) -set(CROSS_COMPILE_TARGET_arm64 aarch64-zephyr-elf) -set(CROSS_COMPILE_TARGET_nios2 nios2-zephyr-elf) -set(CROSS_COMPILE_TARGET_riscv riscv64-zephyr-elf) -set(CROSS_COMPILE_TARGET_mips mipsel-zephyr-elf) -set(CROSS_COMPILE_TARGET_xtensa xtensa-zephyr-elf) -set(CROSS_COMPILE_TARGET_arc arc-zephyr-elf) -set(CROSS_COMPILE_TARGET_x86 x86_64-zephyr-elf) -set(CROSS_COMPILE_TARGET_sparc sparc-zephyr-elf) - -set(CROSS_COMPILE_TARGET ${CROSS_COMPILE_TARGET_${ARCH}}) -set(SYSROOT_TARGET ${CROSS_COMPILE_TARGET}) - -if("${ARCH}" STREQUAL "xtensa") - # Xtensa GCC needs a different toolchain per SOC - if("${SOC_SERIES}" STREQUAL "cavs_v15") - set(SR_XT_TC_SOC intel_apl_adsp) - elseif("${SOC_SERIES}" STREQUAL "cavs_v18") - set(SR_XT_TC_SOC intel_s1000) - elseif("${SOC_SERIES}" STREQUAL "cavs_v20") - set(SR_XT_TC_SOC intel_s1000) - elseif("${SOC_SERIES}" STREQUAL "cavs_v25") - set(SR_XT_TC_SOC intel_s1000) - elseif("${SOC_SERIES}" STREQUAL "baytrail_adsp") - set(SR_XT_TC_SOC intel_byt_adsp) - elseif("${SOC_SERIES}" STREQUAL "broadwell_adsp") - set(SR_XT_TC_SOC intel_bdw_adsp) - elseif("${SOC_SERIES}" STREQUAL "imx8") - set(SR_XT_TC_SOC nxp_imx_adsp) - elseif("${SOC_SERIES}" STREQUAL "imx8m") - set(SR_XT_TC_SOC nxp_imx8m_adsp) - else() - message(FATAL_ERROR "Not compiler set for SOC_SERIES ${SOC_SERIES}") - endif() - set(SYSROOT_DIR ${TOOLCHAIN_HOME}/xtensa/${SR_XT_TC_SOC}/${SYSROOT_TARGET}) - set(CROSS_COMPILE ${TOOLCHAIN_HOME}/xtensa/${SR_XT_TC_SOC}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-) -else() - # Non-Xtensa SDK toolchains follow a simpler convention - set(SYSROOT_DIR ${TOOLCHAIN_HOME}/${SYSROOT_TARGET}/${SYSROOT_TARGET}) - set(CROSS_COMPILE ${TOOLCHAIN_HOME}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-) -endif() - -if("${ARCH}" STREQUAL "x86") - if(CONFIG_X86_64) - list(APPEND TOOLCHAIN_C_FLAGS -m64) - list(APPEND TOOLCHAIN_LD_FLAGS -m64) - else() - list(APPEND TOOLCHAIN_C_FLAGS -m32) - list(APPEND TOOLCHAIN_LD_FLAGS -m32) - endif() -endif() diff --git a/cmake/toolchain/zephyr/generic.cmake b/cmake/toolchain/zephyr/generic.cmake index b4c25b79be5..bc98939a02f 100644 --- a/cmake/toolchain/zephyr/generic.cmake +++ b/cmake/toolchain/zephyr/generic.cmake @@ -1,13 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -if(${SDK_VERSION} VERSION_LESS_EQUAL 0.11.2) - # For backward compatibility with 0.11.1 and 0.11.2 - # we need to source files from Zephyr repo - include(${CMAKE_CURRENT_LIST_DIR}/${SDK_MAJOR_MINOR}/generic.cmake) +include(${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr/generic.cmake) - set(TOOLCHAIN_KCONFIG_DIR ${CMAKE_CURRENT_LIST_DIR}/${SDK_MAJOR_MINOR}) -else() - include(${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr/generic.cmake) - - set(TOOLCHAIN_KCONFIG_DIR ${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr) -endif() +set(TOOLCHAIN_KCONFIG_DIR ${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr) diff --git a/cmake/toolchain/zephyr/host-tools.cmake b/cmake/toolchain/zephyr/host-tools.cmake index 2522c86bf8f..cc50b73744a 100644 --- a/cmake/toolchain/zephyr/host-tools.cmake +++ b/cmake/toolchain/zephyr/host-tools.cmake @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -# This is the minimum required version for Zephyr to work (Old style) -set(REQUIRED_SDK_VER 0.11.1) -cmake_host_system_information(RESULT TOOLCHAIN_ARCH QUERY OS_PLATFORM) - if(NOT DEFINED ZEPHYR_SDK_INSTALL_DIR) # Until https://github.com/zephyrproject-rtos/zephyr/issues/4912 is # resolved we use ZEPHYR_SDK_INSTALL_DIR to determine whether the user @@ -14,42 +10,6 @@ endif() # Cache the Zephyr SDK install dir. set(ZEPHYR_SDK_INSTALL_DIR ${ZEPHYR_SDK_INSTALL_DIR} CACHE PATH "Zephyr SDK install directory") -if(NOT DEFINED SDK_VERSION) - if(ZEPHYR_TOOLCHAIN_VARIANT AND ZEPHYR_SDK_INSTALL_DIR) - # Manual detection for Zephyr SDK 0.11.1 and 0.11.2 for backward compatibility. - set(sdk_version_path ${ZEPHYR_SDK_INSTALL_DIR}/sdk_version) - if(NOT (EXISTS ${sdk_version_path})) - message(FATAL_ERROR - "The file '${ZEPHYR_SDK_INSTALL_DIR}/sdk_version' was not found. \ - Is ZEPHYR_SDK_INSTALL_DIR=${ZEPHYR_SDK_INSTALL_DIR} misconfigured?") - endif() - - # Read version as published by the SDK - file(READ ${sdk_version_path} SDK_VERSION_PRE1) - # Remove any pre-release data, for example 0.10.0-beta4 -> 0.10.0 - string(REGEX REPLACE "-.*" "" SDK_VERSION_PRE2 ${SDK_VERSION_PRE1}) - # Strip any trailing spaces/newlines from the version string - string(STRIP ${SDK_VERSION_PRE2} SDK_VERSION) - string(REGEX MATCH "([0-9]*).([0-9]*)" SDK_MAJOR_MINOR ${SDK_VERSION}) - - string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" SDK_MAJOR_MINOR_MICRO ${SDK_VERSION}) - - #at least 0.0.0 - if(NOT SDK_MAJOR_MINOR_MICRO) - message(FATAL_ERROR "sdk version: ${SDK_MAJOR_MINOR_MICRO} improper format. - Expected format: x.y.z - Check whether the Zephyr SDK was installed correctly. - ") - endif() - endif() -endif() - message(STATUS "Using toolchain: zephyr ${SDK_VERSION} (${ZEPHYR_SDK_INSTALL_DIR})") -if(${SDK_VERSION} VERSION_LESS_EQUAL 0.11.2) - # For backward compatibility with 0.11.1 and 0.11.2 - # we need to source files from Zephyr repo - include(${CMAKE_CURRENT_LIST_DIR}/${SDK_MAJOR_MINOR}/host-tools.cmake) -else() - include(${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr/host-tools.cmake) -endif() +include(${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr/host-tools.cmake) diff --git a/cmake/toolchain/zephyr/target.cmake b/cmake/toolchain/zephyr/target.cmake index 39f5cd2c1bf..fd1ec6d55fd 100644 --- a/cmake/toolchain/zephyr/target.cmake +++ b/cmake/toolchain/zephyr/target.cmake @@ -1,18 +1,9 @@ # SPDX-License-Identifier: Apache-2.0 -if(${SDK_VERSION} VERSION_LESS_EQUAL 0.11.2) - # For backward compatibility with 0.11.1 and 0.11.2 - # we need to source files from Zephyr repo - include(${CMAKE_CURRENT_LIST_DIR}/${SDK_MAJOR_MINOR}/target.cmake) -elseif(("${ARCH}" STREQUAL "sparc") AND (${SDK_VERSION} VERSION_LESS 0.12)) - # SDK 0.11.3, 0.11.4 does not have SPARC target support. - include(${CMAKE_CURRENT_LIST_DIR}/${SDK_MAJOR_MINOR}/target.cmake) -else() - include(${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr/target.cmake) +include(${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr/target.cmake) - # Workaround, FIXME: Waiting for new SDK. - if("${ARCH}" STREQUAL "xtensa") - set(SYSROOT_DIR ${TOOLCHAIN_HOME}/xtensa/${SOC_TOOLCHAIN_NAME}/${SYSROOT_TARGET}) - set(CROSS_COMPILE ${TOOLCHAIN_HOME}/xtensa/${SOC_TOOLCHAIN_NAME}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-) - endif() +# Workaround, FIXME: Waiting for new SDK. +if("${ARCH}" STREQUAL "xtensa") + set(SYSROOT_DIR ${TOOLCHAIN_HOME}/xtensa/${SOC_TOOLCHAIN_NAME}/${SYSROOT_TARGET}) + set(CROSS_COMPILE ${TOOLCHAIN_HOME}/xtensa/${SOC_TOOLCHAIN_NAME}/${CROSS_COMPILE_TARGET}/bin/${CROSS_COMPILE_TARGET}-) endif()