Use default flash mode when uploading via esptoolpy

Resolve platformio#584

Author: valeros

builder/main.py

@@ -31,15 +31,6 @@ def _get_board_f_flash(env):
     return str(int(int(frequency) / 1000000)) + "m"
 
 
-def _get_board_flash_mode(env):
-    mode = env.subst("$BOARD_FLASH_MODE")
-    if mode == "qio":
-        return "dio"
-    elif mode == "qout":
-        return "dout"
-    return mode
-
-
 def _parse_size(value):
     if isinstance(value, int):
         return value
@@ -139,7 +130,6 @@ def __fetch_spiffs_size(target, source, env):
 
 env.Replace(
     __get_board_f_flash=_get_board_f_flash,
-    __get_board_flash_mode=_get_board_flash_mode,
 
     AR="%s-elf-ar" % toolchain_arch,
     AS="%s-elf-as" % toolchain_arch,
@@ -312,7 +302,7 @@ def __fetch_spiffs_size(target, source, env):
             "--before", "default_reset",
             "--after", "hard_reset",
             "write_flash", "-z",
-            "--flash_mode", "${__get_board_flash_mode(__env__)}",
+            "--flash_mode", "$BOARD_FLASH_MODE",
             "--flash_freq", "${__get_board_f_flash(__env__)}",
             "--flash_size", "detect"
         ],