Fix inconsistent SWI configuration in NRF52 series

All SWI channels except SWI0 is being used by the SoftDevice and not only SWI1.
pan- · Jul 9, 2018 · 4f913b9 · 4f913b9
1 parent bd849c5
commit 4f913b9
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/config/sdk_config.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/config/sdk_config.h
@@ -1795,7 +1795,7 @@
 
 
 #ifndef EGU_ENABLED
-#define EGU_ENABLED 0
+#define EGU_ENABLED 1
 #endif
 
 // <e> GPIOTE_ENABLED - nrf_drv_gpiote - GPIOTE peripheral driver

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/config/sdk_config.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/config/sdk_config.h
@@ -1795,7 +1795,7 @@
 
 
 #ifndef EGU_ENABLED
-#define EGU_ENABLED 0
+#define EGU_ENABLED 1
 #endif
 
 // <e> GPIOTE_ENABLED - nrf_drv_gpiote - GPIOTE peripheral driver

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S132_FULL/mbed_lib.json b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S132_FULL/mbed_lib.json
@@ -28,7 +28,11 @@
         "NRF_SDH_BLE_STACK_OBSERVER_PRIO=0",
         "NRF_SDH_SOC_STACK_OBSERVER_PRIO=0",
         "FDS_BACKEND=2",
-        "SWI_DISABLE1=1"
+        "SWI_DISABLE1",
+        "SWI_DISABLE2",
+        "SWI_DISABLE3",
+        "SWI_DISABLE4",
+        "SWI_DISABLE5"
     ],
     "target_overrides": {
         "*": {

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S132_OTA/mbed_lib.json b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S132_OTA/mbed_lib.json
@@ -12,13 +12,7 @@
         "NRF_SDH_ENABLED=1",
         "NRF_SDH_BLE_ENABLED=1",
         "PEER_MANAGER_ENABLED=1",
-        "NRF_SDH_BLE_PERIPHERAL_LINK_COUNT=3",
-        "NRF_SDH_BLE_CENTRAL_LINK_COUNT=1",
-        "NRF_SDH_BLE_TOTAL_LINK_COUNT=4",
-        "NRF_SDH_BLE_SERVICE_CHANGED=1",
         "NRF_SDH_BLE_GATT_MAX_MTU_SIZE=23",
-        "NRF_SDH_BLE_GATTS_ATTR_TAB_SIZE=0x600",
-        "NRF_SDH_BLE_VS_UUID_COUNT=4",
         "NRF_SDH_BLE_OBSERVER_PRIO_LEVELS=4",
         "NRF_SDH_BLE_GAP_EVENT_LENGTH=3",
         "BLE_ADV_BLE_OBSERVER_PRIO=1",
@@ -34,7 +28,11 @@
         "NRF_SDH_BLE_STACK_OBSERVER_PRIO=0",
         "NRF_SDH_SOC_STACK_OBSERVER_PRIO=0",
         "FDS_BACKEND=2",
-        "SWI_DISABLE1=1"
+        "SWI_DISABLE1",
+        "SWI_DISABLE2",
+        "SWI_DISABLE3",
+        "SWI_DISABLE4",
+        "SWI_DISABLE5"
     ],
     "target_overrides": {
         "*": {

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S140_FULL/mbed_lib.json b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S140_FULL/mbed_lib.json
@@ -28,7 +28,11 @@
         "NRF_SDH_BLE_STACK_OBSERVER_PRIO=0",
         "NRF_SDH_SOC_STACK_OBSERVER_PRIO=0",
         "FDS_BACKEND=2",
-        "SWI_DISABLE1=1"
+        "SWI_DISABLE1",
+        "SWI_DISABLE2",
+        "SWI_DISABLE3",
+        "SWI_DISABLE4",
+        "SWI_DISABLE5"
     ],
     "target_overrides": {
         "*": {

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S140_OTA/mbed_lib.json b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/TARGET_SOFTDEVICE_S140_OTA/mbed_lib.json
@@ -12,13 +12,7 @@
         "NRF_SDH_ENABLED=1",
         "NRF_SDH_BLE_ENABLED=1",
         "PEER_MANAGER_ENABLED=1",
-        "NRF_SDH_BLE_PERIPHERAL_LINK_COUNT=3",
-        "NRF_SDH_BLE_CENTRAL_LINK_COUNT=1",
-        "NRF_SDH_BLE_TOTAL_LINK_COUNT=4",
-        "NRF_SDH_BLE_SERVICE_CHANGED=1",
         "NRF_SDH_BLE_GATT_MAX_MTU_SIZE=23",
-        "NRF_SDH_BLE_GATTS_ATTR_TAB_SIZE=0x600",
-        "NRF_SDH_BLE_VS_UUID_COUNT=4",
         "NRF_SDH_BLE_OBSERVER_PRIO_LEVELS=4",
         "NRF_SDH_BLE_GAP_EVENT_LENGTH=3",
         "BLE_ADV_BLE_OBSERVER_PRIO=1",
@@ -34,7 +28,11 @@
         "NRF_SDH_BLE_STACK_OBSERVER_PRIO=0",
         "NRF_SDH_SOC_STACK_OBSERVER_PRIO=0",
         "FDS_BACKEND=2",
-        "SWI_DISABLE1=1"
+        "SWI_DISABLE1",
+        "SWI_DISABLE2",
+        "SWI_DISABLE3",
+        "SWI_DISABLE4",
+        "SWI_DISABLE5"
     ],
     "target_overrides": {
         "*": {