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

Make sure LPTICKER symbols are not used for builds without it for Nordic

pull/7009/head
Bartek Szatkowski 2018-03-20 10:15:03 +00:00
parent 2d11b05756
commit 2d19ac1d60
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/flash_api.c
View File

@ -36,7 +36,7 @@
* *
*/ */
#if DEVICE_FLASH #if (defined(DEVICE_FLASH) && defined(DEVICE_LPTICKER))
#include "hal/flash_api.h" #include "hal/flash_api.h"
#include "hal/lp_ticker_api.h" #include "hal/lp_ticker_api.h"

2
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/trng_api.c
View File

@ -36,7 +36,7 @@
* *
*/ */
#if defined(DEVICE_TRNG) #if (defined(DEVICE_TRNG) && defined(DEVICE_LPTICKER))
#include "hal/trng_api.h" #include "hal/trng_api.h"
#include "hal/lp_ticker_api.h" #include "hal/lp_ticker_api.h"

4
targets/targets.json
View File

@ -3511,8 +3511,7 @@
"TARGET_MCU_NRF51822", "TARGET_MCU_NRF51822",
"CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL",
"CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"",
"NO_SYSTICK", "NO_SYSTICK"
"MBED_TICKLESS"
], ],
"MERGE_BOOTLOADER": false, "MERGE_BOOTLOADER": false,
"extra_labels": [ "extra_labels": [
@ -3598,7 +3597,6 @@
"I2C_ASYNCH", "I2C_ASYNCH",
"INTERRUPTIN", "INTERRUPTIN",
"ITM", "ITM",
"LOWPOWERTIMER",
"PORTIN", "PORTIN",
"PORTINOUT", "PORTINOUT",
"PORTOUT", "PORTOUT",