Move architecture specific macro to build script // Resolve #118

platformio · Jun 17, 2020 · 7b7adba · 7b7adba
1 parent 1d24309
commit 7b7adba
Show file tree

Hide file tree

Showing 67 changed files with 56 additions and 65 deletions.
diff --git a/boards/adafruit_circuitplayground_m0.json b/boards/adafruit_circuitplayground_m0.json
@@ -5,7 +5,7 @@
     },
     "core": "adafruit",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-D__SAMD21G18A__ -DCRYSTALLESS -DARM_MATH_CM0PLUS -DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DADAFRUIT_CIRCUITPLAYGROUND_M0 -DARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS",
+    "extra_flags": "-D__SAMD21G18A__ -DCRYSTALLESS -DARM_MATH_CM0PLUS -DARDUINO_SAMD_ZERO -DADAFRUIT_CIRCUITPLAYGROUND_M0 -DARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/adafruit_crickit_m0.json b/boards/adafruit_crickit_m0.json
@@ -5,7 +5,7 @@
     },
     "core": "adafruit",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_CRICKIT_M0 -DADAFRUIT_CRICKIT_M0 -DARM_MATH_CM0PLUS -D__SAMD21G18A__ -DCRYSTALLESS",
+    "extra_flags": "-DARDUINO_SAMD_CRICKIT_M0 -DADAFRUIT_CRICKIT_M0 -DARM_MATH_CM0PLUS -D__SAMD21G18A__ -DCRYSTALLESS",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/adafruit_feather_m0.json b/boards/adafruit_feather_m0.json
@@ -5,7 +5,7 @@
     },
     "core": "adafruit",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARM_MATH_CM0PLUS -D__SAMD21G18A__",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARM_MATH_CM0PLUS -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/adafruit_feather_m0_express.json b/boards/adafruit_feather_m0_express.json
@@ -5,7 +5,7 @@
     },
     "core": "adafruit",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARDUINO_SAMD_FEATHER_M0_EXPRESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARDUINO_SAMD_FEATHER_M0_EXPRESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/adafruit_feather_m4.json b/boards/adafruit_feather_m4.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_FEATHER_M4",
       "-DADAFRUIT_FEATHER_M4_EXPRESS",
       "-D__SAMD51J19A__",

diff --git a/boards/adafruit_gemma_m0.json b/boards/adafruit_gemma_m0.json
@@ -5,7 +5,7 @@
     },
     "core": "adafruit",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_GEMMA_M0 -DARM_MATH_CM0PLUS -DCRYSTALLESS -DADAFRUIT_GEMMA_M0 -D__SAMD21E18A__",
+    "extra_flags": "-DARDUINO_GEMMA_M0 -DARM_MATH_CM0PLUS -DCRYSTALLESS -DADAFRUIT_GEMMA_M0 -D__SAMD21E18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/adafruit_grandcentral_m4.json b/boards/adafruit_grandcentral_m4.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_GRAND_CENTRAL_M4",
       "-DADAFRUIT_GRAND_CENTRAL_M4",
       "-D__SAMD51P20A__",

diff --git a/boards/adafruit_hallowing.json b/boards/adafruit_hallowing.json
@@ -5,7 +5,7 @@
     },
     "core": "adafruit",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-D__SAMD21G18A__ -DCRYSTALLESS -DARM_MATH_CM0PLUS -DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DADAFRUIT_SAMD_HALLOWING",
+    "extra_flags": "-D__SAMD21G18A__ -DCRYSTALLESS -DARM_MATH_CM0PLUS -DARDUINO_SAMD_ZERO -DADAFRUIT_SAMD_HALLOWING",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/adafruit_hallowing_m4.json b/boards/adafruit_hallowing_m4.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_HALLOWING_M4",
       "-DADAFRUIT_HALLOWING_M4_EXPRESS",
       "-D__SAMD51J19A__",

diff --git a/boards/adafruit_itsybitsy_m0.json b/boards/adafruit_itsybitsy_m0.json
@@ -5,7 +5,7 @@
     },
     "core": "adafruit",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_ITSYBITSY_M0 -DADAFRUIT_ITSYBITSY_M0 -DCRYSTALLESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__",
+    "extra_flags": "-DARDUINO_ITSYBITSY_M0 -DADAFRUIT_ITSYBITSY_M0 -DCRYSTALLESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/adafruit_itsybitsy_m4.json b/boards/adafruit_itsybitsy_m4.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_ITSYBITSY_M4",
       "-DADAFRUIT_ITSYBITSY_M4_EXPRESS",
       "-D__SAMD51G19A__",

diff --git a/boards/adafruit_metro_m0.json b/boards/adafruit_metro_m0.json
@@ -5,7 +5,7 @@
     },
     "core": "adafruit",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DDADAFRUIT_METRO_M0_EXPRESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -DDADAFRUIT_METRO_M0_EXPRESS -DARM_MATH_CM0PLUS -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/adafruit_metro_m4.json b/boards/adafruit_metro_m4.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_METRO_M4",
       "-DADAFRUIT_METRO_M4_EXPRESS",
       "-D__SAMD51J19A__",

