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

0xc0170 · web-flow · commit c42125f8904d · 2020-01-08T14:41:26.000+01:00
NRF5x: Fix baremetal linker error
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.c
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@`
`40`	`40`	`#include "app_error.h"`
`41`	`41`	`#include "nordic_common.h"`
`42`	`42`
`43`		`-#if defined(DEBUG_NRF)`
	`43`	`+#if !MBED_CONF_BLE_PRESENT`
	`44`	`+#if defined(DEBUG_NRF) \|\| defined(DEBUG_NRF_USER)`
`44`	`45`	`void assert_nrf_callback(uint16_t line_num, const uint8_t * file_name)`
`45`	`46`	`{`
`46`	`47`	`assert_info_t assert_info =`
`@@ -52,4 +53,5 @@ void assert_nrf_callback(uint16_t line_num, const uint8_t * file_name)`
`52`	`53`
`53`	`54`	`UNUSED_VARIABLE(assert_info);`
`54`	`55`	`}`
`55`		`-#endif /* DEBUG_NRF */`
	`56`	`+#endif /* defined(DEBUG_NRF) \|\| defined(DEBUG_NRF_USER) */`
	`57`	`+#endif // !MBED_CONF_BLE_PRESENT`