nrf: fix nrf52-s132v6 config

aykevl · deadprogram · commit 3cedebd2990a · 2019-11-16T21:57:18.000+01:00
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: tinygo-org/bluetooth#1
diff --git 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
@@ -1,4 +1,3 @@
 {
-	"inherits": ["pca10040", "nrf52-s132v6"],
-	"ldscript": "targets/nrf52-s132v6.ld"
+	"inherits": ["pca10040", "nrf52-s132v6"]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "build-tags": ["softdevice"],`
	`2`	`+ "build-tags": ["softdevice", "s132v6"],`
`3`	`3`	`"linkerscript": "targets/nrf52-s132v6.ld"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`{`
`2`		`- "inherits": ["pca10040", "nrf52-s132v6"],`
`3`		`- "ldscript": "targets/nrf52-s132v6.ld"`
	`2`	`+ "inherits": ["pca10040", "nrf52-s132v6"]`
`4`	`3`	`}`