Merge branch 'release/v3.3.2'

Author: ivankravets

platform.json

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nxplpc.git"
   },
-  "version": "3.3.1",
+  "version": "3.3.2",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
@@ -42,6 +42,11 @@
       "type": "debugger",
       "optional": true,
       "version": "~0.801.0"
+    },
+    "tool-jlink": {
+      "type": "uploader",
+      "optional": true,
+      "version": "^1.63208.0"
     }
   }
 }

platform.py

@@ -31,6 +31,21 @@ def configure_default_packages(self, variables, targets):
             if upload_protocol == "cmsis-dap":
                 self.packages['tool-pyocd']['type'] = "uploader"
 
+        # configure J-LINK tool
+        jlink_conds = [
+            "jlink" in variables.get(option, "")
+            for option in ("upload_protocol", "debug_tool")
+        ]
+        if variables.get("board"):
+            board_config = self.board_config(variables.get("board"))
+            jlink_conds.extend([
+                "jlink" in board_config.get(key, "")
+                for key in ("debug.default_tools", "upload.protocol")
+            ])
+        jlink_pkgname = "tool-jlink"
+        if not any(jlink_conds) and jlink_pkgname in self.packages:
+            del self.packages[jlink_pkgname]
+
         return PlatformBase.configure_default_packages(self, variables,
                                                        targets)
 
@@ -66,6 +81,7 @@ def _add_default_debug_tools(self, board):
                     "Missed J-Link Device ID for %s" % board.id)
                 debug['tools'][link] = {
                     "server": {
+                        "package": "tool-jlink",
                         "arguments": [
                             "-singlerun",
                             "-if", "SWD",