Remove multiply defined symbol from kvstore/securestore/mbed_lib.json

.gitignore

@@ -100,3 +100,8 @@ DELIVERY/
 
 # Directory used to clone and build TF-M
 features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_IGNORE/
+
+# CMake
+CMakeCache.txt
+cmake_install.cmake
+CMakeFiles/

.travis.yml

@@ -40,6 +40,10 @@ after_success:
 after_failure:
   - set_status "failure" "Test failed."
 
+addons:
+  apt:
+    packages:
+    - ninja-build
 
 matrix:
   include:
@@ -100,6 +104,34 @@ matrix:
               ':!*platform_mbed.h' ':!*TESTS/*' ':!TEST_APPS/' ':!UNITTESTS/' \
               ':!*tests/*' ':!*targets/*' ':!*TARGET_*' ':!*unsupported/*'
 
+    - &cmake-build-test
+      stage: "CMake"
+      name: "CMake blinky example"
+      env: NAME=cmake_test
+      language: python
+      python: 3.8
+      install:
+        # Install gcc
+        - source_pkg gcc
+        - arm-none-eabi-gcc --version
+        - pip install --upgrade cmake
+        - pip install --upgrade mbed-tools
+        # We use manual clone, with depth and single branch = the fastest
+        # Because of this, we need to create .mbed file as the current tools require it
+        - >-
+         git clone --depth=1 --single-branch --branch feature-cmake https://github.com/ARMmbed/mbed-os-example-blinky.git;
+         cd mbed-os-example-blinky;
+         git clone --depth=1 --single-branch https://github.com/ARMmbed/mbed-os.git;
+         cd mbed-os;
+         git fetch origin +refs/pull/${TRAVIS_PULL_REQUEST}/merge;
+         git checkout -qf FETCH_HEAD
+        - >-
+          cd -;
+          touch .mbed;
+          mbedtools configure -t GCC_ARM -m K64F;
+          mkdir -p build
+      script:
+        - cd build && cmake .. -GNinja -DMBED_PROFILE=develop && cmake --build .
 
     ### Docs Tests ###
     - &docs-vm

CMakeLists.txt

@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# This is not the application cmake, only boilerplate for Mbed OS
+
+cmake_minimum_required(VERSION 3.13)
+
+# Using relative paths behavior
+if(POLICY CMP0076)
+    cmake_policy(SET CMP0076 NEW)
+endif()
+
+# Create Mbed OS library
+add_library(mbed-os OBJECT)
+
+# Include mbed.h and config from generate folder
+target_include_directories(mbed-os PUBLIC .)
+
+# Link config from generate folder
+# TODO: @mbed-os-tools We need to get this gen_config somehow set up
+target_link_libraries(mbed-os PRIVATE gen_config)
+
+# Default build
+add_subdirectory(cmsis)
+add_subdirectory(components)
+add_subdirectory(connectivity)
+add_subdirectory(drivers)
+add_subdirectory(events)
+add_subdirectory(features)
+add_subdirectory(hal)
+add_subdirectory(platform)
+add_subdirectory(rtos)
+add_subdirectory(storage)
+add_subdirectory(targets)
+
+
+# Add additional component
+get_property(component GLOBAL PROPERTY MBED_COMPONENT)
+
+foreach(module ${component})
+    add_subdirectory(${module})
+endforeach()

cmake/app.cmake

