Take into account application image offset when uploading via esptool

Resolve platformio#538

Author: valeros

builder/main.py

@@ -228,7 +228,7 @@ def __fetch_fs_size(target, source, env):
     BUILDERS=dict(
         ElfToBin=Builder(
             action=env.VerboseAction(" ".join([
-                        '"$PYTHONEXE" "$OBJCOPY"',
+                '"$PYTHONEXE" "$OBJCOPY"',
                 "--chip", mcu, "elf2image",
                 "--flash_mode", "$BOARD_FLASH_MODE",
                 "--flash_freq", "${__get_board_f_flash(__env__)}",
@@ -368,9 +368,11 @@ def __fetch_fs_size(target, source, env):
             "write_flash", "-z",
             "--flash_mode", "${__get_board_flash_mode(__env__)}",
             "--flash_freq", "${__get_board_f_flash(__env__)}",
-            "--flash_size", "detect"
+            "--flash_size", "detect",
+            board.get("upload.offset_address", "$ESP32_APP_OFFSET"),
+            "$SOURCE"
         ],
-        UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $ESP32_APP_OFFSET $SOURCE'
+        UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS'
     )
     for image in env.get("FLASH_EXTRA_IMAGES", []):
         env.Append(UPLOADERFLAGS=[image[0], env.subst(image[1])])