diff --git a/boards/adafruit_metro_m4_airliftlite.json b/boards/adafruit_metro_m4_airliftlite.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_METRO_M4_AIRLIFT_LITE",
       "-DADAFRUIT_METRO_M4_AIRLIFT_LITE",
       "-D__SAMD51J19A__",

diff --git a/boards/adafruit_monster_m4sk.json b/boards/adafruit_monster_m4sk.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_MONSTER_M4SK",
       "-DADAFRUIT_MONSTER_M4SK_EXPRESS",
       "-D__SAMD51G19A__",

diff --git a/boards/adafruit_pirkey.json b/boards/adafruit_pirkey.json
@@ -5,7 +5,7 @@
     },
     "core": "adafruit",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_PIRKEY -DARM_MATH_CM0PLUS -DCRYSTALLESS -DADAFRUIT_PIRKEY -D__SAMD21E18A__",
+    "extra_flags": "-DARDUINO_PIRKEY -DARM_MATH_CM0PLUS -DCRYSTALLESS -DADAFRUIT_PIRKEY -D__SAMD21E18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/adafruit_pybadge_airlift_m4.json b/boards/adafruit_pybadge_airlift_m4.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_PYBADGE_AIRLIFT_M4",
       "-DADAFRUIT_PYBADGE_AIRLIFT_M4",
       "-D__SAMD51J20A__",

diff --git a/boards/adafruit_pybadge_m4.json b/boards/adafruit_pybadge_m4.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_PYBADGE_M4",
       "-DADAFRUIT_PYBADGE_M4_EXPRESS",
       "-D__SAMD51J19A__",

diff --git a/boards/adafruit_pygamer_advance_m4.json b/boards/adafruit_pygamer_advance_m4.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_PYGAMER_ADVANCE_M4",
       "-DADAFRUIT_PYGAMER_ADVANCE_M4_EXPRESS",
       "-D__SAMD51J20A__",

diff --git a/boards/adafruit_pygamer_m4.json b/boards/adafruit_pygamer_m4.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_PYGAMER_M4_EXPRESS",
       "-DADAFRUIT_PYGAMER_M4_EXPRESS",
       "-D__SAMD51J19A__",

diff --git a/boards/adafruit_pyportal_m4.json b/boards/adafruit_pyportal_m4.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_PYPORTAL_M4",
       "-DADAFRUIT_PYPORTAL",
       "-D__SAMD51J20A__",

diff --git a/boards/adafruit_pyportal_m4_titano.json b/boards/adafruit_pyportal_m4_titano.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_PYPORTAL_M4_TITANO",
       "-DADAFRUIT_PYPORTAL",
       "-D__SAMD51J20A__",

diff --git a/boards/adafruit_trellis_m4.json b/boards/adafruit_trellis_m4.json
@@ -6,7 +6,6 @@
     "core": "adafruit",
     "cpu": "cortex-m4",
     "extra_flags": [
-      "-DARDUINO_ARCH_SAMD",
       "-DARDUINO_TRELLIS_M4",
       "-DADAFRUIT_TRELLIS_M4_EXPRESS",
       "-D__SAMD51J19A__",

diff --git a/boards/adafruit_trinket_m0.json b/boards/adafruit_trinket_m0.json
@@ -5,7 +5,7 @@
     },
     "core": "adafruit",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_TRINKET_M0 -DCRYSTALLESS -DADAFRUIT_TRINKET_M0 -DARM_MATH_CM0PLUS -D__SAMD21E18A__",
+    "extra_flags": "-DARDUINO_TRINKET_M0 -DCRYSTALLESS -DADAFRUIT_TRINKET_M0 -DARM_MATH_CM0PLUS -D__SAMD21E18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/briki_abc_samd21.json b/boards/briki_abc_samd21.json
@@ -6,7 +6,7 @@
     "core": "mbcwb",
     "cpu": "cortex-m0plus",
     "board": "briki_abc_samd21",
-    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DBRIKI_ABC -DBRIKI_MBC_WB_SAMD -w",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ -DBRIKI_ABC -DBRIKI_MBC_WB_SAMD -w",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/briki_mbcwb_samd21.json b/boards/briki_mbcwb_samd21.json
@@ -6,7 +6,7 @@
     "core": "mbcwb",
     "cpu": "cortex-m0plus",
     "board": "briki_mbcwb_samd21",
-    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DBRIKI_MBC_WB -DBRIKI_MBC_WB_SAMD -w",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ -DBRIKI_MBC_WB -DBRIKI_MBC_WB_SAMD -w",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/current_ranger.json b/boards/current_ranger.json
@@ -5,7 +5,7 @@
     },
     "core": "moteino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DVERY_LOW_POWER -DCRYSTALLESS",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ -DVERY_LOW_POWER -DCRYSTALLESS",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/digix.json b/boards/digix.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m3",
