diff --git a/boards.txt b/boards.txt
index fd05749760..61a0abb4c4 100644
--- a/boards.txt
+++ b/boards.txt
@@ -5827,9 +5827,24 @@ modwifi.menu.non32xfer.fast=Use pgm_read macros for IRAM/PROGMEM
 modwifi.menu.non32xfer.fast.build.non32xferflags=
 modwifi.menu.non32xfer.safe=Byte/Word access to IRAM/PROGMEM (very slow)
 modwifi.menu.non32xfer.safe.build.non32xferflags=-DNON32XFER_HANDLER
-modwifi.upload.resetmethod=--before no_reset --after soft_reset
-modwifi.build.flash_mode=qio
-modwifi.build.flash_flags=-DFLASHMODE_QIO
+modwifi.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+modwifi.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+modwifi.menu.ResetMethod.ck=no dtr (aka ck)
+modwifi.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
+modwifi.menu.ResetMethod.nodtr_nosync=no dtr, no_sync
+modwifi.menu.ResetMethod.nodtr_nosync.upload.resetmethod=--before no_reset_no_sync --after soft_reset
+modwifi.menu.FlashMode.dout=DOUT (compatible)
+modwifi.menu.FlashMode.dout.build.flash_mode=dout
+modwifi.menu.FlashMode.dout.build.flash_flags=-DFLASHMODE_DOUT
+modwifi.menu.FlashMode.dio=DIO
+modwifi.menu.FlashMode.dio.build.flash_mode=dio
+modwifi.menu.FlashMode.dio.build.flash_flags=-DFLASHMODE_DIO
+modwifi.menu.FlashMode.qout=QOUT
+modwifi.menu.FlashMode.qout.build.flash_mode=qout
+modwifi.menu.FlashMode.qout.build.flash_flags=-DFLASHMODE_QOUT
+modwifi.menu.FlashMode.qio=QIO (fast)
+modwifi.menu.FlashMode.qio.build.flash_mode=qio
+modwifi.menu.FlashMode.qio.build.flash_flags=-DFLASHMODE_QIO
 modwifi.build.flash_freq=40
 modwifi.menu.eesz.2M64=2MB (FS:64KB OTA:~992KB)
 modwifi.menu.eesz.2M64.build.flash_size=2M
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
index 673f8d8068..6282026c88 100755
--- a/tools/boards.txt.py
+++ b/tools/boards.txt.py
@@ -531,8 +531,9 @@
             '.build.variant': 'modwifi',
             },
         'macro': [
-            'resetmethod_ck',
-            'flashmode_qio',
+            'resetmethod_menu',
+            'resetmethod_menu_extra',
+            'flashmode_menu',
             'flashfreq_40',
             '2M',
             ],