diff --git a/boards.txt b/boards.txt
index bcbf48813..9499d2354 100644
--- a/boards.txt
+++ b/boards.txt
@@ -625,6 +625,63 @@ esp8285.menu.eesz.1M.build.flash_ld=eagle.flash.1m.ld
 esp8285.menu.eesz.1M.build.spiffs_pagesize=256
 esp8285.menu.eesz.1M.upload.maximum_size=1023984
 esp8285.menu.eesz.1M.build.rfcal_addr=0xFC000
+esp8285.menu.eesz.2M64=2MB (FS:64KB OTA:~992KB)
+esp8285.menu.eesz.2M64.build.flash_size=2M
+esp8285.menu.eesz.2M64.build.flash_size_bytes=0x200000
+esp8285.menu.eesz.2M64.build.flash_ld=eagle.flash.2m64.ld
+esp8285.menu.eesz.2M64.build.spiffs_pagesize=256
+esp8285.menu.eesz.2M64.upload.maximum_size=1044464
+esp8285.menu.eesz.2M64.build.rfcal_addr=0x1FC000
+esp8285.menu.eesz.2M64.build.spiffs_start=0x1F0000
+esp8285.menu.eesz.2M64.build.spiffs_end=0x1FB000
+esp8285.menu.eesz.2M64.build.spiffs_blocksize=4096
+esp8285.menu.eesz.2M128=2MB (FS:128KB OTA:~960KB)
+esp8285.menu.eesz.2M128.build.flash_size=2M
+esp8285.menu.eesz.2M128.build.flash_size_bytes=0x200000
+esp8285.menu.eesz.2M128.build.flash_ld=eagle.flash.2m128.ld
+esp8285.menu.eesz.2M128.build.spiffs_pagesize=256
+esp8285.menu.eesz.2M128.upload.maximum_size=1044464
+esp8285.menu.eesz.2M128.build.rfcal_addr=0x1FC000
+esp8285.menu.eesz.2M128.build.spiffs_start=0x1E0000
+esp8285.menu.eesz.2M128.build.spiffs_end=0x1FB000
+esp8285.menu.eesz.2M128.build.spiffs_blocksize=4096
+esp8285.menu.eesz.2M256=2MB (FS:256KB OTA:~896KB)
+esp8285.menu.eesz.2M256.build.flash_size=2M
+esp8285.menu.eesz.2M256.build.flash_size_bytes=0x200000
+esp8285.menu.eesz.2M256.build.flash_ld=eagle.flash.2m256.ld
+esp8285.menu.eesz.2M256.build.spiffs_pagesize=256
+esp8285.menu.eesz.2M256.upload.maximum_size=1044464
+esp8285.menu.eesz.2M256.build.rfcal_addr=0x1FC000
+esp8285.menu.eesz.2M256.build.spiffs_start=0x1C0000
+esp8285.menu.eesz.2M256.build.spiffs_end=0x1FB000
+esp8285.menu.eesz.2M256.build.spiffs_blocksize=4096
+esp8285.menu.eesz.2M512=2MB (FS:512KB OTA:~768KB)
+esp8285.menu.eesz.2M512.build.flash_size=2M
+esp8285.menu.eesz.2M512.build.flash_size_bytes=0x200000
+esp8285.menu.eesz.2M512.build.flash_ld=eagle.flash.2m512.ld
+esp8285.menu.eesz.2M512.build.spiffs_pagesize=256
+esp8285.menu.eesz.2M512.upload.maximum_size=1044464
+esp8285.menu.eesz.2M512.build.rfcal_addr=0x1FC000
+esp8285.menu.eesz.2M512.build.spiffs_start=0x180000
+esp8285.menu.eesz.2M512.build.spiffs_end=0x1FA000
+esp8285.menu.eesz.2M512.build.spiffs_blocksize=8192
+esp8285.menu.eesz.2M1M=2MB (FS:1MB OTA:~512KB)
+esp8285.menu.eesz.2M1M.build.flash_size=2M
+esp8285.menu.eesz.2M1M.build.flash_size_bytes=0x200000
+esp8285.menu.eesz.2M1M.build.flash_ld=eagle.flash.2m1m.ld
+esp8285.menu.eesz.2M1M.build.spiffs_pagesize=256
+esp8285.menu.eesz.2M1M.upload.maximum_size=1044464
+esp8285.menu.eesz.2M1M.build.rfcal_addr=0x1FC000
+esp8285.menu.eesz.2M1M.build.spiffs_start=0x100000
+esp8285.menu.eesz.2M1M.build.spiffs_end=0x1FA000
+esp8285.menu.eesz.2M1M.build.spiffs_blocksize=8192
+esp8285.menu.eesz.2M=2MB (FS:none OTA:~1019KB)
+esp8285.menu.eesz.2M.build.flash_size=2M
+esp8285.menu.eesz.2M.build.flash_size_bytes=0x200000
+esp8285.menu.eesz.2M.build.flash_ld=eagle.flash.2m.ld
+esp8285.menu.eesz.2M.build.spiffs_pagesize=256
+esp8285.menu.eesz.2M.upload.maximum_size=1044464
+esp8285.menu.eesz.2M.build.rfcal_addr=0x1FC000
 esp8285.menu.led.2=2
 esp8285.menu.led.2.build.led=-DLED_BUILTIN=2
 esp8285.menu.led.0=0
diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json
index 86a9570bf..97a05e2bb 100644
--- a/package/package_esp8266com_index.template.json
+++ b/package/package_esp8266com_index.template.json
@@ -378,4 +378,4 @@
          ]
       }
    ]
-}
+}
\ No newline at end of file
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
index ff582896d..d33cbe1fc 100755
--- a/tools/boards.txt.py
+++ b/tools/boards.txt.py
@@ -286,7 +286,7 @@ boards = collections.OrderedDict([
             'crystalfreq_menu',
             'flashmode_dout',
             'flashfreq_40',
-            '1M',
+            '1M', '2M',
             'led',
             ],
         'desc': [ 'ESP8285 (`datasheet <http://www.espressif.com/sites/default/files/0a-esp8285_datasheet_en_v1.0_20160422.pdf>`__) is a multi-chip package which contains ESP8266 and 1MB flash. All points related to bootstrapping resistors and recommended circuits listed above apply to ESP8285 as well.',