@@ -0,0 +1,85 @@
+# SPDX-License-Identifier: Apache-2.0
+
+include(.mbedbuild/mbed_config.cmake)
+include(${MBED_ROOT}/cmake/toolchain.cmake)
+include(${MBED_ROOT}/cmake/env.cmake)
+include(${MBED_ROOT}/cmake/util.cmake)
+include(${MBED_ROOT}/cmake/core.cmake)
+include(${MBED_ROOT}/cmake/profile.cmake)
+
+# if the environment does not specify build type, set to Debug
+if(NOT CMAKE_BUILD_TYPE)
+set(CMAKE_BUILD_TYPE "RelWithDebInfo"
+        CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
+        FORCE)
+endif()
+
+# Create application executable
+add_executable(app)
+
+# Include Mbed OS main cmake
+add_subdirectory(mbed-os)
+
+# Link the example libs
+target_link_libraries(app mbed-os gen_config)
+
+# I have  to  leave this here as linker is processed after mbed-os added, and can't be in toolchain.cmake
+# as its global symbol is empty at that stage, this needs more work
+# TODO: This property + pre/post should be moved
+get_property(linkerfile GLOBAL PROPERTY MBED_TARGET_LINKER_FILE)
+
+# TODO: get project name to inject into ld
+# TODO: @mbed-os-tools this pre/post build commands should get details from target + profile
+if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
+    # I have  to  leave this here as linker is processed after mbed-os added, and can't be in toolchain.cmake
+    # as its global symbol is empty at that stage, this needs more work
+    # TODO: This property  pre/post should be moved
+    set(CMAKE_PRE_BUILD_COMMAND
+        COMMAND "arm-none-eabi-cpp" -E -P
+            -Wl,--gc-sections -Wl,--wrap,main -Wl,--wrap,_malloc_r -Wl,--wrap,_free_r
+            -Wl,--wrap,_realloc_r -Wl,--wrap,_memalign_r -Wl,--wrap,_calloc_r
+            -Wl,--wrap,exit -Wl,--wrap,atexit -Wl,-n
+            -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp
+            -DMBED_ROM_START=0x0 -DMBED_ROM_SIZE=0x100000 -DMBED_RAM_START=0x20000000
+            -DMBED_RAM_SIZE=0x30000 -DMBED_RAM1_START=0x1fff0000
+            -DMBED_RAM1_SIZE=0x10000 -DMBED_BOOT_STACK_SIZE=1024
+            -DXIP_ENABLE=0
+            ${linkerfile} -o ${CMAKE_CURRENT_BINARY_DIR}/app.link_script.ld
+
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/app.link_script.ld"
+    )
+elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+    set(CMAKE_PRE_BUILD_COMMAND COMMAND "")
+    set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} --scatter=${linkerfile}")
+endif()
+
+# TODO: @mbed-os-tools this pre/post build commands should get details from target + profile
+if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
+    set(CMAKE_POST_BUILD_COMMAND
+        COMMAND ${ELF2BIN} -O binary $<TARGET_FILE:app> $<TARGET_FILE:app>.bin
+        COMMAND ${CMAKE_COMMAND} -E echo "-- built: $<TARGET_FILE:app>.bin"
+        COMMAND ${ELF2BIN} -O ihex $<TARGET_FILE:app> $<TARGET_FILE:app>.hex
+        COMMAND ${CMAKE_COMMAND} -E echo "-- built: $<TARGET_FILE:app>.hex"
+    )
+elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+    set(CMAKE_POST_BUILD_COMMAND
+        COMMAND ${ELF2BIN} --bin  -o $<TARGET_FILE:app>.bin $<TARGET_FILE:app>
+        COMMAND ${CMAKE_COMMAND} -E echo "-- built: $<TARGET_FILE:app>.bin"
+        COMMAND ${ELF2BIN} --i32combined  -o $<TARGET_FILE:app>.hex $<TARGET_FILE:app>
+        COMMAND ${CMAKE_COMMAND} -E echo "-- built: $<TARGET_FILE:app>.hex"
+    )
+elseif(MBED_TOOLCHAIN STREQUAL "IAR")
+    set(CMAKE_POST_BUILD_COMMAND
+        COMMAND ${ELF2BIN} --bin $<TARGET_FILE:app> $<TARGET_FILE:app>.bin
+        COMMAND ${CMAKE_COMMAND} -E echo "-- built: $<TARGET_FILE:app>.bin"
+        COMMAND ${ELF2BIN} --ihex $<TARGET_FILE:app> $<TARGET_FILE:app>.hex
+        COMMAND ${CMAKE_COMMAND} -E echo "-- built: $<TARGET_FILE:app>.hex"
+    )
+endif()
+
+
+
+# Custom pre/post build steps
+add_custom_command(TARGET app PRE_LINK ${CMAKE_PRE_BUILD_COMMAND})
+add_custom_command(TARGET app POST_BUILD ${CMAKE_POST_BUILD_COMMAND})

