From 47a975a44f6af0628d384534c7724a9a9e76f4cb Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Sat, 29 Aug 2020 22:58:08 +0200
Subject: [PATCH] nrf: add SoftDevice support for the Circuit Playground
 Bluefruit

This also fixes a bug: the Bluefruit doesn't have a low frequency
crystal. Somehow non-SoftDevice code still worked. However, the
SoftDevice won't initialize when this flag is set incorrectly.
---
 src/machine/board_circuitplay_bluefruit.go | 2 +-
 targets/circuitplay-bluefruit.json         | 2 +-
 targets/circuitplay-bluefruit.ld           | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/machine/board_circuitplay_bluefruit.go b/src/machine/board_circuitplay_bluefruit.go
index 91adbd7b..cb56ed34 100644
--- a/src/machine/board_circuitplay_bluefruit.go
+++ b/src/machine/board_circuitplay_bluefruit.go
@@ -2,7 +2,7 @@
 
 package machine
 
-const HasLowFrequencyCrystal = true
+const HasLowFrequencyCrystal = false
 
 // GPIO Pins
 const (
diff --git a/targets/circuitplay-bluefruit.json b/targets/circuitplay-bluefruit.json
index 2e94730d..6a57e1da 100644
--- a/targets/circuitplay-bluefruit.json
+++ b/targets/circuitplay-bluefruit.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["nrf52840"],
-    "build-tags": ["circuitplay_bluefruit","nrf52840_reset_uf2"],
+    "build-tags": ["circuitplay_bluefruit","nrf52840_reset_uf2", "softdevice", "s140v6"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "CPLAYBTBOOT",
diff --git a/targets/circuitplay-bluefruit.ld b/targets/circuitplay-bluefruit.ld
index a5befb8c..19b4c22e 100644
--- a/targets/circuitplay-bluefruit.ld
+++ b/targets/circuitplay-bluefruit.ld
@@ -7,4 +7,7 @@ MEMORY
 
 _stack_size = 2K;
 
+/* This value is needed by the Nordic SoftDevice. */
+__app_ram_base = ORIGIN(RAM);
+
 INCLUDE "targets/arm.ld"