ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14295 from 0xc0170/cmake-remove-iar 

CMake remove IAR references in the tree
pull/14299/head
Martin Kojtal 2021-02-22 20:10:40 +00:00 committed by GitHub
parent 7369b63769 85c2d7a25c
commit 7b6c7cc2ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmsis/CMSIS_5/CMSIS/RTOS2/RTX/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
function(_mbed_get_cortex_m_exception_handlers toolchain_dir)
@ -42,8 +42,6 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
_mbed_get_cortex_m_exception_handlers(TOOLCHAIN_GCC)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
_mbed_get_cortex_m_exception_handlers(TOOLCHAIN_ARM)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
_mbed_get_cortex_m_exception_handlers(TOOLCHAIN_IAR)
endif()
target_include_directories(mbed-rtos

7
cmsis/device/rtos/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
@ -11,11 +11,6 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
INTERFACE
TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c
)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
target_sources(mbed-rtos
INTERFACE
TOOLCHAIN_IAR/mbed_boot_iar.c
)
endif()
target_include_directories(mbed-rtos

4
connectivity/drivers/emac/TARGET_RDA_EMAC/lwip-wifi/arch/TARGET_RDA/TARGET_UNO_91H/lib/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
function(_mbed_get_lib_file_uno_91h)
@ -6,8 +6,6 @@ function(_mbed_get_lib_file_uno_91h)
set(LIB_FILE TOOLCHAIN_GCC_ARM/libwifi_sta_ap.a)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(LIB_FILE TOOLCHAIN_ARM_STD/libwifi_sta_ap.ar)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
set(LIB_FILE TOOLCHAIN_IAR/libwifi_sta_ap.a)
endif()
target_sources(mbed-emac PRIVATE ${LIB_FILE})
endfunction()

5
connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
@ -7,9 +7,6 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(LIBCC_310_EXT TOOLCHAIN_ARM/libcc_310_ext.ar)
set(LIBCC_310_TRNG TOOLCHAIN_ARM/libcc_310_trng.ar)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
set(LIBCC_310_EXT TOOLCHAIN_IAR/lib_cc310_ext.a)
set(LIBCC_310_TRNG TOOLCHAIN_IAR/lib_cc310_trng.a)
endif()
target_include_directories(mbed-mbedtls-cryptocell310

4
connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt
View File

@ -1,12 +1,10 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(LIBCC_310_CORE TOOLCHAIN_GCC_ARM/libcc_310_core.a)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(LIBCC_310_CORE TOOLCHAIN_ARM/libcc_310_core.ar)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
set(LIBCC_310_CORE TOOLCHAIN_IAR/lib_cc310_ext.a)
endif()
target_link_libraries(mbed-mbedtls-cryptocell310

4
platform/source/CMakeLists.txt
View File

@ -1,9 +1,7 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
if("CORTEX_A" IN_LIST MBED_TARGET_LABELS)
add_subdirectory(TARGET_CORTEX_A)
elseif("CORTEX_M" IN_LIST MBED_TARGET_LABELS)
if("CORTEX_M" IN_LIST MBED_TARGET_LABELS)
add_subdirectory(TARGET_CORTEX_M)
endif()

10
platform/source/TARGET_CORTEX_A/CMakeLists.txt
View File

@ -1,10 +0,0 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
function(_mbed_get_system_init)
if(${MBED_TOOLCHAIN} STREQUAL "IAR")
target_sources(mbed-core PRIVATE TOOLCHAIN_IAR/cmain.S)
endif()
endfunction()
_mbed_get_system_init()

23
platform/source/TARGET_CORTEX_M/CMakeLists.txt
View File

@ -1,22 +1,11 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
function(_mbed_set_assembly_source)
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
target_sources(mbed-core INTERFACE TOOLCHAIN_GCC/except.S)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
target_sources(mbed-core INTERFACE TOOLCHAIN_ARM/except.S)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
target_sources(mbed-core
INTERFACE
TOOLCHAIN_IAR/except.S
TOOLCHAIN_IAR/cmain.S
)
endif()
endfunction()
_mbed_set_assembly_source()
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
target_sources(mbed-core INTERFACE TOOLCHAIN_GCC/except.S)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
target_sources(mbed-core INTERFACE TOOLCHAIN_ARM/except.S)
endif()
target_sources(mbed-core
INTERFACE

5
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_subdirectory(TARGET_DISCO_L475VG_IOT01A EXCLUDE_FROM_ALL)
@ -9,9 +9,6 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32l475xx.S)
set(LINKER_FILE TOOLCHAIN_ARM/stm32l475xg.sct)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
set(STARTUP_FILE TOOLCHAIN_IAR/startup_stm32l475xx.S)
set(LINKER_FILE TOOLCHAIN_IAR/stm32l475xg.icf)
endif()
add_library(mbed-stm32l475xg INTERFACE)