Skip to content

CMake: Fix NRF52840_DK build failure with ARM toolchain #13446

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 2 commits into from
Aug 18, 2020
Merged

CMake: Fix NRF52840_DK build failure with ARM toolchain #13446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93ec002
CMake: Fix NRF52840_DK build failure
hugueskamba Aug 17, 2020
170503b
CMake: Fix CORDIO_LL build failure
hugueskamba Aug 17, 2020
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
44 changes: 44 additions & 0 deletions connectivity/FEATURE_BLE/libraries/TARGET_CORDIO_LL/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ target_sources(mbed-os
stack/controller/sources/ble/lctr/lctr_act_adv_master_ae.c
stack/controller/sources/ble/lctr/lctr_act_adv_slave.c
stack/controller/sources/ble/lctr/lctr_act_adv_slave_ae.c
stack/controller/sources/ble/lctr/lctr_act_bis_master.c
stack/controller/sources/ble/lctr/lctr_act_bis_slave.c
stack/controller/sources/ble/lctr/lctr_act_cis.c
stack/controller/sources/ble/lctr/lctr_act_cis_master.c
stack/controller/sources/ble/lctr/lctr_act_cis_slave.c
stack/controller/sources/ble/lctr/lctr_act_conn.c
stack/controller/sources/ble/lctr/lctr_act_conn_master.c
stack/controller/sources/ble/lctr/lctr_act_conn_master_ae.c
Expand All @@ -65,11 +70,17 @@ target_sources(mbed-os
stack/controller/sources/ble/lctr/lctr_act_enc_master.c
stack/controller/sources/ble/lctr/lctr_act_init_master.c
stack/controller/sources/ble/lctr/lctr_act_init_master_ae.c
stack/controller/sources/ble/lctr/lctr_act_pc.c
stack/controller/sources/ble/lctr/lctr_act_phy.c
stack/controller/sources/ble/lctr/lctr_isr_adv_master.c
stack/controller/sources/ble/lctr/lctr_isr_adv_master_ae.c
stack/controller/sources/ble/lctr/lctr_isr_adv_slave.c
stack/controller/sources/ble/lctr/lctr_isr_adv_slave_ae.c
stack/controller/sources/ble/lctr/lctr_isr_bis_master.c
stack/controller/sources/ble/lctr/lctr_isr_bis_slave.c
stack/controller/sources/ble/lctr/lctr_isr_cis.c
stack/controller/sources/ble/lctr/lctr_isr_cis_master.c
stack/controller/sources/ble/lctr/lctr_isr_cis_slave.c
stack/controller/sources/ble/lctr/lctr_isr_conn.c
stack/controller/sources/ble/lctr/lctr_isr_conn_master.c
stack/controller/sources/ble/lctr/lctr_isr_conn_slave.c
Expand All @@ -80,6 +91,12 @@ target_sources(mbed-os
stack/controller/sources/ble/lctr/lctr_main_adv_master_ae.c
stack/controller/sources/ble/lctr/lctr_main_adv_slave.c
stack/controller/sources/ble/lctr/lctr_main_adv_slave_ae.c
stack/controller/sources/ble/lctr/lctr_main_bis.c
stack/controller/sources/ble/lctr/lctr_main_bis_master.c
stack/controller/sources/ble/lctr/lctr_main_bis_slave.c
stack/controller/sources/ble/lctr/lctr_main_cis.c
stack/controller/sources/ble/lctr/lctr_main_cis_master.c
stack/controller/sources/ble/lctr/lctr_main_cis_slave.c
stack/controller/sources/ble/lctr/lctr_main_conn.c
stack/controller/sources/ble/lctr/lctr_main_conn_cs2.c
stack/controller/sources/ble/lctr/lctr_main_conn_data.c
Expand All @@ -89,30 +106,42 @@ target_sources(mbed-os
stack/controller/sources/ble/lctr/lctr_main_enc_slave.c
stack/controller/sources/ble/lctr/lctr_main_init_master.c
stack/controller/sources/ble/lctr/lctr_main_init_master_ae.c
stack/controller/sources/ble/lctr/lctr_main_iso.c
stack/controller/sources/ble/lctr/lctr_main_iso_data.c
stack/controller/sources/ble/lctr/lctr_main_master_phy.c
stack/controller/sources/ble/lctr/lctr_main_past.c
stack/controller/sources/ble/lctr/lctr_main_pc.c
stack/controller/sources/ble/lctr/lctr_main_priv.c
stack/controller/sources/ble/lctr/lctr_main_sc.c
stack/controller/sources/ble/lctr/lctr_main_slave_phy.c
stack/controller/sources/ble/lctr/lctr_pdu_adv_master_ae.c
stack/controller/sources/ble/lctr/lctr_pdu_adv_slave.c
stack/controller/sources/ble/lctr/lctr_pdu_adv_slave_ae.c
stack/controller/sources/ble/lctr/lctr_pdu_bis.c
stack/controller/sources/ble/lctr/lctr_pdu_conn.c
stack/controller/sources/ble/lctr/lctr_pdu_enc.c
stack/controller/sources/ble/lctr/lctr_pdu_iso.c
stack/controller/sources/ble/lctr/lctr_sm_adv_master.c
stack/controller/sources/ble/lctr/lctr_sm_adv_master_ae.c
stack/controller/sources/ble/lctr/lctr_sm_adv_slave.c
stack/controller/sources/ble/lctr/lctr_sm_adv_slave_ae.c
stack/controller/sources/ble/lctr/lctr_sm_bis_master.c
stack/controller/sources/ble/lctr/lctr_sm_bis_slave.c
stack/controller/sources/ble/lctr/lctr_sm_cis.c
stack/controller/sources/ble/lctr/lctr_sm_conn_master.c
stack/controller/sources/ble/lctr/lctr_sm_conn_slave.c
stack/controller/sources/ble/lctr/lctr_sm_init_master.c
stack/controller/sources/ble/lctr/lctr_sm_init_master_ae.c
stack/controller/sources/ble/lctr/lctr_sm_llcp_cis.c
stack/controller/sources/ble/lctr/lctr_sm_llcp_cis_master.c
stack/controller/sources/ble/lctr/lctr_sm_llcp_cis_slave.c
stack/controller/sources/ble/lctr/lctr_sm_llcp_conn.c
stack/controller/sources/ble/lctr/lctr_sm_llcp_conn_master.c
stack/controller/sources/ble/lctr/lctr_sm_llcp_conn_slave.c
stack/controller/sources/ble/lctr/lctr_sm_llcp_enc_master.c
stack/controller/sources/ble/lctr/lctr_sm_llcp_enc_slave.c
stack/controller/sources/ble/lctr/lctr_sm_llcp_master_phy.c
stack/controller/sources/ble/lctr/lctr_sm_llcp_pc.c
stack/controller/sources/ble/lctr/lctr_sm_llcp_slave_phy.c
)

Expand Down Expand Up @@ -202,15 +231,21 @@ target_sources(mbed-os
stack/controller/sources/ble/ll/ll_init_adv_master_ae.c
stack/controller/sources/ble/ll/ll_init_adv_slave.c
stack/controller/sources/ble/ll/ll_init_adv_slave_ae.c
stack/controller/sources/ble/ll/ll_init_bis_master.c
stack/controller/sources/ble/ll/ll_init_bis_slave.c
stack/controller/sources/ble/ll/ll_init_cis_master.c
stack/controller/sources/ble/ll/ll_init_cis_slave.c
stack/controller/sources/ble/ll/ll_init_conn_cs2.c
stack/controller/sources/ble/ll/ll_init_conn_master.c
stack/controller/sources/ble/ll/ll_init_conn_slave.c
stack/controller/sources/ble/ll/ll_init_enc_master.c
stack/controller/sources/ble/ll/ll_init_enc_slave.c
stack/controller/sources/ble/ll/ll_init_init_master.c
stack/controller/sources/ble/ll/ll_init_init_master_ae.c
stack/controller/sources/ble/ll/ll_init_iso.c
stack/controller/sources/ble/ll/ll_init_master_phy.c
stack/controller/sources/ble/ll/ll_init_past.c
stack/controller/sources/ble/ll/ll_init_pc.c
stack/controller/sources/ble/ll/ll_init_priv.c
stack/controller/sources/ble/ll/ll_init_sc.c
stack/controller/sources/ble/ll/ll_init_slave_phy.c
Expand All @@ -219,6 +254,10 @@ target_sources(mbed-os
stack/controller/sources/ble/ll/ll_main_adv_master_ae.c
stack/controller/sources/ble/ll/ll_main_adv_slave.c
stack/controller/sources/ble/ll/ll_main_adv_slave_ae.c
stack/controller/sources/ble/ll/ll_main_bis_master.c
stack/controller/sources/ble/ll/ll_main_bis_slave.c
stack/controller/sources/ble/ll/ll_main_cis_master.c
stack/controller/sources/ble/ll/ll_main_cis_slave.c
stack/controller/sources/ble/ll/ll_main_conn.c
stack/controller/sources/ble/ll/ll_main_conn_master.c
stack/controller/sources/ble/ll/ll_main_conn_master_ae.c
Expand All @@ -227,7 +266,9 @@ target_sources(mbed-os
stack/controller/sources/ble/ll/ll_main_dtm.c
stack/controller/sources/ble/ll/ll_main_enc_master.c
stack/controller/sources/ble/ll/ll_main_enc_slave.c
stack/controller/sources/ble/ll/ll_main_iso.c
stack/controller/sources/ble/ll/ll_main_past.c
stack/controller/sources/ble/ll/ll_main_pc.c
stack/controller/sources/ble/ll/ll_main_phy.c
stack/controller/sources/ble/ll/ll_main_priv.c
stack/controller/sources/ble/ll/ll_main_sc.c
Expand All @@ -240,7 +281,9 @@ target_sources(mbed-os
stack/controller/sources/ble/lmgr/lmgr_main.c
stack/controller/sources/ble/lmgr/lmgr_main_adv_master_ae.c
stack/controller/sources/ble/lmgr/lmgr_main_adv_slave_ae.c
stack/controller/sources/ble/lmgr/lmgr_main_cis_master.c
stack/controller/sources/ble/lmgr/lmgr_main_conn.c
stack/controller/sources/ble/lmgr/lmgr_main_iso.c
stack/controller/sources/ble/lmgr/lmgr_main_master.c
stack/controller/sources/ble/lmgr/lmgr_main_priv.c
stack/controller/sources/ble/lmgr/lmgr_main_sc.c
Expand All @@ -251,6 +294,7 @@ target_sources(mbed-os
PRIVATE
stack/controller/sources/ble/sch/sch_ble.c
stack/controller/sources/ble/sch/sch_rm.c
stack/controller/sources/ble/sch/sch_tm.c
)

target_sources(mbed-os
Expand Down
10 changes: 8 additions & 2 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,7 +9,10 @@ function(_mbed_get_libcc_310_ext)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
set(LIBCC_310_EXT TOOLCHAIN_IAR/lib_cc310_ext.a)
endif()
target_sources(mbed-os PRIVATE ${LIBCC_310_EXT})
target_link_libraries(mbed-os
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_EXT}
)
endfunction()

function(_mbed_get_libcc_310_trng)
Expand All @@ -20,7 +23,10 @@ function(_mbed_get_libcc_310_trng)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
set(LIBCC_310_TRNG TOOLCHAIN_IAR/lib_cc310_trng.a)
endif()
target_sources(mbed-os PRIVATE ${LIBCC_310_TRNG})
target_link_libraries(mbed-os
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_TRNG}
)
endfunction()

_mbed_get_libcc_310_ext()
Expand Down
5 changes: 4 additions & 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 @@ -9,7 +9,10 @@ function(_mbed_get_libcc_310_core)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
set(LIBCC_310_CORE TOOLCHAIN_IAR/lib_cc310_ext.a)
endif()
target_sources(mbed-os PRIVATE ${LIBCC_310_CORE})
target_link_libraries(mbed-os
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/${LIBCC_310_CORE}
)
endfunction()

_mbed_get_libcc_310_core()
4 changes: 2 additions & 2 deletions targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function(_mbed_get_assembly_nrf52840_dk)
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_NRF52840.S)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(STARTUP_FILE TOOLCHAIN_ARM/startup_nrf52840.S)
set(STARTUP_FILE TOOLCHAIN_ARM_STD/startup_nrf52840.S)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
set(STARTUP_FILE TOOLCHAIN_IAR/startup_NRF52840_IAR.S)
endif()
Expand All @@ -16,7 +16,7 @@ function(_mbed_set_linker_file)
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_GCC_ARM/NRF52840.ld)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_ARM/nRF52840.sct)
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_ARM_STD/nRF52840.sct)
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_IAR/nRF52840.icf)
endif()
Expand Down
49 changes: 0 additions & 49 deletions ...ET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM/nRF52840.sct
View file
Open in desktop

This file was deleted.

Loading