sam: remove redundant build tags

aykevl · deadprogram · commit 3f680b75f376 · 2020-11-15T16:19:51.000+01:00
Some build tags were duplicated. This commit removes them.
diff --git a/targets/arduino-nano33.json b/targets/arduino-nano33.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd21g18a"],
-    "build-tags": ["sam", "atsamd21g18a", "arduino_nano33"],
+    "build-tags": ["arduino_nano33"],
     "flash-command": "bossac -i -e -w -v -R -U --port={port} --offset=0x2000 {bin}",
     "flash-1200-bps-reset": "true"
 }
diff --git a/targets/arduino-zero.json b/targets/arduino-zero.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd21g18a"],
-    "build-tags": ["sam", "atsamd21g18a", "arduino_zero"],
+    "build-tags": ["arduino_zero"],
     "flash-command": "bossac -i -e -w -v -R -U --port={port} --offset=0x2000 {bin}",
     "flash-1200-bps-reset": "true"
 }
diff --git a/targets/atsamd21e18a.json b/targets/atsamd21e18a.json
@@ -1,7 +1,7 @@
 {
 	"inherits": ["cortex-m"],
 	"llvm-target": "armv6m-none-eabi",
-	"build-tags": ["atsamd21e18", "atsamd21", "sam"],
+	"build-tags": ["atsamd21e18a", "atsamd21e18", "atsamd21", "sam"],
 	"cflags": [
 		"--target=armv6m-none-eabi",
 		"-Qunused-arguments"
diff --git a/targets/atsamd21g18a.json b/targets/atsamd21g18a.json
@@ -1,7 +1,7 @@
 {
 	"inherits": ["cortex-m"],
 	"llvm-target": "armv6m-none-eabi",
-	"build-tags": ["atsamd21g18", "atsamd21", "sam"],
+	"build-tags": ["atsamd21g18a", "atsamd21g18", "atsamd21", "sam"],
 	"cflags": [
 		"--target=armv6m-none-eabi",
 		"-Qunused-arguments"
diff --git a/targets/atsamd51g19a.json b/targets/atsamd51g19a.json
@@ -1,6 +1,6 @@
 {
 	"inherits": ["cortex-m4"],
-	"build-tags": ["atsamd51g19", "atsamd51", "sam"],
+	"build-tags": ["atsamd51g19a", "atsamd51g19", "atsamd51", "sam"],
 	"cflags": [
 		"-Qunused-arguments"
 	],
diff --git a/targets/atsamd51j19a.json b/targets/atsamd51j19a.json
@@ -1,6 +1,6 @@
 {
 	"inherits": ["cortex-m4"],
-	"build-tags": ["atsamd51j19", "atsamd51", "sam"],
+	"build-tags": ["atsamd51j19a", "atsamd51j19", "atsamd51", "sam"],
 	"cflags": [
 		"-Qunused-arguments"
 	],
diff --git a/targets/atsamd51p19a.json b/targets/atsamd51p19a.json
@@ -1,6 +1,6 @@
 {
 	"inherits": ["cortex-m4"],
-	"build-tags": ["atsamd51p19", "atsamd51", "sam"],
+	"build-tags": ["atsamd51p19a", "atsamd51p19", "atsamd51", "sam"],
 	"cflags": [
 		"-Qunused-arguments"
 	],
diff --git a/targets/circuitplay-express.json b/targets/circuitplay-express.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd21g18a"],
-    "build-tags": ["sam", "atsamd21g18a", "circuitplay_express"],
+    "build-tags": ["circuitplay_express"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "CPLAYBOOT",
diff --git a/targets/feather-m0.json b/targets/feather-m0.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd21g18a"],
-    "build-tags": ["sam", "atsamd21g18a", "feather_m0"],
+    "build-tags": ["feather_m0"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "FEATHERBOOT",
diff --git a/targets/feather-m4.json b/targets/feather-m4.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd51j19a"],
-    "build-tags": ["sam", "atsamd51j19a", "feather_m4"],
+    "build-tags": ["feather_m4"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "FEATHERBOOT",
diff --git a/targets/itsybitsy-m0.json b/targets/itsybitsy-m0.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd21g18a"],
-    "build-tags": ["sam", "atsamd21g18a", "itsybitsy_m0"],
+    "build-tags": ["itsybitsy_m0"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "ITSYBOOT",
diff --git a/targets/itsybitsy-m4.json b/targets/itsybitsy-m4.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd51g19a"],
-    "build-tags": ["sam", "atsamd51g19a", "itsybitsy_m4"],
+    "build-tags": ["itsybitsy_m4"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "ITSYM4BOOT",
diff --git a/targets/metro-m4-airlift.json b/targets/metro-m4-airlift.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd51j19a"],
-    "build-tags": ["sam", "atsamd51j19a", "metro_m4_airlift"],
+    "build-tags": ["metro_m4_airlift"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "METROM4BOOT",
diff --git a/targets/pybadge.json b/targets/pybadge.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd51j19a"],
-    "build-tags": ["sam", "atsamd51j19a", "pybadge"],
+    "build-tags": ["pybadge"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "PYBADGEBOOT",
diff --git a/targets/pygamer.json b/targets/pygamer.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd51j19a"],
-    "build-tags": ["sam", "atsamd51j19a", "pygamer"],
+    "build-tags": ["pygamer"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "PYGAMERBOOT",
diff --git a/targets/qtpy.json b/targets/qtpy.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd21e18a"],
-    "build-tags": ["sam", "atsamd21e18a", "qtpy"],
+    "build-tags": ["qtpy"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "QTPYBOOT",
diff --git a/targets/trinket-m0.json b/targets/trinket-m0.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd21e18a"],
-    "build-tags": ["sam", "atsamd21e18a", "trinket_m0"],
+    "build-tags": ["trinket_m0"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "TRINKETBOOT",
diff --git a/targets/wioterminal.json b/targets/wioterminal.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd51p19a"],
-    "build-tags": ["sam", "atsamd51p19a", "wioterminal"],
+    "build-tags": ["wioterminal"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "Arduino",
diff --git a/targets/xiao.json b/targets/xiao.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd21g18a"],
-    "build-tags": ["sam", "atsamd21g18a", "xiao"],
+    "build-tags": ["xiao"],
     "flash-1200-bps-reset": "true",
     "flash-method": "msd",
     "msd-volume-name": "Arduino",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"inherits": ["atsamd21g18a"],`
`3`		`- "build-tags": ["sam", "atsamd21g18a", "arduino_nano33"],`
	`3`	`+ "build-tags": ["arduino_nano33"],`
`4`	`4`	`"flash-command": "bossac -i -e -w -v -R -U --port={port} --offset=0x2000 {bin}",`
`5`	`5`	`"flash-1200-bps-reset": "true"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"inherits": ["cortex-m"],`
`3`	`3`	`"llvm-target": "armv6m-none-eabi",`
`4`		`- "build-tags": ["atsamd21e18", "atsamd21", "sam"],`
	`4`	`+ "build-tags": ["atsamd21e18a", "atsamd21e18", "atsamd21", "sam"],`
`5`	`5`	`"cflags": [`
`6`	`6`	`"--target=armv6m-none-eabi",`
`7`	`7`	`"-Qunused-arguments"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"inherits": ["cortex-m4"],`
`3`		`- "build-tags": ["atsamd51g19", "atsamd51", "sam"],`
	`3`	`+ "build-tags": ["atsamd51g19a", "atsamd51g19", "atsamd51", "sam"],`
`4`	`4`	`"cflags": [`
`5`	`5`	`"-Qunused-arguments"`
`6`	`6`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"inherits": ["cortex-m4"],`
`3`		`- "build-tags": ["atsamd51j19", "atsamd51", "sam"],`
	`3`	`+ "build-tags": ["atsamd51j19a", "atsamd51j19", "atsamd51", "sam"],`
`4`	`4`	`"cflags": [`
`5`	`5`	`"-Qunused-arguments"`
`6`	`6`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"inherits": ["cortex-m4"],`
`3`		`- "build-tags": ["atsamd51p19", "atsamd51", "sam"],`
	`3`	`+ "build-tags": ["atsamd51p19a", "atsamd51p19", "atsamd51", "sam"],`
`4`	`4`	`"cflags": [`
`5`	`5`	`"-Qunused-arguments"`
`6`	`6`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"inherits": ["atsamd51j19a"],`
`3`		`- "build-tags": ["sam", "atsamd51j19a", "feather_m4"],`
	`3`	`+ "build-tags": ["feather_m4"],`
`4`	`4`	`"flash-1200-bps-reset": "true",`
`5`	`5`	`"flash-method": "msd",`
`6`	`6`	`"msd-volume-name": "FEATHERBOOT",`