From 3cedebd2990a645222b5aa8493f7ad8b9e671a87 Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Sat, 16 Nov 2019 18:03:40 +0100 Subject: [PATCH] nrf: fix nrf52-s132v6 config In my excitement to get the SoftDevice PR ready, I made two mistakes. They're fixed in this commit. * Add the `s132v6` build tag. * Remove the (old) `ldscript` property. This fixes the following issue: https://github.com/aykevl/go-bluetooth/issues/1 --- targets/nrf52-s132v6.json | 2 +- targets/pca10040-s132v6.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/targets/nrf52-s132v6.json b/targets/nrf52-s132v6.json index 476b9f69..3d11e226 100644 --- a/targets/nrf52-s132v6.json +++ b/targets/nrf52-s132v6.json @@ -1,4 +1,4 @@ { - "build-tags": ["softdevice"], + "build-tags": ["softdevice", "s132v6"], "linkerscript": "targets/nrf52-s132v6.ld" } diff --git a/targets/pca10040-s132v6.json b/targets/pca10040-s132v6.json index d8342546..3b03bb1b 100644 --- a/targets/pca10040-s132v6.json +++ b/targets/pca10040-s132v6.json @@ -1,4 +1,3 @@ { - "inherits": ["pca10040", "nrf52-s132v6"], - "ldscript": "targets/nrf52-s132v6.ld" + "inherits": ["pca10040", "nrf52-s132v6"] }