diff --git a/boards.txt b/boards.txt
index b8b2416de..7fb8946ad 100644
--- a/boards.txt
+++ b/boards.txt
@@ -154,11 +154,6 @@ huzzah.build.variant=adafruit
 huzzah.build.flash_mode=qio
 huzzah.build.flash_size=4M
 huzzah.build.flash_freq=40
-huzzah.build.flash_ld=eagle.flash.4m.ld
-huzzah.build.spiffs_start=0x100000
-huzzah.build.spiffs_end=0x3FB000
-huzzah.build.spiffs_pagesize=256
-huzzah.build.spiffs_blocksize=8192
 
 huzzah.menu.CpuFrequency.80=80 MHz
 huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -176,6 +171,23 @@ huzzah.menu.UploadSpeed.256000.upload.speed=256000
 huzzah.menu.UploadSpeed.921600=921600
 huzzah.menu.UploadSpeed.921600.upload.speed=921600
 
+huzzah.menu.FlashSize.4M3M=4M (3M SPIFFS)
+huzzah.menu.FlashSize.4M3M.build.flash_size=4M
+huzzah.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+huzzah.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+huzzah.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+huzzah.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+huzzah.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+huzzah.menu.FlashSize.4M3M.upload.maximum_size=1044464
+
+huzzah.menu.FlashSize.4M1M=4M (1M SPIFFS)
+huzzah.menu.FlashSize.4M1M.build.flash_size=4M
+huzzah.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+huzzah.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+huzzah.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+huzzah.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+huzzah.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+
 ##############################################################
 nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
 
@@ -196,11 +208,6 @@ nodemcu.build.variant=nodemcu
 nodemcu.build.flash_mode=qio
 nodemcu.build.flash_size=4M
 nodemcu.build.flash_freq=40
-nodemcu.build.flash_ld=eagle.flash.4m.ld
-nodemcu.build.spiffs_start=0x100000
-nodemcu.build.spiffs_end=0x3FB000
-nodemcu.build.spiffs_pagesize=256
-nodemcu.build.spiffs_blocksize=8192
 
 nodemcu.menu.CpuFrequency.80=80 MHz
 nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -227,6 +234,23 @@ nodemcu.menu.UploadSpeed.512000.upload.speed=512000
 nodemcu.menu.UploadSpeed.921600=921600
 nodemcu.menu.UploadSpeed.921600.upload.speed=921600
 
+nodemcu.menu.FlashSize.4M3M=4M (3M SPIFFS)
+nodemcu.menu.FlashSize.4M3M.build.flash_size=4M
+nodemcu.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+nodemcu.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+nodemcu.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+nodemcu.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+nodemcu.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+nodemcu.menu.FlashSize.4M3M.upload.maximum_size=1044464
+
+nodemcu.menu.FlashSize.4M1M=4M (1M SPIFFS)
+nodemcu.menu.FlashSize.4M1M.build.flash_size=4M
+nodemcu.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+nodemcu.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+nodemcu.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+nodemcu.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+nodemcu.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+
 ##############################################################
 nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
 
@@ -247,11 +271,6 @@ nodemcuv2.build.variant=nodemcu
 nodemcuv2.build.flash_mode=dio
 nodemcuv2.build.flash_size=4M
 nodemcuv2.build.flash_freq=40
-nodemcuv2.build.flash_ld=eagle.flash.4m.ld
-nodemcuv2.build.spiffs_start=0x100000
-nodemcuv2.build.spiffs_end=0x3FB000
-nodemcuv2.build.spiffs_pagesize=256
-nodemcuv2.build.spiffs_blocksize=8192
 
 nodemcuv2.menu.CpuFrequency.80=80 MHz
 nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -278,6 +297,25 @@ nodemcuv2.menu.UploadSpeed.512000.upload.speed=512000
 nodemcuv2.menu.UploadSpeed.921600=921600
 nodemcuv2.menu.UploadSpeed.921600.upload.speed=921600
 
+nodemcuv2.menu.FlashSize.4M3M=4M (3M SPIFFS)
+nodemcuv2.menu.FlashSize.4M3M.build.flash_size=4M
+nodemcuv2.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+nodemcuv2.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+nodemcuv2.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+nodemcuv2.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+nodemcuv2.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+nodemcuv2.menu.FlashSize.4M3M.upload.maximum_size=1044464
+
+nodemcuv2.menu.FlashSize.4M1M=4M (1M SPIFFS)
+nodemcuv2.menu.FlashSize.4M1M.build.flash_size=4M
+nodemcuv2.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+nodemcuv2.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+nodemcuv2.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+nodemcuv2.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+nodemcuv2.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+nodemcuv2.menu.FlashSize.4M1M.upload.maximum_size=1044464
+
+
 ##############################################################
 modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)
 
@@ -355,6 +393,7 @@ thing.build.flash_freq=40
 thing.build.spiffs_start=0x6B000
 thing.build.spiffs_end=0x7B000
 thing.build.spiffs_blocksize=4096
+thing.build.spiffs_pagesize=256
 
 thing.menu.CpuFrequency.80=80 MHz
 thing.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -400,11 +439,6 @@ esp210.build.variant=generic
 esp210.build.flash_mode=qio
 esp210.build.flash_size=4M
 esp210.build.flash_freq=40
-esp210.build.flash_ld=eagle.flash.4m.ld
-esp210.build.spiffs_start=0x100000
-esp210.build.spiffs_end=0x3FB000
-esp210.build.spiffs_pagesize=256
-esp210.build.spiffs_blocksize=8192
 
 esp210.menu.CpuFrequency.80=80 MHz
 esp210.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -429,6 +463,23 @@ esp210.menu.UploadSpeed.512000.upload.speed=512000
 esp210.menu.UploadSpeed.921600=921600
 esp210.menu.UploadSpeed.921600.upload.speed=921600
 
+esp210.menu.FlashSize.4M3M=4M (3M SPIFFS)
+esp210.menu.FlashSize.4M3M.build.flash_size=4M
+esp210.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+esp210.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+esp210.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+esp210.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+esp210.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+esp210.menu.FlashSize.4M3M.upload.maximum_size=1044464
+
+esp210.menu.FlashSize.4M1M=4M (1M SPIFFS)
+esp210.menu.FlashSize.4M1M.build.flash_size=4M
+esp210.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+esp210.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+esp210.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+esp210.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+esp210.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+
 ##############################################################
 # wifio.name=Wifio
 #
diff --git a/doc/reference.md b/doc/reference.md
index df2f2cfcb..ee2507ec2 100644
--- a/doc/reference.md
+++ b/doc/reference.md
@@ -121,12 +121,12 @@ Generic module | 512k | 64k
 Generic module | 1M | 64k, 128k, 256k, 512k
 Generic module | 2M | 1M
 Generic module | 4M | 3M
-Adafruit HUZZAH | 4M | 3M
-NodeMCU 0.9    | 4M | 3M
-NodeMCU 1.0    | 4M | 3M
+Adafruit HUZZAH | 4M | 1M, 3M
+NodeMCU 0.9    | 4M | 1M, 3M
+NodeMCU 1.0    | 4M | 1M, 3M
 Olimex MOD-WIFI-ESP8266(-DEV)| 2M | 1M
 SparkFun Thing | 512k | 64k
-SweetPea ESP-210 | 4M | 3M
+SweetPea ESP-210 | 4M | 1M, 3M
 
 **Note:** to use any of file system functions in the sketch, add the following include to the sketch: