Skip to content

Commit 8221463

Browse files
committed
CMake: Fix NRF52840_DK build failure
* Remove duplicated ARM toolchain directory * Link with archived cryptocell 310 libraries instead of adding them as source files * Provide default MBED_BOOT_STACK_SIZE definition in scatter file as is done for GCC_ARM linker file
1 parent a37c3e9 commit 8221463

File tree

6 files changed

+22
-325
lines changed

6 files changed

+22
-325
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ function(_mbed_get_libcc_310_ext)
99
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
1010
set(LIBCC_310_EXT TOOLCHAIN_IAR/lib_cc310_ext.a)
1111
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+
)
1316
endfunction()
1417

1518
function(_mbed_get_libcc_310_trng)
@@ -20,7 +23,10 @@ function(_mbed_get_libcc_310_trng)
2023
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
2124
set(LIBCC_310_TRNG TOOLCHAIN_IAR/lib_cc310_trng.a)
2225
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+
)
2430
endfunction()
2531

2632
_mbed_get_libcc_310_ext()

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ function(_mbed_get_libcc_310_core)
99
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
1010
set(LIBCC_310_CORE TOOLCHAIN_IAR/lib_cc310_ext.a)
1111
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+
)
1316
endfunction()
1417

1518
_mbed_get_libcc_310_core()

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function(_mbed_get_assembly_nrf52840_dk)
55
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
66
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_NRF52840.S)
77
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
8-
set(STARTUP_FILE TOOLCHAIN_ARM/startup_nrf52840.S)
8+
set(STARTUP_FILE TOOLCHAIN_ARM_STD/startup_nrf52840.S)
99
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
1010
set(STARTUP_FILE TOOLCHAIN_IAR/startup_NRF52840_IAR.S)
1111
endif()
@@ -16,7 +16,7 @@ function(_mbed_set_linker_file)
1616
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1717
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_GCC_ARM/NRF52840.ld)
1818
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)
2020
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
2121
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_IAR/nRF52840.icf)
2222
endif()

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM/nRF52840.sct

Lines changed: 0 additions & 49 deletions
This file was deleted.

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM/startup_nrf52840.S

Lines changed: 0 additions & 267 deletions
This file was deleted.

0 commit comments

Comments
 (0)