From 302c86041f0884ef746b6dda95ff9571b16182c0 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Mon, 8 Feb 2021 16:46:30 +0000 Subject: [PATCH 1/5] ARM FM: refactor CMake targets --- targets/TARGET_ARM_FM/CMakeLists.txt | 8 +- .../TARGET_FVP_MPS2/CMakeLists.txt | 89 ++----------------- .../TARGET_FVP_MPS2_M0/CMakelists.txt | 27 ++++++ .../TARGET_FVP_MPS2_M0P/CMakelists.txt | 27 ++++++ .../TARGET_FVP_MPS2_M3/CMakelists.txt | 27 ++++++ .../TARGET_FVP_MPS2_M4/CMakelists.txt | 31 +++++++ .../TARGET_FVP_MPS2_M7/CMakelists.txt | 32 +++++++ 7 files changed, 156 insertions(+), 85 deletions(-) create mode 100644 targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt create mode 100644 targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt create mode 100644 targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt create mode 100644 targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt create mode 100644 targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt diff --git a/targets/TARGET_ARM_FM/CMakeLists.txt b/targets/TARGET_ARM_FM/CMakeLists.txt index 2fb8fab24a..26c9500017 100644 --- a/targets/TARGET_ARM_FM/CMakeLists.txt +++ b/targets/TARGET_ARM_FM/CMakeLists.txt @@ -1,11 +1,11 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if("FVP_MPS2" IN_LIST MBED_TARGET_LABELS) - add_subdirectory(TARGET_FVP_MPS2) -endif() +add_library(ARM_FM INTERFACE) -target_include_directories(mbed-core +add_subdirectory(TARGET_FVP_MPS2 EXCLUDE_FROM_ALL) + +target_include_directories(ARM_FM INTERFACE . ) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt index 4c4bc20bc9..da43a5b8b4 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt @@ -1,93 +1,22 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if("FVP_MPS2_M0" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_FVP_MPS2_M0/device - ) +add_subdirectory(TARGET_FVP_MPS2_M0 EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_FVP_MPS2_M0P EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_FVP_MPS2_M3 EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_FVP_MPS2_M4 EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_FVP_MPS2_M7 EXCLUDE_FROM_ALL) - set(SYSTEM_FILE TARGET_FVP_MPS2_M0/device/system_CMSDK_CM0.c) +add_library(FVP_MPS2 INTERFACE) - if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE TARGET_FVP_MPS2_M0/device/TOOLCHAIN_ARM_STD/MPS2.sct) - set(STARTUP_FILE TARGET_FVP_MPS2_M0/device/TOOLCHAIN_ARM_STD/startup_MPS2.S) - elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE TARGET_FVP_MPS2_M0/device/TOOLCHAIN_GCC_ARM/MPS2.ld) - set(STARTUP_FILE TARGET_FVP_MPS2_M0/device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) - endif() -elseif("FVP_MPS2_M0P" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_FVP_MPS2_M0P/device - ) - - set(SYSTEM_FILE TARGET_FVP_MPS2_M0P/device/system_CMSDK_CM0plus.c) - - if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE TARGET_FVP_MPS2_M0P/device/TOOLCHAIN_ARM_STD/MPS2.sct) - set(STARTUP_FILE TARGET_FVP_MPS2_M0P/device/TOOLCHAIN_ARM_STD/startup_MPS2.S) - elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE TARGET_FVP_MPS2_M0P/device/TOOLCHAIN_GCC_ARM/MPS2.ld) - set(STARTUP_FILE TARGET_FVP_MPS2_M0P/device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) - endif() -elseif("FVP_MPS2_M3" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_FVP_MPS2_M3/device - ) - - set(SYSTEM_FILE TARGET_FVP_MPS2_M3/device/system_CMSDK_CM3.c) - - if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE TARGET_FVP_MPS2_M3/device/TOOLCHAIN_ARM_STD/MPS2.sct) - set(STARTUP_FILE TARGET_FVP_MPS2_M3/device/TOOLCHAIN_ARM_STD/startup_MPS2.S) - elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE TARGET_FVP_MPS2_M3/device/TOOLCHAIN_GCC_ARM/MPS2.ld) - set(STARTUP_FILE TARGET_FVP_MPS2_M3/device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) - endif() -elseif("FVP_MPS2_M4" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_FVP_MPS2_M4/device - ) - - set(SYSTEM_FILE TARGET_FVP_MPS2_M4/device/system_CMSDK_CM4.c) - - if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE TARGET_FVP_MPS2_M4/device/TOOLCHAIN_ARM_STD/MPS2.sct) - set(STARTUP_FILE TARGET_FVP_MPS2_M4/device/TOOLCHAIN_ARM_STD/startup_MPS2.S) - elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE TARGET_FVP_MPS2_M4/device/TOOLCHAIN_GCC_ARM/MPS2.ld) - set(STARTUP_FILE TARGET_FVP_MPS2_M4/device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) - endif() -elseif("FVP_MPS2_M7" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_FVP_MPS2_M7/device - ) - - set(SYSTEM_FILE TARGET_FVP_MPS2_M7/device/system_CMSDK_CM7.c) - - if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE TARGET_FVP_MPS2_M7/device/TOOLCHAIN_ARM_STD/MPS2.sct) - set(STARTUP_FILE TARGET_FVP_MPS2_M7/device/TOOLCHAIN_ARM_STD/startup_CMSDK_CM7.S) - elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE TARGET_FVP_MPS2_M7/device/TOOLCHAIN_GCC_ARM/MPS2.ld) - set(STARTUP_FILE TARGET_FVP_MPS2_M7/device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) - endif() -endif() - -set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) - -target_include_directories(mbed-core +target_include_directories(FVP_MPS2 INTERFACE . drivers SDK ) -target_sources(mbed-core +target_sources(FVP_MPS2 INTERFACE analogin_api.c flash_api.c @@ -106,6 +35,4 @@ target_sources(mbed-core drivers/lan91c111.c SDK/fpga.c - ${SYSTEM_FILE} - ${STARTUP_FILE} ) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt new file mode 100644 index 0000000000..8dd98a1b32 --- /dev/null +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt @@ -0,0 +1,27 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(FVP_MPS2_M0 INTERFACE) + +if(${MBED_TOOLCHAIN} STREQUAL "ARM") + set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct) + set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_MPS2.S) +elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") + set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/MPS2.ld) + set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) +endif() + +mbed_set_linker_script(FVP_MPS2_M0 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) + +target_include_directories(FVP_MPS2_M0 + INTERFACE + device +) + +target_sources(FVP_MPS2_M0 + INTERFACE + device/system_CMSDK_CM0.c + ${STARTUP_FILE} +) + +target_link_libraries(FVP_MPS2_M0 INTERFACE FVP_MPS2 ARM_FM) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt new file mode 100644 index 0000000000..467a882790 --- /dev/null +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt @@ -0,0 +1,27 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(FVP_MPS2_M0P INTERFACE) + +if(${MBED_TOOLCHAIN} STREQUAL "ARM") + set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct) + set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_MPS2.S) +elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") + set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/MPS2.ld) + set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) +endif() + +mbed_set_linker_script(FVP_MPS2_M0P ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) + +target_include_directories(FVP_MPS2_M0P + INTERFACE + device +) + +target_sources(FVP_MPS2_M0P + INTERFACE + device/system_CMSDK_CM0plus.c + ${STARTUP_FILE} +) + +target_link_libraries(FVP_MPS2_M0P INTERFACE FVP_MPS2 ARM_FM) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt new file mode 100644 index 0000000000..01389329b2 --- /dev/null +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt @@ -0,0 +1,27 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(FVP_MPS2_M3 INTERFACE) + +if(${MBED_TOOLCHAIN} STREQUAL "ARM") + set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct) + set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_MPS2.S) +elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") + set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/MPS2.ld) + set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) +endif() + +mbed_set_linker_script(FVP_MPS2_M3 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) + +target_include_directories(FVP_MPS2_M3 + INTERFACE + device +) + +target_sources(FVP_MPS2_M3 + INTERFACE + device/system_CMSDK_CM3.c + ${STARTUP_FILE} +) + +target_link_libraries(FVP_MPS2_M3 INTERFACE FVP_MPS2 ARM_FM) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt new file mode 100644 index 0000000000..92cbb0e1ca --- /dev/null +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt @@ -0,0 +1,31 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(FVP_MPS2_M4 INTERFACE) + +target_include_directories(FVP_MPS2_M4 + INTERFACE + device +) + +if(${MBED_TOOLCHAIN} STREQUAL "ARM") + set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct) + set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_MPS2.S) +elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") + set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/MPS2.ld) + set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) +endif() +mbed_set_linker_script(FVP_MPS2_M4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) + +target_include_directories(FVP_MPS2_M4 + INTERFACE + device +) + +target_sources(FVP_MPS2_M4 + INTERFACE + device/system_CMSDK_CM4.c + ${STARTUP_FILE} +) + +target_link_libraries(FVP_MPS2_M4 INTERFACE FVP_MPS2 ARM_FM) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt new file mode 100644 index 0000000000..6d84433580 --- /dev/null +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt @@ -0,0 +1,32 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(FVP_MPS2_M7 INTERFACE) + +target_include_directories(FVP_MPS2_M7 + INTERFACE + device +) + +if(${MBED_TOOLCHAIN} STREQUAL "ARM") + set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct) + set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_CMSDK_CM7.S) +elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") + set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/MPS2.ld) + set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) +endif() + +mbed_set_linker_script(FVP_MPS2_M7 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) + +target_include_directories(FVP_MPS2_M7 + INTERFACE + device +) + +target_sources(FVP_MPS2_M7 + INTERFACE + device/system_CMSDK_CM7.c + ${STARTUP_FILE} +) + +target_link_libraries(FVP_MPS2_M7 INTERFACE FVP_MPS2 ARM_FM) From bfb36b68a6ccfe8d76761dfd20b611cc3e64cd85 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 11 Feb 2021 14:48:55 +0000 Subject: [PATCH 2/5] CMake ARM FM: fix targets naming --- targets/TARGET_ARM_FM/CMakeLists.txt | 4 ++-- targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt | 6 +++--- .../TARGET_FVP_MPS2_M0/CMakelists.txt | 10 +++++----- .../TARGET_FVP_MPS2_M0P/CMakelists.txt | 10 +++++----- .../TARGET_FVP_MPS2_M3/CMakelists.txt | 10 +++++----- .../TARGET_FVP_MPS2_M4/CMakelists.txt | 12 ++++++------ .../TARGET_FVP_MPS2_M7/CMakelists.txt | 12 ++++++------ 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/targets/TARGET_ARM_FM/CMakeLists.txt b/targets/TARGET_ARM_FM/CMakeLists.txt index 26c9500017..2743e280d9 100644 --- a/targets/TARGET_ARM_FM/CMakeLists.txt +++ b/targets/TARGET_ARM_FM/CMakeLists.txt @@ -1,11 +1,11 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(ARM_FM INTERFACE) +add_library(mbed-arm-fm INTERFACE) add_subdirectory(TARGET_FVP_MPS2 EXCLUDE_FROM_ALL) -target_include_directories(ARM_FM +target_include_directories(mbed-arm-fm INTERFACE . ) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt index da43a5b8b4..be56afbae7 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt @@ -7,16 +7,16 @@ add_subdirectory(TARGET_FVP_MPS2_M3 EXCLUDE_FROM_ALL) add_subdirectory(TARGET_FVP_MPS2_M4 EXCLUDE_FROM_ALL) add_subdirectory(TARGET_FVP_MPS2_M7 EXCLUDE_FROM_ALL) -add_library(FVP_MPS2 INTERFACE) +add_library(mbed-fvp-mps2 INTERFACE) -target_include_directories(FVP_MPS2 +target_include_directories(mbed-fvp-mps2 INTERFACE . drivers SDK ) -target_sources(FVP_MPS2 +target_sources(mbed-fvp-mps2 INTERFACE analogin_api.c flash_api.c diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt index 8dd98a1b32..ccb8a71353 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt @@ -1,7 +1,7 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(FVP_MPS2_M0 INTERFACE) +add_library(mbed-fvp-mps2-m0 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct) @@ -11,17 +11,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) endif() -mbed_set_linker_script(FVP_MPS2_M0 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) +mbed_set_linker_script(mbed-fvp-mps2-m0 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) -target_include_directories(FVP_MPS2_M0 +target_include_directories(mbed-fvp-mps2-m0 INTERFACE device ) -target_sources(FVP_MPS2_M0 +target_sources(mbed-fvp-mps2-m0 INTERFACE device/system_CMSDK_CM0.c ${STARTUP_FILE} ) -target_link_libraries(FVP_MPS2_M0 INTERFACE FVP_MPS2 ARM_FM) +target_link_libraries(mbed-fvp-mps2-m0 INTERFACE mbed-fvp-mps2 mbed-arm-fm) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt index 467a882790..fb8f1f41a9 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt @@ -1,7 +1,7 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(FVP_MPS2_M0P INTERFACE) +add_library(mbed-fvp-mps2-m0p INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct) @@ -11,17 +11,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) endif() -mbed_set_linker_script(FVP_MPS2_M0P ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) +mbed_set_linker_script(mbed-fvp-mps2-m0p ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) -target_include_directories(FVP_MPS2_M0P +target_include_directories(mbed-fvp-mps2-m0p INTERFACE device ) -target_sources(FVP_MPS2_M0P +target_sources(mbed-fvp-mps2-m0p INTERFACE device/system_CMSDK_CM0plus.c ${STARTUP_FILE} ) -target_link_libraries(FVP_MPS2_M0P INTERFACE FVP_MPS2 ARM_FM) +target_link_libraries(mbed-fvp-mps2-m0p INTERFACE mbed-fvp-mps2 mbed-arm-fm) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt index 01389329b2..3290c51a09 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt @@ -1,7 +1,7 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(FVP_MPS2_M3 INTERFACE) +add_library(mbed-fvp-mps2-m3 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct) @@ -11,17 +11,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) endif() -mbed_set_linker_script(FVP_MPS2_M3 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) +mbed_set_linker_script(mbed-fvp-mps2-m3 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) -target_include_directories(FVP_MPS2_M3 +target_include_directories(mbed-fvp-mps2-m3 INTERFACE device ) -target_sources(FVP_MPS2_M3 +target_sources(mbed-fvp-mps2-m3 INTERFACE device/system_CMSDK_CM3.c ${STARTUP_FILE} ) -target_link_libraries(FVP_MPS2_M3 INTERFACE FVP_MPS2 ARM_FM) +target_link_libraries(mbed-fvp-mps2-m3 INTERFACE mbed-fvp-mps2 mbed-arm-fm) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt index 92cbb0e1ca..6e95c6fbd1 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt @@ -1,9 +1,9 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(FVP_MPS2_M4 INTERFACE) +add_library(mbed-fvp-mps2-m4 INTERFACE) -target_include_directories(FVP_MPS2_M4 +target_include_directories(mbed-fvp-mps2-m4 INTERFACE device ) @@ -15,17 +15,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/MPS2.ld) set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) endif() -mbed_set_linker_script(FVP_MPS2_M4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) +mbed_set_linker_script(mbed-fvp-mps2-m4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) -target_include_directories(FVP_MPS2_M4 +target_include_directories(mbed-fvp-mps2-m4 INTERFACE device ) -target_sources(FVP_MPS2_M4 +target_sources(mbed-fvp-mps2-m4 INTERFACE device/system_CMSDK_CM4.c ${STARTUP_FILE} ) -target_link_libraries(FVP_MPS2_M4 INTERFACE FVP_MPS2 ARM_FM) +target_link_libraries(mbed-fvp-mps2-m4 INTERFACE mbed-fvp-mps2 mbed-arm-fm) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt index 6d84433580..cd4dc90ded 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt @@ -1,9 +1,9 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(FVP_MPS2_M7 INTERFACE) +add_library(mbed-fvp-mps2-m7 INTERFACE) -target_include_directories(FVP_MPS2_M7 +target_include_directories(mbed-fvp-mps2-m7 INTERFACE device ) @@ -16,17 +16,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S) endif() -mbed_set_linker_script(FVP_MPS2_M7 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) +mbed_set_linker_script(mbed-fvp-mps2-m7 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) -target_include_directories(FVP_MPS2_M7 +target_include_directories(mbed-fvp-mps2-m7 INTERFACE device ) -target_sources(FVP_MPS2_M7 +target_sources(mbed-fvp-mps2-m7 INTERFACE device/system_CMSDK_CM7.c ${STARTUP_FILE} ) -target_link_libraries(FVP_MPS2_M7 INTERFACE FVP_MPS2 ARM_FM) +target_link_libraries(mbed-fvp-mps2-m7 INTERFACE mbed-fvp-mps2 mbed-arm-fm) From 26d7b4d9d5d5fccc832a450c79c72cba36e39962 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Sun, 14 Feb 2021 19:43:39 +0000 Subject: [PATCH 3/5] CMake Arm FM: fix linking libraries with arm-fm Co-authored-by: Hugues Kamba-Mpiana <41612201+hugueskamba@users.noreply.github.com> --- .../TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt | 4 ++-- .../TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt | 2 +- .../TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt | 2 +- .../TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt | 2 +- .../TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt index ccb8a71353..ed564a82a8 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. +# Copyright (c) 2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 add_library(mbed-fvp-mps2-m0 INTERFACE) @@ -24,4 +24,4 @@ target_sources(mbed-fvp-mps2-m0 ${STARTUP_FILE} ) -target_link_libraries(mbed-fvp-mps2-m0 INTERFACE mbed-fvp-mps2 mbed-arm-fm) +target_link_libraries(mbed-fvp-mps2-m0 INTERFACE mbed-fvp-mps2) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt index fb8f1f41a9..5d47d9bee6 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt @@ -24,4 +24,4 @@ target_sources(mbed-fvp-mps2-m0p ${STARTUP_FILE} ) -target_link_libraries(mbed-fvp-mps2-m0p INTERFACE mbed-fvp-mps2 mbed-arm-fm) +target_link_libraries(mbed-fvp-mps2-m0p INTERFACE mbed-fvp-mps2) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt index 3290c51a09..b50d91f898 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt @@ -24,4 +24,4 @@ target_sources(mbed-fvp-mps2-m3 ${STARTUP_FILE} ) -target_link_libraries(mbed-fvp-mps2-m3 INTERFACE mbed-fvp-mps2 mbed-arm-fm) +target_link_libraries(mbed-fvp-mps2-m3 INTERFACE mbed-fvp-mps2) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt index 6e95c6fbd1..1450317a6b 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt @@ -28,4 +28,4 @@ target_sources(mbed-fvp-mps2-m4 ${STARTUP_FILE} ) -target_link_libraries(mbed-fvp-mps2-m4 INTERFACE mbed-fvp-mps2 mbed-arm-fm) +target_link_libraries(mbed-fvp-mps2-m4 INTERFACE mbed-fvp-mps2) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt index cd4dc90ded..8c1d453027 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt @@ -29,4 +29,4 @@ target_sources(mbed-fvp-mps2-m7 ${STARTUP_FILE} ) -target_link_libraries(mbed-fvp-mps2-m7 INTERFACE mbed-fvp-mps2 mbed-arm-fm) +target_link_libraries(mbed-fvp-mps2-m7 INTERFACE mbed-fvp-mps2) From 950baa2fe6228f3246c9e0b1d447b1db827efb52 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Sun, 14 Feb 2021 19:44:28 +0000 Subject: [PATCH 4/5] CMake fvp mps2: fix linking to arm-fm --- targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt index be56afbae7..8ab00f535c 100644 --- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt +++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt @@ -36,3 +36,5 @@ target_sources(mbed-fvp-mps2 SDK/fpga.c ) + +target_link_libraries(mbed-fvp-mps2 INTERFACE mbed-arm-fm) From 1516c57bf8469dff4f8f628d60127983ced6b001 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Mon, 15 Feb 2021 09:23:18 +0000 Subject: [PATCH 5/5] ARM FM CMake: fix CMakeLists names --- .../TARGET_FVP_MPS2_M0/{CMakelists.txt => CMakeLists.txt} | 0 .../TARGET_FVP_MPS2_M0P/{CMakelists.txt => CMakeLists.txt} | 0 .../TARGET_FVP_MPS2_M3/{CMakelists.txt => CMakeLists.txt} | 0 .../TARGET_FVP_MPS2_M4/{CMakelists.txt => CMakeLists.txt} | 0 .../TARGET_FVP_MPS2_M7/{CMakelists.txt => CMakeLists.txt} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/{CMakelists.txt => CMakeLists.txt} (100%) diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakeLists.txt similarity index 100% rename from targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt rename to targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakeLists.txt diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakeLists.txt similarity index 100% rename from targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt rename to targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakeLists.txt diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakeLists.txt similarity index 100% rename from targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt rename to targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakeLists.txt diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakeLists.txt similarity index 100% rename from targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt rename to targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakeLists.txt diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakeLists.txt similarity index 100% rename from targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt rename to targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakeLists.txt