From d20ca05a68c86b0fc9ee9e08169b27909d8c04df Mon Sep 17 00:00:00 2001
From: Desmond Chen <desmond.chen@arm.com>
Date: Fri, 14 Dec 2018 09:22:49 -0600
Subject: [PATCH] Fix SoftDevice configuration on NRF52_DK

---
 .../TARGET_SOFTDEVICE_S132_FULL/headers/nrf_nvic.h          | 1 +
 .../TARGET_SOFTDEVICE_S132_FULL/mbed_lib.json               | 6 +++---
 targets/targets.json                                        | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/headers/nrf_nvic.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/headers/nrf_nvic.h
index f5c7e8e028..c71a633c6b 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/headers/nrf_nvic.h
+++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/headers/nrf_nvic.h
@@ -312,6 +312,7 @@ __STATIC_INLINE uint32_t __sd_nvic_is_app_accessible_priority(uint32_t priority)
   if(   priority == 0
      || priority == 1
      || priority == 4
+     || priority == 5
      )
   {
     return 0;
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/mbed_lib.json b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/mbed_lib.json
index ff7d2eb228..c06a9ad5d6 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/mbed_lib.json
+++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S132_FULL/mbed_lib.json
@@ -5,7 +5,7 @@
         "S132",
         "BLE_STACK_SUPPORT_REQD",
         "NRF_SDH_CLOCK_LF_XTAL_ACCURACY=7",
-        "NRF_SD_BLE_API_VERSION=5",
+        "NRF_SD_BLE_API_VERSION=6",
         "NRF_SDH_ENABLED=1",
         "NRF_SDH_BLE_ENABLED=1",
         "PEER_MANAGER_ENABLED=1",
@@ -35,8 +35,8 @@
         "*": {
             "target.bootloader_img": "hex/s132_nrf52_6.0.0_softdevice.hex",
             "target.app_offset": "0x26000",
-            "target.mbed_ram_start": "0x20001D70",
-            "target.mbed_ram_size": "0xE290"
+            "target.mbed_ram_start": "0x200032E8",
+            "target.mbed_ram_size": "0xCD18"
         }
     }
 }
diff --git a/targets/targets.json b/targets/targets.json
index b6934dbb4b..863cf3fb61 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -7060,6 +7060,7 @@
             "NRF5x",
             "NRF52",
             "SDK_15_0",
+            "NORDIC_SOFTDEVICE",
             "SOFTDEVICE_COMMON",
             "SOFTDEVICE_S132_FULL"
         ],