SDK15: Writing to flash now works

Author: gfwilliams

ChangeLog

@@ -13,6 +13,7 @@
             Graphics.asBMP now takes account of bitmap rotation (fix #1672)
             Raspberry pi pin numbering the same if using wiringPi or filesystem GPIO (fix #1673)
             nRF52: Peer manager init errors from Nordic libs now not fatal 
+            SDK15: Writing to flash now works
 
      2v03 : nRF5x: Fix issue when calling NRF.setAdvertising while connected via BLE (fix #1659)
             nRF5x: 'dump()' not outputs `NRF.setSecurity` line if it has been called.

make/common/NRF5X.make

@@ -186,6 +186,7 @@ else
 TARGETSOURCES += \
 $(NRF5X_SDK_PATH)/components/softdevice/common/nrf_sdh.c \
 $(NRF5X_SDK_PATH)/components/softdevice/common/nrf_sdh_ble.c \
+$(NRF5X_SDK_PATH)/components/softdevice/common/nrf_sdh_soc.c \
 $(NRF5X_SDK_PATH)/components/libraries/experimental_section_vars/nrf_section_iter.c \
 $(NRF5X_SDK_PATH)/components/libraries/fstorage/nrf_fstorage.c \
 $(NRF5X_SDK_PATH)/components/libraries/fstorage/nrf_fstorage_sd.c \

targets/nrf5x/bluetooth.c

@@ -2151,7 +2151,7 @@ static void ble_stack_init() {
     APP_ERROR_CHECK(err_code);
 
 
-#else
+#else // NRF_SD_BLE_API_VERSION>=5
     ret_code_t err_code;
 
     err_code = nrf_sdh_enable_request();