From 351d6749cb4dd9b9a891261dc43c22d5cd4fe4d5 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 11 Feb 2021 17:16:04 +0000 Subject: [PATCH 1/6] CMake Maxim: fix targets naming Add boot no-boot targets for max32625. This should be cleaned up better once we get the folder structure enforced by the old tools fixed. --- targets/TARGET_Maxim/CMakeLists.txt | 16 +++---- .../TARGET_MAX32620C/CMakeLists.txt | 26 ++++++----- .../TARGET_MAX32620FTHR/CMakeLists.txt | 11 +++++ .../TARGET_SDT32620B/CMakeLists.txt | 11 +++++ .../TARGET_MAX32625/CMakeLists.txt | 43 +++---------------- .../TARGET_MAX32625MBED/CMakeLists.txt | 11 +++++ .../TARGET_MAX32625PICO/CMakeLists.txt | 16 +++++++ .../TARGET_SDT32625B/CMakeLists.txt | 11 +++++ .../TARGET_MAX32625/device/CMakeLists.txt | 23 ++++++++++ .../TARGET_MAX32630/CMakeLists.txt | 26 +++++------ .../TARGET_MAX32630FTHR/CMakeLists.txt | 16 +++++++ 11 files changed, 134 insertions(+), 76 deletions(-) create mode 100644 targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_MAX32620FTHR/CMakeLists.txt create mode 100644 targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_SDT32620B/CMakeLists.txt create mode 100644 targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt create mode 100644 targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625PICO/CMakeLists.txt create mode 100644 targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt create mode 100644 targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt create mode 100644 targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt diff --git a/targets/TARGET_Maxim/CMakeLists.txt b/targets/TARGET_Maxim/CMakeLists.txt index 62a98905d1..600313bd29 100644 --- a/targets/TARGET_Maxim/CMakeLists.txt +++ b/targets/TARGET_Maxim/CMakeLists.txt @@ -1,20 +1,18 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if("MAX32620C" IN_LIST MBED_TARGET_LABELS) - add_subdirectory(TARGET_MAX32620C) -elseif("MAX32625" IN_LIST MBED_TARGET_LABELS) - add_subdirectory(TARGET_MAX32625) -elseif("MAX32630" IN_LIST MBED_TARGET_LABELS) - add_subdirectory(TARGET_MAX32630) -endif() -target_include_directories(mbed-core +add_subdirectory(TARGET_MAX32620C EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_MAX32625 EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_MAX32630 EXCLUDE_FROM_ALL) + + +target_include_directories(mbed-maxim INTERFACE . ) -target_sources(mbed-core +target_sources(mbed-maxim INTERFACE USBPhy_Maxim.cpp ) diff --git a/targets/TARGET_Maxim/TARGET_MAX32620C/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32620C/CMakeLists.txt index 5af9c92b7d..979b41ecb0 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32620C/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32620C/CMakeLists.txt @@ -1,17 +1,8 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if("MAX32620FTHR" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_MAX32620FTHR - ) -elseif("SDT32620B" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_SDT32620B - ) -endif() +add_subdirectory(TARGET_MAX32620FTHR EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_SDT32620B EXCLUDE_FROM_ALL) if(${MBED_TOOLCHAIN} STREQUAL "ARM") set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MAX32620.sct) @@ -21,16 +12,18 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_max32620.S) endif() -set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) +add_library(mbed-maxim-max32620c INTERFACE) -target_include_directories(mbed-core +target_include_directories(mbed-maxim-max32620c INTERFACE . device mxc ) -target_sources(mbed-core +mbed_set_linker_script(mbed-maxim-max32620c ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) + +target_sources(mbed-maxim-max32620c INTERFACE PeripheralPins.c analogin_api.c @@ -81,3 +74,8 @@ target_sources(mbed-core ${STARTUP_FILE} ) + +target_link_libraries(mbed-maxim-max32620c + INTERFACE + mbed-maxim +) diff --git a/targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_MAX32620FTHR/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_MAX32620FTHR/CMakeLists.txt new file mode 100644 index 0000000000..bd859d478e --- /dev/null +++ b/targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_MAX32620FTHR/CMakeLists.txt @@ -0,0 +1,11 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(mbed-max32620fthr INTERFACE) + +target_include_directories(mbed-max32620fthr + INTERFACE + . +) + +target_link_libraries(mbed-max32620fthr INTERFACE mbed-maxim-max32620c) diff --git a/targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_SDT32620B/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_SDT32620B/CMakeLists.txt new file mode 100644 index 0000000000..32835a050b --- /dev/null +++ b/targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_SDT32620B/CMakeLists.txt @@ -0,0 +1,11 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(mbed-sdt32620b INTERFACE) + +target_include_directories(mbed-max32625 + INTERFACE + . +) + +target_link_libraries(mbed-sdt32620b INTERFACE mbed-maxim-max32620c) diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt index e875e8e9f7..50e976278f 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt @@ -1,56 +1,25 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if("MAX32625MBED" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_MAX32625MBED - ) -elseif("MAX32625PICO" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_MAX32625PICO - ) - - target_sources(mbed-core - INTERFACE - TARGET_MAX32625PICO/low_level_init.c - ) -elseif("SDT32625B" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_SDT32625B - ) -endif() +add_subdirectory(TARGET_MAX32625MBED EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_MAX32625PICO EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_SDT32625B EXCLUDE_FROM_ALL) +add_subdirectory(device EXCLUDE_FROM_ALL) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - if("MAX32625_BOOT" IN_LIST MBED_TARGET_LABELS) - set(LINKER_FILE device/TOOLCHAIN_ARM_STD/TARGET_MAX32625_BOOT/MAX32625.sct) - elseif("MAX32625_NO_BOOT" IN_LIST MBED_TARGET_LABELS) - set(LINKER_FILE device/TOOLCHAIN_ARM_STD/TARGET_MAX32625_NO_BOOT/MAX32625.sct) - endif() - set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_MAX32625.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - if("MAX32625_BOOT" IN_LIST MBED_TARGET_LABELS) - set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/TARGET_MAX32625_BOOT/max32625.ld) - elseif("MAX32625_NO_BOOT" IN_LIST MBED_TARGET_LABELS) - set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/TARGET_MAX32625_NO_BOOT/max32625.ld) - endif() - set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_max32625.S) endif() -set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) - -target_include_directories(mbed-core +target_include_directories(mbed-max32625 INTERFACE . device mxc ) -target_sources(mbed-core +target_sources(mbed-max32625 INTERFACE PeripheralPins.c analogin_api.c diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt new file mode 100644 index 0000000000..e996bdf02c --- /dev/null +++ b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt @@ -0,0 +1,11 @@ +# Copyright (c) 2021 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(mbed-max3265mbed INTERFACE) + +target_include_directories(mbed-max3265mbed + INTERFACE + . +) + +target_link_libraries(mbed-max3265mbed INTERFACE mbed-max32625 mbed-max32625-no-boot) diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625PICO/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625PICO/CMakeLists.txt new file mode 100644 index 0000000000..2caee0a28c --- /dev/null +++ b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625PICO/CMakeLists.txt @@ -0,0 +1,16 @@ +# Copyright (c) 2021 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(mbed-max32625pico INTERFACE) + +target_include_directories(mbed-max32625pico + INTERFACE + . +) + +target_sources(mbed-max32625pico + INTERFACE + low_level_init.c +) + +target_link_libraries(mbed-max32625pico INTERFACE mbed-max32625 mbed-max32625-boot) diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt new file mode 100644 index 0000000000..36b7a94165 --- /dev/null +++ b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_SDT32625B/CMakeLists.txt @@ -0,0 +1,11 @@ +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(mbed-sdt32625bp INTERFACE) + +target_include_directories(mbed-sdt32625bp + INTERFACE + . +) + +target_link_libraries(mbed-sdt32625bp INTERFACE mbed-max32625 mbed-max32625-no-boot) diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt new file mode 100644 index 0000000000..097868b70d --- /dev/null +++ b/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt @@ -0,0 +1,23 @@ +# Copyright (c) 2020-2021 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(mbed-max32625-boot INTERFACE) + +if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") + set(LINKER_FILE_BOOT TOOLCHAIN_GCC_ARM/TARGET_MAX32625_BOOT/max32625.ld) +elseif(${MBED_TOOLCHAIN} STREQUAL "ARM") + set(LINKER_FILE_BOOT TOOLCHAIN_ARM_STD/TARGET_MAX32625_BOOT/MAX32625.sct) +endif() + +mbed_set_linker_script(mbed-max32625-boot ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) + +add_library(mbed-max32625-no-boot INTERFACE) + +if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") + set(LINKER_FILE_NO_BOOT device/TOOLCHAIN_GCC_ARM/TARGET_MAX32625_NO_BOOT/max32625.ld) +elseif(${MBED_TOOLCHAIN} STREQUAL "ARM") + set(LINKER_FILE_NO_BOOT device/TOOLCHAIN_ARM_STD/TARGET_MAX32625_NO_BOOT/MAX32625.sct) +endif() + +mbed_set_linker_script(mbed-max32625-no-boot ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) + diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt index eac204f8b4..46c1c5bd92 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt @@ -1,17 +1,7 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if("MAX32630FTHR" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_MAX32630FTHR - ) - - target_sources(mbed-core - INTERFACE - TARGET_MAX32630FTHR/low_level_init.c - ) -endif() +add_subdirectory(TARGET_MAX32630FTHR EXCLUDE_FROM_ALL) if(${MBED_TOOLCHAIN} STREQUAL "ARM") set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MAX3263x.sct) @@ -27,18 +17,16 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(LIB_EXACT_LE TOOLCHAIN_GCC_ARM/libexactLE.a) endif() -set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) +add_library(mbed-maxim-max32630 INTERFACE) -target_link_libraries(mbed-core INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_EXACT_LE}) - -target_include_directories(mbed-core +target_include_directories(mbed-maxim-max32630 INTERFACE . device mxc ) -target_sources(mbed-core +target_sources(mbed-maxim-max32630 INTERFACE PeripheralPins.c analogin_api.c @@ -86,3 +74,9 @@ target_sources(mbed-core ${STARTUP_FILE} ) + +target_link_libraries(mbed-maxim-max32630 + INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_EXACT_LE} + mbed-maxim +) diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt new file mode 100644 index 0000000000..f0eebe3cb8 --- /dev/null +++ b/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt @@ -0,0 +1,16 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(mbed-max32630fthr INTERFACE) + +target_include_directories(mbed-max32630fthr + INTERFACE + TARGET_MAX32630FTHR +) + +target_sources(mbed-core + INTERFACE + TARGET_MAX32630FTHR/low_level_init.c +) + +target_link_libraries(mbed-max32630fthr INTERFACE mbed-max32630) From 9c9d83343cdeaf80eefe3e9bc6d98146f67ad786 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 11 Feb 2021 17:34:48 +0000 Subject: [PATCH 2/6] CMake Maxim: fix some errors with renames --- targets/TARGET_Maxim/CMakeLists.txt | 1 + .../TARGET_MAX32620C/TARGET_SDT32620B/CMakeLists.txt | 2 +- targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt | 2 ++ .../TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/targets/TARGET_Maxim/CMakeLists.txt b/targets/TARGET_Maxim/CMakeLists.txt index 600313bd29..aa1e2ca4a6 100644 --- a/targets/TARGET_Maxim/CMakeLists.txt +++ b/targets/TARGET_Maxim/CMakeLists.txt @@ -6,6 +6,7 @@ add_subdirectory(TARGET_MAX32620C EXCLUDE_FROM_ALL) add_subdirectory(TARGET_MAX32625 EXCLUDE_FROM_ALL) add_subdirectory(TARGET_MAX32630 EXCLUDE_FROM_ALL) +add_library(mbed-maxim INTERFACE) target_include_directories(mbed-maxim INTERFACE diff --git a/targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_SDT32620B/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_SDT32620B/CMakeLists.txt index 32835a050b..a4773d562c 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_SDT32620B/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32620C/TARGET_SDT32620B/CMakeLists.txt @@ -3,7 +3,7 @@ add_library(mbed-sdt32620b INTERFACE) -target_include_directories(mbed-max32625 +target_include_directories(mbed-sdt32620b INTERFACE . ) diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt index 50e976278f..b8eb60a74f 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32625/CMakeLists.txt @@ -12,6 +12,8 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_max32625.S) endif() +add_library(mbed-max32625 INTERFACE) + target_include_directories(mbed-max32625 INTERFACE . diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt index f0eebe3cb8..6919bf2b0d 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt @@ -5,12 +5,12 @@ add_library(mbed-max32630fthr INTERFACE) target_include_directories(mbed-max32630fthr INTERFACE - TARGET_MAX32630FTHR + . ) target_sources(mbed-core INTERFACE - TARGET_MAX32630FTHR/low_level_init.c + low_level_init.c ) target_link_libraries(mbed-max32630fthr INTERFACE mbed-max32630) From 2e320bcfe9809893b5e5f14c23357f712fc841e1 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 11 Feb 2021 17:40:07 +0000 Subject: [PATCH 3/6] CMake MAX32630: fix target name --- targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt index 46c1c5bd92..57ce2e8e4d 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt @@ -17,16 +17,16 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(LIB_EXACT_LE TOOLCHAIN_GCC_ARM/libexactLE.a) endif() -add_library(mbed-maxim-max32630 INTERFACE) +add_library(mbed-max32630 INTERFACE) -target_include_directories(mbed-maxim-max32630 +target_include_directories(mbed-max32630 INTERFACE . device mxc ) -target_sources(mbed-maxim-max32630 +target_sources(mbed-max32630 INTERFACE PeripheralPins.c analogin_api.c @@ -75,7 +75,7 @@ target_sources(mbed-maxim-max32630 ${STARTUP_FILE} ) -target_link_libraries(mbed-maxim-max32630 +target_link_libraries(mbed-max32630 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_EXACT_LE} mbed-maxim From 0311d8131401ec316c2106dfdaee7df266f3fe37 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 11 Feb 2021 17:42:49 +0000 Subject: [PATCH 4/6] CMake MAX32630: fix linker script Forgotten to set it for the target --- targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt index 57ce2e8e4d..1adf3612cc 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32630/CMakeLists.txt @@ -19,6 +19,8 @@ endif() add_library(mbed-max32630 INTERFACE) +mbed_set_linker_script(mbed-max32630 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) + target_include_directories(mbed-max32630 INTERFACE . From cbc6af518fc10a862e036d592c0f3bc550698aff Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Sun, 14 Feb 2021 19:21:14 +0000 Subject: [PATCH 5/6] Apply suggestions from code review Co-authored-by: Hugues Kamba-Mpiana <41612201+hugueskamba@users.noreply.github.com> --- .../TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt | 6 +++--- targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt index e996bdf02c..cee08018eb 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/CMakeLists.txt @@ -1,11 +1,11 @@ # Copyright (c) 2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(mbed-max3265mbed INTERFACE) +add_library(mbed-max32625mbed INTERFACE) -target_include_directories(mbed-max3265mbed +target_include_directories(mbed-max32625mbed INTERFACE . ) -target_link_libraries(mbed-max3265mbed INTERFACE mbed-max32625 mbed-max32625-no-boot) +target_link_libraries(mbed-max32625mbed INTERFACE mbed-max32625 mbed-max32625-no-boot) diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt index 097868b70d..eac4b167b1 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32625/device/CMakeLists.txt @@ -9,7 +9,7 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "ARM") set(LINKER_FILE_BOOT TOOLCHAIN_ARM_STD/TARGET_MAX32625_BOOT/MAX32625.sct) endif() -mbed_set_linker_script(mbed-max32625-boot ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) +mbed_set_linker_script(mbed-max32625-boot ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_BOOT}) add_library(mbed-max32625-no-boot INTERFACE) @@ -19,5 +19,4 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "ARM") set(LINKER_FILE_NO_BOOT device/TOOLCHAIN_ARM_STD/TARGET_MAX32625_NO_BOOT/MAX32625.sct) endif() -mbed_set_linker_script(mbed-max32625-no-boot ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) - +mbed_set_linker_script(mbed-max32625-no-boot ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_NO_BOOT}) From 94f3c7b89b645e45bb2a4af554e53ee8bdbfe1dd Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Mon, 15 Feb 2021 08:58:39 +0000 Subject: [PATCH 6/6] Maxim CMake: fix sources for max32630fthr --- .../TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt index 6919bf2b0d..db06d4cc26 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt +++ b/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/CMakeLists.txt @@ -8,7 +8,7 @@ target_include_directories(mbed-max32630fthr . ) -target_sources(mbed-core +target_sources(mbed-max32630fthr INTERFACE low_level_init.c )