Skip to content

Commit 438994d

Browse files
committed
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
1 parent 4c05ce8 commit 438994d

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,9 @@ target_sources(mbed-ble-cordio
1919
stack/sources/pal_crypto.c
2020
stack/sources/pal_timer.c
2121
)
22+
23+
target_link_libraries(mbed-ble-cordio
24+
INTERFACE
25+
mbed-ble-cordio_ll
26+
mbed-mbedtls-cryptocell310
27+
)

connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ target_sources(mbed-mbedtls-cryptocell310
2929
source/trng.c
3030
)
3131

32+
target_compile_definitions(mbed-mbedtls-cryptocell310
33+
INTERFACE
34+
MBED_CONF_CRYPTOCELL310_PRESENT=1
35+
)
36+
3237
target_link_libraries(mbed-mbedtls-cryptocell310
3338
INTERFACE
3439
mbed-mbedtls

connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
5-
set(LIBCC_310_EXT ./TOOLCHAIN_GCC_ARM/libcc_310_ext.a)
6-
set(LIBCC_310_TRNG ./TOOLCHAIN_GCC_ARM/libcc_310_trng.a)
5+
set(LIBCC_310_EXT TOOLCHAIN_GCC_ARM/libcc_310_ext.a)
6+
set(LIBCC_310_TRNG TOOLCHAIN_GCC_ARM/libcc_310_trng.a)
77
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
8-
set(LIBCC_310_EXT ./TOOLCHAIN_ARM/libcc_310_ext.ar)
9-
set(LIBCC_310_TRNG ./TOOLCHAIN_ARM/libcc_310_trng.ar)
8+
set(LIBCC_310_EXT TOOLCHAIN_ARM/libcc_310_ext.ar)
9+
set(LIBCC_310_TRNG TOOLCHAIN_ARM/libcc_310_trng.ar)
1010
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
11-
set(LIBCC_310_EXT ./TOOLCHAIN_IAR/lib_cc310_ext.a)
12-
set(LIBCC_310_TRNG ./TOOLCHAIN_IAR/lib_cc310_trng.a)
11+
set(LIBCC_310_EXT TOOLCHAIN_IAR/lib_cc310_ext.a)
12+
set(LIBCC_310_TRNG TOOLCHAIN_IAR/lib_cc310_trng.a)
1313
endif()
1414

1515
target_include_directories(mbed-mbedtls-cryptocell310
@@ -24,6 +24,6 @@ target_sources(mbed-mbedtls-cryptocell310
2424

2525
target_link_libraries(mbed-mbedtls-cryptocell310
2626
INTERFACE
27-
${LIBCC_310_EXT}
28-
${LIBCC_310_TRNG}
27+
${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_EXT}
28+
${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_TRNG}
2929
)

connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
5-
set(LIBCC_310_CORE ./TOOLCHAIN_GCC_ARM/libcc_310_core.a)
5+
set(LIBCC_310_CORE TOOLCHAIN_GCC_ARM/libcc_310_core.a)
66
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
7-
set(LIBCC_310_CORE ./TOOLCHAIN_ARM/libcc_310_core.ar)
7+
set(LIBCC_310_CORE TOOLCHAIN_ARM/libcc_310_core.ar)
88
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
9-
set(LIBCC_310_CORE ./TOOLCHAIN_IAR/lib_cc310_ext.a)
9+
set(LIBCC_310_CORE TOOLCHAIN_IAR/lib_cc310_ext.a)
1010
endif()
1111

1212
target_link_libraries(mbed-mbedtls-cryptocell310
1313
INTERFACE
14-
${LIBCC_310_CORE}
14+
${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_CORE}
1515
)

0 commit comments

Comments
 (0)