Skip to content

Fix missing linkage of mbed-mbedtls-cryptocell310 to mbed-mbedtls #14435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2021
Merged

Fix missing linkage of mbed-mbedtls-cryptocell310 to mbed-mbedtls #14435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion connectivity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ add_library(mbed-emac INTERFACE)
add_library(mbed-lorawan INTERFACE)
add_library(mbed-lwipstack INTERFACE)
add_library(mbed-mbedtls INTERFACE)
add_library(mbed-mbedtls-cryptocell310 INTERFACE)
add_library(mbed-nanostack INTERFACE)
add_library(mbed-nanostack-coap_service INTERFACE)
add_library(mbed-nanostack-mbed_mesh_api INTERFACE)
Expand Down
2 changes: 1 addition & 1 deletion ...ty/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ target_sources(mbed-ble-cordio
target_link_libraries(mbed-ble-cordio
INTERFACE
mbed-ble-cordio_ll
mbed-mbedtls-cryptocell310
mbed-mbedtls
)
11 changes: 3 additions & 8 deletions connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ endif()

add_subdirectory(binaries)

target_include_directories(mbed-mbedtls-cryptocell310
target_include_directories(mbed-mbedtls
INTERFACE
.
./include
./include/cryptocell310
./include/cryptocell310/internal
)

target_sources(mbed-mbedtls-cryptocell310
target_sources(mbed-mbedtls
INTERFACE
source/aes_alt.c
source/cc_internal.c
Expand All @@ -29,12 +29,7 @@ target_sources(mbed-mbedtls-cryptocell310
source/trng.c
)

target_compile_definitions(mbed-mbedtls-cryptocell310
target_compile_definitions(mbed-mbedtls
INTERFACE
MBED_CONF_CRYPTOCELL310_PRESENT=1
)

target_link_libraries(mbed-mbedtls-cryptocell310
INTERFACE
mbed-mbedtls
)
6 changes: 3 additions & 3 deletions connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(LIBCC_310_TRNG TOOLCHAIN_ARM/libcc_310_trng.ar)
endif()

target_include_directories(mbed-mbedtls-cryptocell310
target_include_directories(mbed-mbedtls
INTERFACE
.
)

target_sources(mbed-mbedtls-cryptocell310
target_sources(mbed-mbedtls
INTERFACE
crypto_device_platform.c
)

target_link_libraries(mbed-mbedtls-cryptocell310
target_link_libraries(mbed-mbedtls
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_EXT}
${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_TRNG}
Expand Down
2 changes: 1 addition & 1 deletion connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(LIBCC_310_CORE TOOLCHAIN_ARM/libcc_310_core.ar)
endif()

target_link_libraries(mbed-mbedtls-cryptocell310
target_link_libraries(mbed-mbedtls
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_CORE}
)