Improve checking for the program size before uploading // Issue #689

platformio/builder/scripts/atmelsam.py

@@ -25,8 +25,6 @@ from platformio.util import get_serialports
 
 
 def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
-    env.AutodetectUploadPort()
-
     board_type = env.subst("$BOARD")
     if "zero" not in board_type:
         env.Append(
@@ -177,8 +175,9 @@ if env.subst("$BOARD") == "zero":
     upload = env.Alias(["upload", "uploadlazy"], target_firm,
                        [env.CheckUploadSize, "$UPLOADCMD"])
 else:
-    upload = env.Alias(["upload", "uploadlazy"], target_firm,
-                       [env.CheckUploadSize, BeforeUpload, "$UPLOADCMD"])
+    upload = env.Alias(
+        ["upload", "uploadlazy"], target_firm,
+        [env.AutodetectUploadPort, BeforeUpload, "$UPLOADCMD"])
 
 AlwaysBuild(upload)