Trim white space and clean up NRF52 configuration files

Removed unused and duplicate macros.
pull/6869/head
Marcus Chang 2018-05-13 22:31:17 -07:00
parent 2104d8ab5b
commit 6af843fceb
2 changed files with 8 additions and 12 deletions

View File

@ -1,7 +1,5 @@
{ {
"name": "softdevice", "name": "softdevice",
"config": {
},
"macros": [ "macros": [
"SOFTDEVICE_PRESENT=1", "SOFTDEVICE_PRESENT=1",
"S132", "S132",
@ -36,8 +34,7 @@
"NRF_SDH_BLE_STACK_OBSERVER_PRIO=0", "NRF_SDH_BLE_STACK_OBSERVER_PRIO=0",
"NRF_SDH_SOC_STACK_OBSERVER_PRIO=0", "NRF_SDH_SOC_STACK_OBSERVER_PRIO=0",
"FDS_BACKEND=2", "FDS_BACKEND=2",
"SWI_DISABLE1=1", "SWI_DISABLE1=1"
"NRF_LOG_ENABLED=0"
], ],
"target_overrides": { "target_overrides": {
"*": { "*": {

View File

@ -2,13 +2,13 @@
"name": "softdevice", "name": "softdevice",
"macros": [ "macros": [
"SOFTDEVICE_PRESENT=1", "SOFTDEVICE_PRESENT=1",
"S140",
"BLE_STACK_SUPPORT_REQD",
"NRF_SDH_CLOCK_LF_SRC=1", "NRF_SDH_CLOCK_LF_SRC=1",
"NRF_SDH_CLOCK_LF_RC_CTIV=0", "NRF_SDH_CLOCK_LF_RC_CTIV=0",
"NRF_SDH_CLOCK_LF_RC_TEMP_CTIV=0", "NRF_SDH_CLOCK_LF_RC_TEMP_CTIV=0",
"NRF_SDH_CLOCK_LF_XTAL_ACCURACY=7", "NRF_SDH_CLOCK_LF_XTAL_ACCURACY=7",
"BLE_STACK_SUPPORT_REQD",
"NRF_SD_BLE_API_VERSION=5", "NRF_SD_BLE_API_VERSION=5",
"S140",
"NRF_SDH_ENABLED=1", "NRF_SDH_ENABLED=1",
"NRF_SDH_BLE_ENABLED=1", "NRF_SDH_BLE_ENABLED=1",
"PEER_MANAGER_ENABLED=1", "PEER_MANAGER_ENABLED=1",
@ -34,8 +34,7 @@
"NRF_SDH_BLE_STACK_OBSERVER_PRIO=0", "NRF_SDH_BLE_STACK_OBSERVER_PRIO=0",
"NRF_SDH_SOC_STACK_OBSERVER_PRIO=0", "NRF_SDH_SOC_STACK_OBSERVER_PRIO=0",
"FDS_BACKEND=2", "FDS_BACKEND=2",
"SWI_DISABLE1=1", "SWI_DISABLE1=1"
"S140"
], ],
"target_overrides": { "target_overrides": {
"*": { "*": {