-    "extra_flags": "-w -D__SAM3X8E__ -DARDUINO_SAM_DIGIX -DARDUINO_ARCH_SAM",
+    "extra_flags": "-w -D__SAM3X8E__ -DARDUINO_SAM_DIGIX",
     "f_cpu": "84000000L",
     "hwids": [
       [

diff --git a/boards/due.json b/boards/due.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m3",
-    "extra_flags": "-D__SAM3X8E__ -DARDUINO_ARCH_SAM -DARDUINO_SAM_DUE",
+    "extra_flags": "-D__SAM3X8E__ -DARDUINO_SAM_DUE",
     "f_cpu": "84000000L",
     "hwids": [
       [

diff --git a/boards/dueUSB.json b/boards/dueUSB.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m3",
-    "extra_flags": "-D__SAM3X8E__ -DARDUINO_ARCH_SAM -DARDUINO_SAM_DUE",
+    "extra_flags": "-D__SAM3X8E__ -DARDUINO_SAM_DUE",
     "f_cpu": "84000000L",
     "hwids": [
       [

diff --git a/boards/minitronics20.json b/boards/minitronics20.json
@@ -5,7 +5,7 @@
     },
     "core": "reprap",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_MINITRONICS20 -DARDUINO_ARCH_SAMD -D__SAMD21J18A__ -DUSE_BQ24195L_PMIC",
+    "extra_flags": "-DARDUINO_SAMD_MINITRONICS20 -D__SAMD21J18A__ -DUSE_BQ24195L_PMIC",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/mkr1000USB.json b/boards/mkr1000USB.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_MKR1000 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT",
+    "extra_flags": "-DARDUINO_SAMD_MKR1000 -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/mkrfox1200.json b/boards/mkrfox1200.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_MKRFox1200 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT -DVERY_LOW_POWER",
+    "extra_flags": "-DARDUINO_SAMD_MKRFox1200 -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT -DVERY_LOW_POWER",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/mkrgsm1400.json b/boards/mkrgsm1400.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_MKRGSM1400 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT",
+    "extra_flags": "-DARDUINO_SAMD_MKRGSM1400 -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/mkrnb1500.json b/boards/mkrnb1500.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_MKRNB1500 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT",
+    "extra_flags": "-DARDUINO_SAMD_MKRNB1500 -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/mkrvidor4000.json b/boards/mkrvidor4000.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_MKRVIDOR4000 -DARDUINO_ARCH_SAMD -DUSE_BQ24195L_PMIC -D__SAMD21G18A__",
+    "extra_flags": "-DARDUINO_SAMD_MKRVIDOR4000 -DUSE_BQ24195L_PMIC -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/mkrwan1300.json b/boards/mkrwan1300.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_MKRWAN1300 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT",
+    "extra_flags": "-DARDUINO_SAMD_MKRWAN1300 -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/mkrwan1310.json b/boards/mkrwan1310.json
@@ -7,7 +7,6 @@
     "cpu": "cortex-m0plus",
     "extra_flags": [
       "-DARDUINO_SAMD_MKRWAN1310",
-      "-DARDUINO_ARCH_SAMD",
       "-D__SAMD21G18A__",
       "-DUSE_ARDUINO_MKR_PIN_LAYOUT",
       "-DUSE_BQ24195L_PMIC",

diff --git a/boards/mkrwifi1010.json b/boards/mkrwifi1010.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_MKRWIFI1010 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT",
+    "extra_flags": "-DARDUINO_SAMD_MKRWIFI1010 -D__SAMD21G18A__ -DUSE_BQ24195L_PMIC -DUSE_ARDUINO_MKR_PIN_LAYOUT",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/mkrzero.json b/boards/mkrzero.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_MKRZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT",
+    "extra_flags": "-DARDUINO_SAMD_MKRZERO -D__SAMD21G18A__ -DUSE_ARDUINO_MKR_PIN_LAYOUT",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/moteino_zero.json b/boards/moteino_zero.json
@@ -5,7 +5,7 @@
     },
     "core": "moteino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__ -DVERY_LOW_POWER",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ -DVERY_LOW_POWER",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/mzeroUSB.json b/boards/mzeroUSB.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/mzeropro.json b/boards/mzeropro.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/mzeroproUSB.json b/boards/mzeroproUSB.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__",
+    "extra_flags": "-DARDUINO_SAMD_ZERO -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/nano_33_iot.json b/boards/nano_33_iot.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-DARDUINO_SAMD_NANO_33_IOT -DARDUINO_ARCH_SAMD -DCRYSTALLESS -D__SAMD21G18A__",
+    "extra_flags": "-DARDUINO_SAMD_NANO_33_IOT -DCRYSTALLESS -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [

diff --git a/boards/sainSmartDue.json b/boards/sainSmartDue.json
@@ -5,7 +5,7 @@
     },
     "core": "arduino",
     "cpu": "cortex-m3",
-    "extra_flags": "-D__SAM3X8E__ -DARDUINO_ARCH_SAM -DARDUINO_SAM_DUE",
+    "extra_flags": "-D__SAM3X8E__ -DARDUINO_SAM_DUE",
     "f_cpu": "84000000L",
     "hwids": [
       [