Dump only "platform, board and framework" by default when processing environment

platformio/builder/tools/pioplatform.py

@@ -99,7 +99,7 @@ def LoadPioPlatform(env, variables):
 
 
 def PrintConfiguration(env):  # pylint: disable=too-many-branches
-    platform_data = ["Platform: %s ::" % env.PioPlatform().title]
+    platform_data = ["Platform: %s >" % env.PioPlatform().title]
     system_data = ["System:"]
     mcu = env.subst("$BOARD_MCU")
     f_cpu = env.subst("$BOARD_F_CPU")

platformio/builder/tools/pioupload.py

@@ -215,12 +215,12 @@ def CheckUploadSize(_, target, source, env):  # pylint: disable=W0613,W0621
 
 def PrintUploadInfo(env):
     configured = env.subst("$UPLOAD_PROTOCOL")
-    available = []
+    available = [configured] if configured else []
     if "BOARD" in env:
-        available = env.BoardConfig().get("upload", {}).get(
-            "protocols", [configured])
+        available.extend(env.BoardConfig().get("upload", {}).get(
+            "protocols", []))
     if available:
-        print "Available: %s" % ", ".join(available)
+        print "Available: %s" % ", ".join(sorted(available))
     if configured:
         print "Configured: upload_protocol = %s" % configured