diff --git a/boards.txt b/boards.txt
index 9d40aee77..024218f6f 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1,8 +1,9 @@
 ##############################################################
-esp01.name=Generic ESP8266 board (80MHz)
+esp01.name=Generic ESP8266 board
 
 esp01.upload.tool=esptool
 esp01.upload.speed=115200
+esp01.upload.resetmethod=none
 esp01.upload.maximum_size=524288
 esp01.upload.wait_for_upload_port=true
 
@@ -11,3 +12,21 @@ esp01.build.f_cpu=80000000L
 esp01.build.board=ESP8266_ESP01
 esp01.build.core=esp8266
 esp01.build.variant=esp01
+
+
+##############################################################
+wifio.name=WIFIO
+
+wifio.upload.tool=esptool
+wifio.upload.speed=115200
+wifio.upload.resetmethod=wifio
+wifio.upload.maximum_size=524288
+wifio.upload.wait_for_upload_port=true
+
+wifio.build.mcu=esp8266
+wifio.build.f_cpu=80000000L
+wifio.build.board=ESP8266_WIFIO
+wifio.build.core=esp8266
+# TODO: add board variant for WIFIO
+wifio.build.variant=esp01
+
diff --git a/platform.txt b/platform.txt
index da424e690..b6b923c9f 100644
--- a/platform.txt
+++ b/platform.txt
@@ -81,9 +81,11 @@ recipe.size.regex=^(?:\.text|\.data|\.bss|\.rodata|\.irom0\.text|)\s+([0-9]+).*
 
 # ------------------------------
 
-tools.esptool.cmd.path={runtime.ide.path}/hardware/tools/esp8266/esptool
+tools.esptool.cmd=esptool
+tools.esptool.cmd.windows=esptool.exe
+tools.esptool.path={runtime.ide.path}/hardware/tools/esp8266
 
-tools.esptool.program.params.verbose=-v -v
-tools.esptool.program.params.quiet=-q
-tools.esptool.program.pattern="{cmd.path}" -cp {serial.port} -ca 0x00000 -cf "{build.path}/{build.project_name}_00000.bin" -ca 0x40000 -cf "{build.path}/{build.project_name}_40000.bin"
+tools.esptool.program.params.verbose=-vv
+tools.esptool.program.params.quiet= 
+tools.esptool.program.pattern="{path}/{cmd}" {program.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp {serial.port} -ca 0x00000 -cf "{build.path}/{build.project_name}_00000.bin" -ca 0x40000 -cf "{build.path}/{build.project_name}_40000.bin"