ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12151 from hugueskamba/hk-nrf-fix-baremetal-build 

NRF5x: Fix baremetal linker error
pull/12154/head
Martin Kojtal 2020-01-08 14:41:26 +01:00 committed by GitHub
parent 4b0c4a073c 6afca2460e
commit c42125f890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.c
View File

@ -40,7 +40,8 @@
#include "app_error.h"
#include "nordic_common.h"
#if defined(DEBUG_NRF)
#if !MBED_CONF_BLE_PRESENT
#if defined(DEBUG_NRF) || defined(DEBUG_NRF_USER)
void assert_nrf_callback(uint16_t line_num, const uint8_t * file_name)
{
assert_info_t assert_info =
@ -52,4 +53,5 @@ void assert_nrf_callback(uint16_t line_num, const uint8_t * file_name)
UNUSED_VARIABLE(assert_info);
}
#endif /* DEBUG_NRF */
#endif /* defined(DEBUG_NRF) || defined(DEBUG_NRF_USER) */
#endif // !MBED_CONF_BLE_PRESENT