Merge pull request #14435 from LDong-Arm/CRYPTOCELL310_linking

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

Author: 0xc0170

connectivity/CMakeLists.txt

@@ -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)

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

@@ -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
 )

connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/CMakeLists.txt

@@ -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
@@ -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
-)

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

@@ -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}

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

@@ -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}
 )