From 2d19ac1d609fc991cc3ce17fcf3fc1dc66cfa2a7 Mon Sep 17 00:00:00 2001
From: Bartek Szatkowski <bulislaw@linux.com>
Date: Tue, 20 Mar 2018 10:15:03 +0000
Subject: [PATCH] Make sure LPTICKER symbols are not used for builds without it
 for Nordic

---
 targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/flash_api.c | 2 +-
 targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/trng_api.c  | 2 +-
 targets/targets.json                                        | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/flash_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/flash_api.c
index be592b8b36..032dfd2ae1 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/flash_api.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/flash_api.c
@@ -36,7 +36,7 @@
  *
  */
 
-#if DEVICE_FLASH
+#if (defined(DEVICE_FLASH) && defined(DEVICE_LPTICKER))
 
 #include "hal/flash_api.h"
 #include "hal/lp_ticker_api.h"
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/trng_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/trng_api.c
index 532f18fd6d..7837eb4cb8 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/trng_api.c
+++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/trng_api.c
@@ -36,7 +36,7 @@
  *
  */
 
-#if defined(DEVICE_TRNG)
+#if (defined(DEVICE_TRNG) && defined(DEVICE_LPTICKER))
 
 #include "hal/trng_api.h"
 #include "hal/lp_ticker_api.h"
diff --git a/targets/targets.json b/targets/targets.json
index 87b55f0caa..76d11f20ca 100755
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -3511,8 +3511,7 @@
             "TARGET_MCU_NRF51822",
             "CMSIS_VECTAB_VIRTUAL",
             "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"",
-            "NO_SYSTICK",
-            "MBED_TICKLESS"
+            "NO_SYSTICK"
         ],
         "MERGE_BOOTLOADER": false,
         "extra_labels": [
@@ -3598,7 +3597,6 @@
             "I2C_ASYNCH",
             "INTERRUPTIN",
             "ITM",
-            "LOWPOWERTIMER",
             "PORTIN",
             "PORTINOUT",
             "PORTOUT",