Add OpenOCD as an alternative upload method for atmelsam platform // Issue #732

Author: valeros

platformio/boards/arduino.json

@@ -881,14 +881,18 @@
         "frameworks": ["arduino"],
         "name": "Arduino Zero (Programming Port)",
         "platform": "atmelsam",
+        "debug": {
+            "openocdcfg": "arduino_zero.cfg"
+        },
         "upload": {
             "disable_flushing": true,
             "maximum_ram_size": 32768,
             "maximum_size": 262144,
             "protocol": "openocd",
             "require_upload_port" : false,
             "use_1200bps_touch": false,
-            "wait_for_upload_port": false
+            "wait_for_upload_port": false,
+            "section_start": "0x2000"
         },
         "url": "https://www.arduino.cc/en/Main/ArduinoBoardZero",
         "vendor": "Arduino"
@@ -974,6 +978,9 @@
         "frameworks": ["arduino"],
         "name": "Arduino M0 Pro (Programming Port)",
         "platform": "atmelsam",
+        "debug": {
+            "openocdcfg": "arduino_zero_org.cfg"
+        },
         "upload": {
             "disable_flushing": true,
             "maximum_ram_size": 32768,

platformio/boards/atmelsam.json

@@ -8,7 +8,11 @@
         "frameworks": ["mbed"],
         "name": "Atmel ATSAMR21-XPRO",
         "platform": "atmelsam",
+        "debug": {
+            "openocdcfg": "atmel_samr21_xplained_pro.cfg"
+        },
         "upload": {
+            "protocol": "openocd",
             "maximum_ram_size": 32768,
             "maximum_size": 262144
         },
@@ -24,7 +28,11 @@
         "frameworks": ["mbed"],
         "name": "Atmel SAML21-XPRO-B",
         "platform": "atmelsam",
+        "debug": {
+            "openocdcfg": "atmel_saml21_xplained_pro.cfg"
+        },
         "upload": {
+            "protocol": "openocd",
             "maximum_ram_size": 32768,
             "maximum_size": 262144
         },
@@ -40,7 +48,11 @@
         "frameworks": ["mbed"],
         "name": "Atmel SAMD21-XPRO",
         "platform": "atmelsam",
+        "debug": {
+            "openocdcfg": "atmel_samd21_xplained_pro.cfg"
+        },
         "upload": {
+            "protocol": "openocd",
             "maximum_ram_size": 32768,
             "maximum_size": 262144
         },

platformio/builder/scripts/atmelsam.py

@@ -122,30 +122,33 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
         UPLOADER=join("$PIOPACKAGES_DIR", "tool-openocd", "bin", "openocd"),
         UPLOADERFLAGS=[
             "-d2",
-            "-s", join(
-                "$PIOPACKAGES_DIR",
-                "tool-openocd",
-                "share",
-                "openocd",
-                "scripts"
-            ),
-
-            "-f", join(
-                "$PLATFORMFW_DIR",
-                "variants",
-                "${BOARD_OPTIONS['build']['variant']}",
-                "openocd_scripts",
-                "${BOARD_OPTIONS['build']['variant']}.cfg"
-            ),
+            "-f", join(BOARD_OPTIONS.get("debug", {}).get("openocdcfg", "")),
+            "-s", join("$PIOPACKAGES_DIR", "tool-openocd",
+                       "share", "openocd", "scripts"),
+            "-s", join("$PIOPACKAGES_DIR", "tool-openocd",
+                       "share", "openocd", "scripts", "board")
+        ],
+
+        UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS'
+    )
+
+    if "zero" in env.subst("$BOARD"):
+        env.Append(
+            UPLOADERFLAGS=[
+                "-s", join("$PLATFORMFW_DIR", "variants",
+                           "${BOARD_OPTIONS['build']['variant']}",
+                           "openocd_scripts")
+            ]
+        )
 
+    env.Append(
+        UPLOADERFLAGS=[
             "-c", "\"telnet_port", "disabled;",
             "program", "{{$SOURCES}}",
             "verify", "reset",
-            "%s;" % user_code_section if user_code_section else "0x2000",
+            "%s;" % user_code_section if user_code_section else "",
             "shutdown\""
-        ],
-
-        UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS'
+        ]
     )
 
 elif upload_protocol == "sam-ba":