mirror of https://github.com/ARMmbed/mbed-os.git
Merge pull request #12154 from hugueskamba/hk-baremetal-nrf51822-fix
NRF51822: Fix baremetal linker errorpull/12324/head
commit
0d48a26f82
|
@ -13,6 +13,8 @@
|
|||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#if DEVICE_USTICKER
|
||||
#include <stddef.h>
|
||||
#include <stdbool.h>
|
||||
#include "us_ticker_api.h"
|
||||
|
@ -613,3 +615,4 @@ uint32_t os_tick_val(void) {
|
|||
return clock_cycles_by_tick - ((current_counter - next_tick_cc_value) % clock_cycles_by_tick);
|
||||
}
|
||||
}
|
||||
#endif // DEVICE_USTICKER
|
||||
|
|
|
@ -7223,8 +7223,13 @@
|
|||
"SERIAL",
|
||||
"SLEEP",
|
||||
"SPI",
|
||||
"SPISLAVE"
|
||||
]
|
||||
"SPISLAVE",
|
||||
"USTICKER"
|
||||
],
|
||||
"overrides": {
|
||||
"tickless-from-us-ticker" : true,
|
||||
"boot-stack-size" : "0x400"
|
||||
}
|
||||
},
|
||||
"MCU_NRF51_16K_BASE": {
|
||||
"inherits": [
|
||||
|
|
Loading…
Reference in New Issue