diff --git a/platformio/builder/tools/pioplatform.py b/platformio/builder/tools/pioplatform.py
index 80fb5e67..a0e19af0 100644
--- a/platformio/builder/tools/pioplatform.py
+++ b/platformio/builder/tools/pioplatform.py
@@ -135,9 +135,9 @@ def PrintSystemInfo(env):
         else:
             external.append(key)
     if onboard:
-        data.append("ON-BORD(%s)" % ", ".join(sorted(onboard)))
+        data.append("ON-BORD/%s" % ", ".join(sorted(onboard)))
     if external:
-        data.append("EXTERNAL(%s)" % ", ".join(sorted(external)))
+        data.append("EXTERNAL/%s" % ", ".join(sorted(external)))
 
     print "Debug: %s" % " ".join(data)
 
diff --git a/platformio/builder/tools/pioupload.py b/platformio/builder/tools/pioupload.py
index f82b75da..9b745dac 100644
--- a/platformio/builder/tools/pioupload.py
+++ b/platformio/builder/tools/pioupload.py
@@ -215,11 +215,14 @@ def CheckUploadSize(_, target, source, env):  # pylint: disable=W0613,W0621
 
 def PrintUploadInfo(env):
     configured = env.subst("$UPLOAD_PROTOCOL")
+    available = []
     if "BOARD" in env:
         available = env.BoardConfig().get("upload", {}).get(
             "protocols", [configured])
+    if available:
         print "Available: %s" % ", ".join(available)
-    print "Configured: %s" % configured
+    if configured:
+        print "Configured: upload_protocol = %s" % configured
 
 
 def exists(_):