File tree Expand file tree Collapse file tree 6 files changed +22
-325
lines changed
connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device Expand file tree Collapse file tree 6 files changed +22
-325
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,10 @@ function(_mbed_get_libcc_310_ext)
9
9
elseif (${MBED_TOOLCHAIN} STREQUAL "IAR" )
10
10
set (LIBCC_310_EXT TOOLCHAIN_IAR/lib_cc310_ext.a )
11
11
endif ()
12
- target_sources (mbed-os PRIVATE ${LIBCC_310_EXT} )
12
+ target_link_libraries (mbed-os
13
+ PUBLIC
14
+ ${CMAKE_CURRENT_SOURCE_DIR} /${LIBCC_310_EXT}
15
+ )
13
16
endfunction ()
14
17
15
18
function (_mbed_get_libcc_310_trng )
@@ -20,7 +23,10 @@ function(_mbed_get_libcc_310_trng)
20
23
elseif (${MBED_TOOLCHAIN} STREQUAL "IAR" )
21
24
set (LIBCC_310_TRNG TOOLCHAIN_IAR/lib_cc310_trng.a )
22
25
endif ()
23
- target_sources (mbed-os PRIVATE ${LIBCC_310_TRNG} )
26
+ target_link_libraries (mbed-os
27
+ PUBLIC
28
+ ${CMAKE_CURRENT_SOURCE_DIR} /${LIBCC_310_TRNG}
29
+ )
24
30
endfunction ()
25
31
26
32
_mbed_get_libcc_310_ext ()
Original file line number Diff line number Diff line change @@ -9,7 +9,10 @@ function(_mbed_get_libcc_310_core)
9
9
elseif (${MBED_TOOLCHAIN} STREQUAL "IAR" )
10
10
set (LIBCC_310_CORE TOOLCHAIN_IAR/lib_cc310_ext.a )
11
11
endif ()
12
- target_sources (mbed-os PRIVATE ${LIBCC_310_CORE} )
12
+ target_link_libraries (mbed-os
13
+ PUBLIC
14
+ ${CMAKE_CURRENT_SOURCE_DIR} /${LIBCC_310_CORE}
15
+ )
13
16
endfunction ()
14
17
15
18
_mbed_get_libcc_310_core ()
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ function(_mbed_get_assembly_nrf52840_dk)
5
5
if (${MBED_TOOLCHAIN} STREQUAL "GCC_ARM" )
6
6
set (STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_NRF52840.S )
7
7
elseif (${MBED_TOOLCHAIN} STREQUAL "ARM" )
8
- set (STARTUP_FILE TOOLCHAIN_ARM /startup_nrf52840.S )
8
+ set (STARTUP_FILE TOOLCHAIN_ARM_STD /startup_nrf52840.S )
9
9
elseif (${MBED_TOOLCHAIN} STREQUAL "IAR" )
10
10
set (STARTUP_FILE TOOLCHAIN_IAR/startup_NRF52840_IAR.S )
11
11
endif ()
@@ -16,7 +16,7 @@ function(_mbed_set_linker_file)
16
16
if (${MBED_TOOLCHAIN} STREQUAL "GCC_ARM" )
17
17
set (LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR} /TOOLCHAIN_GCC_ARM/NRF52840.ld )
18
18
elseif (${MBED_TOOLCHAIN} STREQUAL "ARM" )
19
- set (LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR} /TOOLCHAIN_ARM /nRF52840.sct )
19
+ set (LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR} /TOOLCHAIN_ARM_STD /nRF52840.sct )
20
20
elseif (${MBED_TOOLCHAIN} STREQUAL "IAR" )
21
21
set (LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR} /TOOLCHAIN_IAR/nRF52840.icf )
22
22
endif ()
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments