From efbf0bb5718f1897b55753daefdcb9a78c2912b8 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Mon, 8 Feb 2021 15:34:29 +0000 Subject: [PATCH 1/4] Ambiq Micro: refactor CMake targets Follow what we did for ST, to create separate CMake targets for each Mbed target. --- targets/TARGET_Ambiq_Micro/CMakeLists.txt | 10 +- .../TARGET_Apollo3/CMakeLists.txt | 140 ++---------------- .../COMPONENT_hm01b0/hm01b0/CMakelists.txt | 16 ++ .../lis2dh12/CMakelists.txt | 17 +++ .../TARGET_SFE_ARTEMIS/CMakelists.txt | 18 +++ .../TARGET_SFE_ARTEMIS_ATP/CMakelists.txt | 18 +++ .../TARGET_SFE_ARTEMIS_DK/CMakelists.txt | 18 +++ .../TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt | 18 +++ .../TARGET_SFE_ARTEMIS_NANO/CMakelists.txt | 18 +++ .../CMakelists.txt | 18 +++ .../TARGET_SFE_EDGE/CMakelists.txt | 18 +++ .../TARGET_SFE_EDGE2/CMakelists.txt | 18 +++ 12 files changed, 198 insertions(+), 129 deletions(-) create mode 100644 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt create mode 100644 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt create mode 100644 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt create mode 100644 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt create mode 100644 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt create mode 100644 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt create mode 100644 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt create mode 100644 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt create mode 100644 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt create mode 100644 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt diff --git a/targets/TARGET_Ambiq_Micro/CMakeLists.txt b/targets/TARGET_Ambiq_Micro/CMakeLists.txt index e02ce2dbb1..99b89bcb58 100644 --- a/targets/TARGET_Ambiq_Micro/CMakeLists.txt +++ b/targets/TARGET_Ambiq_Micro/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if("Apollo3" IN_LIST MBED_TARGET_LABELS) - add_subdirectory(TARGET_Apollo3) -endif() +add_subdirectory(TARGET_Apollo3 EXCLUDE_FROM_ALL) -target_include_directories(mbed-core +add_library(Ambiq_Micro INTERFACE) + +target_include_directories(Ambiq_Micro INTERFACE sdk/devices sdk/utils ) -target_sources(mbed-core +target_sources(Ambiq_Micro INTERFACE sdk/devices/am_devices_button.c sdk/devices/am_devices_led.c diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt index 1a0bb080ed..971590b769 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt @@ -1,128 +1,19 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -if("hm01b0" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - COMPONENT_hm01b0/hm01b0 - ) +add_subdirectory(COMPONENT_hm01b0/hm01b0 EXCLUDE_FROM_ALL) +add_subdirectory(COMPONENT_lis2dh12/lis2dh12 EXCLUDE_FROM_ALL) - target_sources(mbed-core - INTERFACE - COMPONENT_hm01b0/hm01b0/HM01B0.c - ) -endif() +add_subdirectory(TARGET_SFE_ARTEMIS EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_SFE_ARTEMIS_ATP EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_SFE_ARTEMIS_DK EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_SFE_ARTEMIS_MODULE EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_SFE_ARTEMIS_NANO EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_SFE_ARTEMIS_THING_PLUS EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_SFE_EDGE EXCLUDE_FROM_ALL) +add_subdirectory(TARGET_SFE_EDGE2 EXCLUDE_FROM_ALL) -if("lis2dh12" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - COMPONENT_lis2dh12/lis2dh12 - ) - - target_sources(mbed-core - INTERFACE - COMPONENT_lis2dh12/lis2dh12/lis2dh12_platform_apollo3.c - COMPONENT_lis2dh12/lis2dh12/lis2dh12_reg.c - ) -endif() - -if("SFE_ARTEMIS" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS - TARGET_SFE_ARTEMIS/bsp - ) - - target_sources(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS/bsp/am_bsp.c - TARGET_SFE_ARTEMIS/bsp/am_bsp_pins.c - ) -elseif("SFE_ARTEMIS_ATP" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS_ATP - TARGET_SFE_ARTEMIS_ATP/bsp - ) - - target_sources(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS_ATP/bsp/am_bsp.c - TARGET_SFE_ARTEMIS_ATP/bsp/am_bsp_pins.c - ) -elseif("SFE_ARTEMIS_DK" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS_DK - TARGET_SFE_ARTEMIS_DK/bsp - ) - - target_sources(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS_DK/bsp/am_bsp.c - TARGET_SFE_ARTEMIS_DK/bsp/am_bsp_pins.c - ) -elseif("SFE_ARTEMIS_MODULE" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS_MODULE - TARGET_SFE_ARTEMIS_MODULE/bsp - ) - - target_sources(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS_MODULE/bsp/am_bsp.c - TARGET_SFE_ARTEMIS_MODULE/bsp/am_bsp_pins.c - ) -elseif("SFE_ARTEMIS_NANO" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS_NANO - TARGET_SFE_ARTEMIS_NANO/bsp - ) - - target_sources(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS_NANO/bsp/am_bsp.c - TARGET_SFE_ARTEMIS_NANO/bsp/am_bsp_pins.c - ) -elseif("SFE_ARTEMIS_THING_PLUS" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS_THING_PLUS - TARGET_SFE_ARTEMIS_THING_PLUS/bsp - ) - - target_sources(mbed-core - INTERFACE - TARGET_SFE_ARTEMIS_THING_PLUS/bsp/am_bsp.c - TARGET_SFE_ARTEMIS_THING_PLUS/bsp/am_bsp_pins.c - ) -elseif("SFE_EDGE" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_SFE_EDGE - TARGET_SFE_EDGE/bsp - ) - - target_sources(mbed-core - INTERFACE - TARGET_SFE_EDGE/bsp/am_bsp.c - TARGET_SFE_EDGE/bsp/am_bsp_pins.c - ) -elseif("SFE_EDGE2" IN_LIST MBED_TARGET_LABELS) - target_include_directories(mbed-core - INTERFACE - TARGET_SFE_EDGE2 - TARGET_SFE_EDGE2/bsp - ) - - target_sources(mbed-core - INTERFACE - TARGET_SFE_EDGE2/bsp/am_bsp.c - TARGET_SFE_EDGE2/bsp/am_bsp_pins.c - ) -endif() +add_library(Apollo3 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") set(LINKER_FILE TOOLCHAIN_ARM_STD/AMA3B1KK.sct) @@ -132,9 +23,9 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_gcc.c) endif() -set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) +mbed_set_linker_script(Apollo3 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) -target_include_directories(mbed-core +target_include_directories(Apollo3 INTERFACE device sdk/CMSIS/AmbiqMicro/Include @@ -144,7 +35,7 @@ target_include_directories(mbed-core sdk/mcu/apollo3/regs ) -target_sources(mbed-core +target_sources(Apollo3 INTERFACE device/PeripheralPinConfigs.c device/PeripheralPins.c @@ -200,7 +91,8 @@ target_sources(mbed-core ${STARTUP_FILE} ) -target_link_libraries(mbed-core +target_link_libraries(Apollo3 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/sdk/CMSIS/ARM/Lib/ARM/libarm_cortexM4lf_math.a + Ambiq_Micro ) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt new file mode 100644 index 0000000000..8268915eb1 --- /dev/null +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt @@ -0,0 +1,16 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(hm01b0 INTERFACE) + +target_include_directories(hm01b0 + INTERFACE + . +) + +target_sources(hm01b0 + INTERFACE + HM01B0.c +) + +target_link_libraries(hm01b0 INTERFACE Apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt new file mode 100644 index 0000000000..3f0059909b --- /dev/null +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(lis2dh12 INTERFACE) + +target_include_directories(lis2dh12 + INTERFACE + . +) + +target_sources(lis2dh12 + INTERFACE + COMPONENT_lis2dh12/lis2dh12/lis2dh12_platform_apollo3.c + COMPONENT_lis2dh12/lis2dh12/lis2dh12_reg.c +) + +target_link_libraries(lis2dh12 INTERFACE Apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt new file mode 100644 index 0000000000..c23ca024fb --- /dev/null +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(SFE_ARTEMIS INTERFACE) + +target_include_directories(SFE_ARTEMIS + INTERFACE + . + bsp +) + +target_sources(SFE_ARTEMIS + INTERFACE + bsp/am_bsp.c + bsp/am_bsp_pins.c +) + +target_link_libraries(SFE_ARTEMIS INTERFACE Apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt new file mode 100644 index 0000000000..3a49835b61 --- /dev/null +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(SFE_ARTEMIS_ATP INTERFACE) + +target_include_directories(SFE_ARTEMIS_ATP + INTERFACE + . + bsp +) + +target_sources(SFE_ARTEMIS_ATP + INTERFACE + bsp/am_bsp.c + bsp/am_bsp_pins.c +) + +target_link_libraries(SFE_ARTEMIS INTERFACE Apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt new file mode 100644 index 0000000000..1bcdbe7598 --- /dev/null +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(SFE_ARTEMIS_DK INTERFACE) + +target_include_directories(SFE_ARTEMIS_DK + INTERFACE + . + bsp +) + +target_sources(SFE_ARTEMIS_DK + INTERFACE + bsp/am_bsp.c + bsp/am_bsp_pins.c +) + +target_link_libraries(SFE_ARTEMIS_DK INTERFACE Apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt new file mode 100644 index 0000000000..7636db343b --- /dev/null +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(SFE_ARTEMIS_MODULE INTERFACE) + +target_include_directories(SFE_ARTEMIS_MODULE + INTERFACE + . + bsp +) + +target_sources(SFE_ARTEMIS_MODULE + INTERFACE + bsp/am_bsp.c + bsp/am_bsp_pins.c +) + +target_link_libraries(SFE_ARTEMIS_MODULE INTERFACE Apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt new file mode 100644 index 0000000000..85f5a741de --- /dev/null +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(SFE_ARTEMIS_NANO INTERFACE) + +target_include_directories(SFE_ARTEMIS_NANO + INTERFACE + . + bsp +) + +target_sources(SFE_ARTEMIS_NANO + INTERFACE + bsp/am_bsp.c + bsp/am_bsp_pins.c +) + +target_link_libraries(SFE_ARTEMIS_NANO INTERFACE Apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt new file mode 100644 index 0000000000..0deee94c14 --- /dev/null +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(SFE_ARTEMIS_THING_PLUS INTERFACE) + +target_include_directories(SFE_ARTEMIS_THING_PLUS + INTERFACE + . + bsp +) + +target_sources(SFE_ARTEMIS_THING_PLUS + INTERFACE + bsp/am_bsp.c + bsp/am_bsp_pins.c +) + +target_link_libraries(SFE_ARTEMIS_THING_PLUS INTERFACE Apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt new file mode 100644 index 0000000000..84b04aa129 --- /dev/null +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(SFE_EDGE INTERFACE) + +target_include_directories(SFE_EDGE + INTERFACE + . + bsp +) + +target_sources(SFE_EDGE + INTERFACE + bsp/am_bsp.c + bsp/am_bsp_pins.c +) + +target_link_libraries(SFE_EDGE INTERFACE Apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt new file mode 100644 index 0000000000..68126e1cb0 --- /dev/null +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_library(SFE_EDGE2 INTERFACE) + +target_include_directories(SFE_EDGE2 + INTERFACE + . + bsp +) + +target_sources(SFE_EDGE2 + INTERFACE + bsp/am_bsp.c + bsp/am_bsp_pins.c +) + +target_link_libraries(SFE_EDGE2 INTERFACE Apollo3) From b4f0be19e6260b1d5f44d9612c837d482c2021f8 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 11 Feb 2021 14:09:19 +0000 Subject: [PATCH 2/4] CMake Ambiq Micro: fix naming --- targets/TARGET_Ambiq_Micro/CMakeLists.txt | 6 +++--- .../TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt | 12 ++++++------ .../COMPONENT_hm01b0/hm01b0/CMakelists.txt | 8 ++++---- .../COMPONENT_lis2dh12/lis2dh12/CMakelists.txt | 8 ++++---- .../TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt | 8 ++++---- .../TARGET_SFE_ARTEMIS_ATP/CMakelists.txt | 8 ++++---- .../TARGET_SFE_ARTEMIS_DK/CMakelists.txt | 8 ++++---- .../TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt | 8 ++++---- .../TARGET_SFE_ARTEMIS_NANO/CMakelists.txt | 8 ++++---- .../TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt | 8 ++++---- .../TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt | 8 ++++---- .../TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt | 8 ++++---- 12 files changed, 49 insertions(+), 49 deletions(-) diff --git a/targets/TARGET_Ambiq_Micro/CMakeLists.txt b/targets/TARGET_Ambiq_Micro/CMakeLists.txt index 99b89bcb58..fc79b2187f 100644 --- a/targets/TARGET_Ambiq_Micro/CMakeLists.txt +++ b/targets/TARGET_Ambiq_Micro/CMakeLists.txt @@ -3,15 +3,15 @@ add_subdirectory(TARGET_Apollo3 EXCLUDE_FROM_ALL) -add_library(Ambiq_Micro INTERFACE) +add_library(mbed-ambiq-micro INTERFACE) -target_include_directories(Ambiq_Micro +target_include_directories(mbed-ambiq-micro INTERFACE sdk/devices sdk/utils ) -target_sources(Ambiq_Micro +target_sources(mbed-ambiq-micro INTERFACE sdk/devices/am_devices_button.c sdk/devices/am_devices_led.c diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt index 971590b769..339af43ea6 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt @@ -13,7 +13,7 @@ add_subdirectory(TARGET_SFE_ARTEMIS_THING_PLUS EXCLUDE_FROM_ALL) add_subdirectory(TARGET_SFE_EDGE EXCLUDE_FROM_ALL) add_subdirectory(TARGET_SFE_EDGE2 EXCLUDE_FROM_ALL) -add_library(Apollo3 INTERFACE) +add_library(mbed-apollo3 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") set(LINKER_FILE TOOLCHAIN_ARM_STD/AMA3B1KK.sct) @@ -23,9 +23,9 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_gcc.c) endif() -mbed_set_linker_script(Apollo3 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) +mbed_set_linker_script(mbed-apollo3 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE}) -target_include_directories(Apollo3 +target_include_directories(mbed-apollo3 INTERFACE device sdk/CMSIS/AmbiqMicro/Include @@ -35,7 +35,7 @@ target_include_directories(Apollo3 sdk/mcu/apollo3/regs ) -target_sources(Apollo3 +target_sources(mbed-apollo3 INTERFACE device/PeripheralPinConfigs.c device/PeripheralPins.c @@ -91,8 +91,8 @@ target_sources(Apollo3 ${STARTUP_FILE} ) -target_link_libraries(Apollo3 +target_link_libraries(mbed-apollo3 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/sdk/CMSIS/ARM/Lib/ARM/libarm_cortexM4lf_math.a - Ambiq_Micro + mbed-ambiq-micro ) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt index 8268915eb1..e778f0ef1f 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt @@ -1,16 +1,16 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(hm01b0 INTERFACE) +add_library(mbed-hm01b0 INTERFACE) -target_include_directories(hm01b0 +target_include_directories(mbed-hm01b0 INTERFACE . ) -target_sources(hm01b0 +target_sources(mbed-hm01b0 INTERFACE HM01B0.c ) -target_link_libraries(hm01b0 INTERFACE Apollo3) +target_link_libraries(mbed-hm01b0 INTERFACE mbed-apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt index 3f0059909b..3445c73591 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt @@ -1,17 +1,17 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(lis2dh12 INTERFACE) +add_library(mbed-lis2dh12 INTERFACE) -target_include_directories(lis2dh12 +target_include_directories(mbed-lis2dh12 INTERFACE . ) -target_sources(lis2dh12 +target_sources(mbed-lis2dh12 INTERFACE COMPONENT_lis2dh12/lis2dh12/lis2dh12_platform_apollo3.c COMPONENT_lis2dh12/lis2dh12/lis2dh12_reg.c ) -target_link_libraries(lis2dh12 INTERFACE Apollo3) +target_link_libraries(mbed-lis2dh12 INTERFACE mbed-apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt index c23ca024fb..cd0af96c71 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt @@ -1,18 +1,18 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(SFE_ARTEMIS INTERFACE) +add_library(mbed-sfe-artemis INTERFACE) -target_include_directories(SFE_ARTEMIS +target_include_directories(mbed-sfe-artemis INTERFACE . bsp ) -target_sources(SFE_ARTEMIS +target_sources(mbed-sfe-artemis INTERFACE bsp/am_bsp.c bsp/am_bsp_pins.c ) -target_link_libraries(SFE_ARTEMIS INTERFACE Apollo3) +target_link_libraries(mbed-sfe-artemis INTERFACE mbed-apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt index 3a49835b61..e3733f93bc 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt @@ -1,18 +1,18 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(SFE_ARTEMIS_ATP INTERFACE) +add_library(mbed-sfe-artemis-atp INTERFACE) -target_include_directories(SFE_ARTEMIS_ATP +target_include_directories(mbed-sfe-artemis-atp INTERFACE . bsp ) -target_sources(SFE_ARTEMIS_ATP +target_sources(mbed-sfe-artemis-atp INTERFACE bsp/am_bsp.c bsp/am_bsp_pins.c ) -target_link_libraries(SFE_ARTEMIS INTERFACE Apollo3) +target_link_libraries(mbed-sfe-artemis-atp INTERFACE mbed-apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt index 1bcdbe7598..2d84308733 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt @@ -1,18 +1,18 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(SFE_ARTEMIS_DK INTERFACE) +add_library(mbed-sfe-artemis-dk INTERFACE) -target_include_directories(SFE_ARTEMIS_DK +target_include_directories(mbed-sfe-artemis-dk INTERFACE . bsp ) -target_sources(SFE_ARTEMIS_DK +target_sources(mbed-sfe-artemis-dk INTERFACE bsp/am_bsp.c bsp/am_bsp_pins.c ) -target_link_libraries(SFE_ARTEMIS_DK INTERFACE Apollo3) +target_link_libraries(mbed-sfe-artemis-dk INTERFACE mbed-apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt index 7636db343b..23435046c8 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt @@ -1,18 +1,18 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(SFE_ARTEMIS_MODULE INTERFACE) +add_library(mbed-sfe-artemis-module INTERFACE) -target_include_directories(SFE_ARTEMIS_MODULE +target_include_directories(mbed-sfe-artemis-module INTERFACE . bsp ) -target_sources(SFE_ARTEMIS_MODULE +target_sources(mbed-sfe-artemis-module INTERFACE bsp/am_bsp.c bsp/am_bsp_pins.c ) -target_link_libraries(SFE_ARTEMIS_MODULE INTERFACE Apollo3) +target_link_libraries(mbed-sfe-artemis-module INTERFACE mbed-apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt index 85f5a741de..327cf976bf 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt @@ -1,18 +1,18 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(SFE_ARTEMIS_NANO INTERFACE) +add_library(mbed-sfe-artemis-nano INTERFACE) -target_include_directories(SFE_ARTEMIS_NANO +target_include_directories(mbed-sfe-artemis-nano INTERFACE . bsp ) -target_sources(SFE_ARTEMIS_NANO +target_sources(mbed-sfe-artemis-nano INTERFACE bsp/am_bsp.c bsp/am_bsp_pins.c ) -target_link_libraries(SFE_ARTEMIS_NANO INTERFACE Apollo3) +target_link_libraries(mbed-sfe-artemis-nano INTERFACE mbed-apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt index 0deee94c14..d03d1cad3e 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt @@ -1,18 +1,18 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(SFE_ARTEMIS_THING_PLUS INTERFACE) +add_library(mbed-sfe-artemis-thing-plus INTERFACE) -target_include_directories(SFE_ARTEMIS_THING_PLUS +target_include_directories(mbed-sfe-artemis-thing-plus INTERFACE . bsp ) -target_sources(SFE_ARTEMIS_THING_PLUS +target_sources(mbed-sfe-artemis-thing-plus INTERFACE bsp/am_bsp.c bsp/am_bsp_pins.c ) -target_link_libraries(SFE_ARTEMIS_THING_PLUS INTERFACE Apollo3) +target_link_libraries(mbed-sfe-artemis-thing-plus INTERFACE mbed-apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt index 84b04aa129..a6b9c7988e 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt @@ -1,18 +1,18 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(SFE_EDGE INTERFACE) +add_library(mbed-sfe-edge INTERFACE) -target_include_directories(SFE_EDGE +target_include_directories(mbed-sfe-edge INTERFACE . bsp ) -target_sources(SFE_EDGE +target_sources(mbed-sfe-edge INTERFACE bsp/am_bsp.c bsp/am_bsp_pins.c ) -target_link_libraries(SFE_EDGE INTERFACE Apollo3) +target_link_libraries(mbed-sfe-edge INTERFACE mbed-apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt index 68126e1cb0..dad3a83db8 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt @@ -1,18 +1,18 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_library(SFE_EDGE2 INTERFACE) +add_library(mbed-sfe-edge2 INTERFACE) -target_include_directories(SFE_EDGE2 +target_include_directories(mbed-sfe-edge2 INTERFACE . bsp ) -target_sources(SFE_EDGE2 +target_sources(mbed-sfe-edge2 INTERFACE bsp/am_bsp.c bsp/am_bsp_pins.c ) -target_link_libraries(SFE_EDGE2 INTERFACE Apollo3) +target_link_libraries(mbed-sfe-edge2 INTERFACE mbed-apollo3) From 4dd9895817ba98dff7e008d5d6593617741b535b Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 11 Feb 2021 14:20:13 +0000 Subject: [PATCH 3/4] CMake Ambiq Micro: fix years --- targets/TARGET_Ambiq_Micro/CMakeLists.txt | 2 +- targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt | 2 +- .../TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt | 2 +- .../COMPONENT_lis2dh12/lis2dh12/CMakelists.txt | 6 +++--- .../TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt | 2 +- .../TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt | 2 +- .../TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt | 2 +- .../TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt | 2 +- .../TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt | 2 +- .../TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt | 2 +- .../TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt | 2 +- .../TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/targets/TARGET_Ambiq_Micro/CMakeLists.txt b/targets/TARGET_Ambiq_Micro/CMakeLists.txt index fc79b2187f..cf589277f2 100644 --- a/targets/TARGET_Ambiq_Micro/CMakeLists.txt +++ b/targets/TARGET_Ambiq_Micro/CMakeLists.txt @@ -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_Apollo3 EXCLUDE_FROM_ALL) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt index 339af43ea6..cc56e6c42a 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/CMakeLists.txt @@ -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(COMPONENT_hm01b0/hm01b0 EXCLUDE_FROM_ALL) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt index e778f0ef1f..0527d2a60c 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/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-hm01b0 INTERFACE) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt index 3445c73591..95a48614ec 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt @@ -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_library(mbed-lis2dh12 INTERFACE) @@ -10,8 +10,8 @@ target_include_directories(mbed-lis2dh12 target_sources(mbed-lis2dh12 INTERFACE - COMPONENT_lis2dh12/lis2dh12/lis2dh12_platform_apollo3.c - COMPONENT_lis2dh12/lis2dh12/lis2dh12_reg.c + lis2dh12_platform_apollo3.c + lis2dh12_reg.c ) target_link_libraries(mbed-lis2dh12 INTERFACE mbed-apollo3) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt index cd0af96c71..0e8ef465ca 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt @@ -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_library(mbed-sfe-artemis INTERFACE) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt index e3733f93bc..f4101fa5b4 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt @@ -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_library(mbed-sfe-artemis-atp INTERFACE) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt index 2d84308733..a579b36356 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt @@ -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_library(mbed-sfe-artemis-dk INTERFACE) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt index 23435046c8..26c4a222fc 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt @@ -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_library(mbed-sfe-artemis-module INTERFACE) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt index 327cf976bf..30ae273dd9 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt @@ -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_library(mbed-sfe-artemis-nano INTERFACE) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt index d03d1cad3e..09a156b6ff 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt @@ -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_library(mbed-sfe-artemis-thing-plus INTERFACE) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt index a6b9c7988e..45980d3f29 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt @@ -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_library(mbed-sfe-edge INTERFACE) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt index dad3a83db8..cc34416f31 100644 --- a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt +++ b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt @@ -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_library(mbed-sfe-edge2 INTERFACE) From 1ceb3facd9fb3eae3e00c7e1137d2bd07f91ba8c Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 11 Feb 2021 14:32:01 +0000 Subject: [PATCH 4/4] CMake Ambiq Micro: fix CMakeLists names --- .../COMPONENT_hm01b0/hm01b0/{CMakelists.txt => CMakeLists.txt} | 0 .../lis2dh12/{CMakelists.txt => CMakeLists.txt} | 0 .../TARGET_SFE_ARTEMIS/{CMakelists.txt => CMakeLists.txt} | 0 .../TARGET_SFE_ARTEMIS_ATP/{CMakelists.txt => CMakeLists.txt} | 0 .../TARGET_SFE_ARTEMIS_DK/{CMakelists.txt => CMakeLists.txt} | 0 .../TARGET_SFE_ARTEMIS_MODULE/{CMakelists.txt => CMakeLists.txt} | 0 .../TARGET_SFE_ARTEMIS_NANO/{CMakelists.txt => CMakeLists.txt} | 0 .../{CMakelists.txt => CMakeLists.txt} | 0 .../TARGET_SFE_EDGE/{CMakelists.txt => CMakeLists.txt} | 0 .../TARGET_SFE_EDGE2/{CMakelists.txt => CMakeLists.txt} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/{CMakelists.txt => CMakeLists.txt} (100%) rename targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/{CMakelists.txt => CMakeLists.txt} (100%) diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakeLists.txt similarity index 100% rename from targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakelists.txt rename to targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_hm01b0/hm01b0/CMakeLists.txt diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakeLists.txt similarity index 100% rename from targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakelists.txt rename to targets/TARGET_Ambiq_Micro/TARGET_Apollo3/COMPONENT_lis2dh12/lis2dh12/CMakeLists.txt diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakeLists.txt similarity index 100% rename from targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakelists.txt rename to targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/CMakeLists.txt diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakeLists.txt similarity index 100% rename from targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakelists.txt rename to targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_ATP/CMakeLists.txt diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakeLists.txt similarity index 100% rename from targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakelists.txt rename to targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_DK/CMakeLists.txt diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakeLists.txt similarity index 100% rename from targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakelists.txt rename to targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_MODULE/CMakeLists.txt diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakeLists.txt similarity index 100% rename from targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakelists.txt rename to targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_NANO/CMakeLists.txt diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakeLists.txt similarity index 100% rename from targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakelists.txt rename to targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS_THING_PLUS/CMakeLists.txt diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakeLists.txt similarity index 100% rename from targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakelists.txt rename to targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE/CMakeLists.txt diff --git a/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt b/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakeLists.txt similarity index 100% rename from targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakelists.txt rename to targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_EDGE2/CMakeLists.txt