ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix CI issue: 

- Added absolute path as cmake failed to find linker file from relative path
- Added the missing MBED_CONF_CRYPTOCELL310_PRESENT
- Added the dependency library to BLE Cordio stack
pull/13870/head
Rajkumar Kanagaraj 2020-11-12 11:19:24 +00:00
parent 4c05ce874a
commit 438994ded4
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/CMakeLists.txt
View File

@ -19,3 +19,9 @@ target_sources(mbed-ble-cordio
stack/sources/pal_crypto.c stack/sources/pal_crypto.c
stack/sources/pal_timer.c stack/sources/pal_timer.c
) )
target_link_libraries(mbed-ble-cordio
INTERFACE
mbed-ble-cordio_ll
mbed-mbedtls-cryptocell310
)

5
connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/CMakeLists.txt
View File

@ -29,6 +29,11 @@ target_sources(mbed-mbedtls-cryptocell310
source/trng.c source/trng.c
) )
target_compile_definitions(mbed-mbedtls-cryptocell310
INTERFACE
MBED_CONF_CRYPTOCELL310_PRESENT=1
)
target_link_libraries(mbed-mbedtls-cryptocell310 target_link_libraries(mbed-mbedtls-cryptocell310
INTERFACE INTERFACE
mbed-mbedtls mbed-mbedtls

16
connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/CMakeLists.txt
View File

@ -2,14 +2,14 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(LIBCC_310_EXT ./TOOLCHAIN_GCC_ARM/libcc_310_ext.a) set(LIBCC_310_EXT TOOLCHAIN_GCC_ARM/libcc_310_ext.a)
set(LIBCC_310_TRNG ./TOOLCHAIN_GCC_ARM/libcc_310_trng.a) set(LIBCC_310_TRNG TOOLCHAIN_GCC_ARM/libcc_310_trng.a)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM") elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(LIBCC_310_EXT ./TOOLCHAIN_ARM/libcc_310_ext.ar) set(LIBCC_310_EXT TOOLCHAIN_ARM/libcc_310_ext.ar)
set(LIBCC_310_TRNG ./TOOLCHAIN_ARM/libcc_310_trng.ar) set(LIBCC_310_TRNG TOOLCHAIN_ARM/libcc_310_trng.ar)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR") elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
set(LIBCC_310_EXT ./TOOLCHAIN_IAR/lib_cc310_ext.a) set(LIBCC_310_EXT TOOLCHAIN_IAR/lib_cc310_ext.a)
set(LIBCC_310_TRNG ./TOOLCHAIN_IAR/lib_cc310_trng.a) set(LIBCC_310_TRNG TOOLCHAIN_IAR/lib_cc310_trng.a)
endif() endif()
target_include_directories(mbed-mbedtls-cryptocell310 target_include_directories(mbed-mbedtls-cryptocell310
@ -24,6 +24,6 @@ target_sources(mbed-mbedtls-cryptocell310
target_link_libraries(mbed-mbedtls-cryptocell310 target_link_libraries(mbed-mbedtls-cryptocell310
INTERFACE INTERFACE
${LIBCC_310_EXT} ${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_EXT}
${LIBCC_310_TRNG} ${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_TRNG}
) )

8
connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt
View File

@ -2,14 +2,14 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(LIBCC_310_CORE ./TOOLCHAIN_GCC_ARM/libcc_310_core.a) set(LIBCC_310_CORE TOOLCHAIN_GCC_ARM/libcc_310_core.a)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM") elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(LIBCC_310_CORE ./TOOLCHAIN_ARM/libcc_310_core.ar) set(LIBCC_310_CORE TOOLCHAIN_ARM/libcc_310_core.ar)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR") elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
set(LIBCC_310_CORE ./TOOLCHAIN_IAR/lib_cc310_ext.a) set(LIBCC_310_CORE TOOLCHAIN_IAR/lib_cc310_ext.a)
endif() endif()
target_link_libraries(mbed-mbedtls-cryptocell310 target_link_libraries(mbed-mbedtls-cryptocell310
INTERFACE INTERFACE
${LIBCC_310_CORE} ${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_CORE}
) )