Skip to content

CMake remove IAR references in the tree #14295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 22, 2021
Merged

CMake remove IAR references in the tree #14295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09dd4d2
CMake platform: remove IAR related CMakeLists
0xc0170 Feb 17, 2021
85c2d7a
CMake: remove IAR references as they are not supported
0xc0170 Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions cmsis/CMSIS_5/CMSIS/RTOS2/RTX/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions cmsis/device/rtos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions .../drivers/emac/TARGET_RDA_EMAC/lwip-wifi/arch/TARGET_RDA/TARGET_UNO_91H/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +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_get_lib_file_uno_91h)
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
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()
Expand Down
5 changes: 1 addition & 4 deletions connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions platform/source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()

Expand Down
10 changes: 0 additions & 10 deletions platform/source/TARGET_CORTEX_A/CMakeLists.txt
View file
Open in desktop

This file was deleted.

23 changes: 6 additions & 17 deletions platform/source/TARGET_CORTEX_M/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand 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)
Expand Down