cmake/core.cmake

@@ -0,0 +1,4 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+include(${MBED_ROOT}/cmake/cores/${MBED_CPU_CORE}.cmake)

cmake/cores/Cortex-A9.cmake

@@ -0,0 +1,58 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+set(CMAKE_SYSTEM_PROCESSOR cortex-a9)
+
+if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
+
+set(GCC_FLAGS " \
+    -mthumb-interwork \
+    -marm \
+    -march=armv7-a \
+    -mfpu=vfpv3 \
+    -mfloat-abi=hard \
+    -mno-unaligned-access \
+")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
+    ${GCC_FLAGS} \
+")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+    ${GCC_FLAGS} \
+")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
+    ${GCC_FLAGS} \
+")
+set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
+    ${GCC_FLAGS} \
+")
+
+elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+
+set(ARM_FLAGS " \
+    --cpu=Cortex-A9 \
+")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
+    ${ARM_FLAGS} \
+")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+    ${ARM_FLAGS} \
+")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
+    ${ARM_FLAGS} \
+")
+set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
+    ${ARM_FLAGS} \
+")
+
+endif()
+
+add_definitions(
+    -D__CORTEX_A9
+    -DARM_MATH_CA9
+    -D__FPU_PRESENT
+    -D__CMSIS_RTOS
+    -D__EVAL
+    -D__MBED_CMSIS_RTOS_CA9
+)

cmake/cores/Cortex-M0+.cmake

@@ -0,0 +1,52 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+set(CMAKE_SYSTEM_PROCESSOR cortex-m0plus)
+
+if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
+
+set(GCC_FLAGS " \
+    -mthumb \
+    -mcpu=cortex-m0plus \
+")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
+    ${GCC_FLAGS} \
+")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+    ${GCC_FLAGS} \
+")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
+    ${GCC_FLAGS} \
+")
+set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
+    ${GCC_FLAGS} \
+")
+
+elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+
+set(ARM_FLAGS " \
+    --cpu=Cortex-M0plus \
+")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
+    ${ARM_FLAGS} \
+")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+    ${ARM_FLAGS} \
+")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
+    ${ARM_FLAGS} \
+")
+set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
+    ${ARM_FLAGS} \
+")
+
+endif()
+
+add_definitions(
+    -D__CORTEX_M0PLUS
+    -DARM_MATH_CM0PLUS
+    -D__CMSIS_RTOS
+    -D__MBED_CMSIS_RTOS_CM
+)

cmake/cores/Cortex-M0.cmake

@@ -0,0 +1,51 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+set(CMAKE_SYSTEM_PROCESSOR cortex-m0)
+
+if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
+
+set(GCC_FLAGS " \
+    -mthumb \
+")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
+    ${GCC_FLAGS} \
+")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+    ${GCC_FLAGS} \
+")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
+    ${GCC_FLAGS} \
+")
+set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
+    ${GCC_FLAGS} \
+")
+
+elseif(MBED_TOOLCHAIN STREQUAL "ARMC6")
+
+set(ARM_FLAGS " \
+    --cpu=Cortex-M0 \
+")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
+    ${ARM_FLAGS} \
+")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+    ${ARM_FLAGS} \
+")
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
+    ${ARM_FLAGS} \
+")
+set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
+    ${ARM_FLAGS} \
+")
+
+endif()
+
+add_definitions(
+    -D__CORTEX_M0
+    -DARM_MATH_CM0
+    -D__CMSIS_RTOS
+    -D__MBED_CMSIS_RTOS_CM
+)