From 6af843fcebd19e86449da47080ded8d699ab0024 Mon Sep 17 00:00:00 2001 From: Marcus Chang Date: Sun, 13 May 2018 22:31:17 -0700 Subject: [PATCH] Trim white space and clean up NRF52 configuration files Removed unused and duplicate macros. --- .../TARGET_SOFTDEVICE_S132/mbed_lib.json | 9 +++------ .../TARGET_SOFTDEVICE_S140/mbed_lib.json | 11 +++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S132/mbed_lib.json b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S132/mbed_lib.json index 55ecb9abc4..158c66c33f 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S132/mbed_lib.json +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S132/mbed_lib.json @@ -1,11 +1,9 @@ { "name": "softdevice", - "config": { - }, "macros": [ "SOFTDEVICE_PRESENT=1", - "S132", - "BLE_STACK_SUPPORT_REQD", + "S132", + "BLE_STACK_SUPPORT_REQD", "NRF_SDH_CLOCK_LF_SRC=1", "NRF_SDH_CLOCK_LF_RC_CTIV=0", "NRF_SDH_CLOCK_LF_RC_TEMP_CTIV=0", @@ -36,8 +34,7 @@ "NRF_SDH_BLE_STACK_OBSERVER_PRIO=0", "NRF_SDH_SOC_STACK_OBSERVER_PRIO=0", "FDS_BACKEND=2", - "SWI_DISABLE1=1", - "NRF_LOG_ENABLED=0" + "SWI_DISABLE1=1" ], "target_overrides": { "*": { diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S140/mbed_lib.json b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S140/mbed_lib.json index f72a514443..838a47704b 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S140/mbed_lib.json +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S140/mbed_lib.json @@ -1,14 +1,14 @@ { "name": "softdevice", "macros": [ - "SOFTDEVICE_PRESENT=1", + "SOFTDEVICE_PRESENT=1", + "S140", + "BLE_STACK_SUPPORT_REQD", "NRF_SDH_CLOCK_LF_SRC=1", "NRF_SDH_CLOCK_LF_RC_CTIV=0", "NRF_SDH_CLOCK_LF_RC_TEMP_CTIV=0", "NRF_SDH_CLOCK_LF_XTAL_ACCURACY=7", - "BLE_STACK_SUPPORT_REQD", - "NRF_SD_BLE_API_VERSION=5", - "S140", + "NRF_SD_BLE_API_VERSION=5", "NRF_SDH_ENABLED=1", "NRF_SDH_BLE_ENABLED=1", "PEER_MANAGER_ENABLED=1", @@ -34,8 +34,7 @@ "NRF_SDH_BLE_STACK_OBSERVER_PRIO=0", "NRF_SDH_SOC_STACK_OBSERVER_PRIO=0", "FDS_BACKEND=2", - "SWI_DISABLE1=1", - "S140" + "SWI_DISABLE1=1" ], "target_overrides": { "*": {