Merge pull request #13964 from hugueskamba/hk_cmake_arm_fm_support

CMake: Add support for all ARM FM Mbed targets
2020-11-26 15:55:43 +00:00 · 2020-11-26 15:55:43 +00:00 · b20278a5f4
parent 22c1c6c7cf def23e18e0
commit b20278a5f4
9 changed files with 131 additions and 6 deletions
--- a/targets/CMakeLists.txt
+++ b/targets/CMakeLists.txt
@ -1,7 +1,9 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0

-if("Freescale" IN_LIST MBED_TARGET_LABELS)
+if("ARM_FM" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(TARGET_ARM_FM)
+elseif("Freescale" IN_LIST MBED_TARGET_LABELS)
    add_subdirectory(TARGET_Freescale)
 elseif("NORDIC" IN_LIST MBED_TARGET_LABELS)
    add_subdirectory(TARGET_NORDIC)     
--- a/targets/TARGET_ARM_FM/CMakeLists.txt
+++ b/targets/TARGET_ARM_FM/CMakeLists.txt
@ -0,0 +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()
+
+target_include_directories(mbed-core
+    INTERFACE
+        .
+)
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt
@ -0,0 +1,111 @@
+# 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
+    )
+
+    set(SYSTEM_FILE TARGET_FVP_MPS2_M0/device/system_CMSDK_CM0.c)
+
+    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
+    INTERFACE
+        .
+        drivers
+        SDK
+)
+
+target_sources(mbed-core
+    INTERFACE
+        analogin_api.c
+        flash_api.c
+        gpio_api.c
+        gpio_irq_api.c
+        i2c_api.c
+        lp_ticker.c
+        pinmap.c
+        port_api.c
+        serial_api.c
+        sleep_api.c
+        spi_api.c
+        trng_api.c
+        us_ticker.c
+
+        drivers/lan91c111.c
+
+        SDK/fpga.c
+        ${SYSTEM_FILE}
+        ${STARTUP_FILE}
+)
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/device/TOOLCHAIN_ARM_STD/MPS2.sct
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/device/TOOLCHAIN_ARM_STD/MPS2.sct
@ -1,4 +1,4 @@
-#! armcc -E
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m0
 ;* MPS2 CMSIS Library
 ;*
 ;* Copyright (c) 2006-2019 ARM Limited
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/device/TOOLCHAIN_ARM_STD/MPS2.sct
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/device/TOOLCHAIN_ARM_STD/MPS2.sct
@ -1,4 +1,4 @@
-#! armcc -E
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m0plus
 ;* MPS2 CMSIS Library
 ;*
 ;* Copyright (c) 2006-2019 ARM Limited
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/device/TOOLCHAIN_ARM_STD/MPS2.sct
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/device/TOOLCHAIN_ARM_STD/MPS2.sct
@ -1,4 +1,4 @@
-#! armcc -E
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m3
 ;* MPS2 CMSIS Library
 ;*
 ;* Copyright (c) 2006-2019 ARM Limited
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/device/TOOLCHAIN_ARM_STD/MPS2.sct
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/device/TOOLCHAIN_ARM_STD/MPS2.sct
@ -1,4 +1,4 @@
-#! armcc -E
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m4
 ;* MPS2 CMSIS Library
 ;*
 ;* Copyright (c) 2006-2019 ARM Limited
--- a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/device/TOOLCHAIN_ARM_STD/MPS2.sct
+++ b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/device/TOOLCHAIN_ARM_STD/MPS2.sct
@ -1,4 +1,4 @@
-#! armcc -E
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m7
 ;* MPS2 CMSIS Library
 ;*
 ;* Copyright (c) 2006-2019 ARM Limited
--- a/tools/cmake/README.md
+++ b/tools/cmake/README.md
@ -24,6 +24,7 @@ The following targets are supported:
 - K66F
 - NRF52840_DK
 - WIO_3G
+- ARM FM targets

 ### Supported toolchains