diff --git a/boards.txt b/boards.txt
index 39383d642..5d77e268d 100644
--- a/boards.txt
+++ b/boards.txt
@@ -198,7 +198,7 @@ generic.menu.eesz.1M512.upload.maximum_size=499696
 generic.menu.eesz.1M512.build.rfcal_addr=0xFC000
 generic.menu.eesz.1M512.build.spiffs_start=0x7B000
 generic.menu.eesz.1M512.build.spiffs_end=0xFB000
-generic.menu.eesz.1M512.build.spiffs_blocksize=4096
+generic.menu.eesz.1M512.build.spiffs_blocksize=8192
 generic.menu.eesz.2M=2MB (FS:no OTA:~1019KB)
 generic.menu.eesz.2M.build.flash_size=2M
 generic.menu.eesz.2M.build.flash_size_bytes=0x200000
@@ -234,7 +234,7 @@ generic.menu.eesz.2M512.build.spiffs_pagesize=256
 generic.menu.eesz.2M512.upload.maximum_size=1044464
 generic.menu.eesz.2M512.build.rfcal_addr=0x1FC000
 generic.menu.eesz.2M512.build.spiffs_start=0x180000
-generic.menu.eesz.2M512.build.spiffs_end=0x1FB000
+generic.menu.eesz.2M512.build.spiffs_end=0x1FA000
 generic.menu.eesz.2M512.build.spiffs_blocksize=8192
 generic.menu.eesz.2M1M=2MB (FS:1MB OTA:~512KB)
 generic.menu.eesz.2M1M.build.flash_size=2M
@@ -244,7 +244,7 @@ generic.menu.eesz.2M1M.build.spiffs_pagesize=256
 generic.menu.eesz.2M1M.upload.maximum_size=1044464
 generic.menu.eesz.2M1M.build.rfcal_addr=0x1FC000
 generic.menu.eesz.2M1M.build.spiffs_start=0x100000
-generic.menu.eesz.2M1M.build.spiffs_end=0x1FB000
+generic.menu.eesz.2M1M.build.spiffs_end=0x1FA000
 generic.menu.eesz.2M1M.build.spiffs_blocksize=8192
 generic.menu.eesz.4M=4MB (FS:no OTA:~1019KB)
 generic.menu.eesz.4M.build.flash_size=4M
@@ -261,7 +261,7 @@ generic.menu.eesz.4M1M.build.spiffs_pagesize=256
 generic.menu.eesz.4M1M.upload.maximum_size=1044464
 generic.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 generic.menu.eesz.4M1M.build.spiffs_start=0x300000
-generic.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+generic.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 generic.menu.eesz.4M1M.build.spiffs_blocksize=8192
 generic.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 generic.menu.eesz.4M2M.build.flash_size=4M
@@ -271,7 +271,7 @@ generic.menu.eesz.4M2M.build.spiffs_pagesize=256
 generic.menu.eesz.4M2M.upload.maximum_size=1044464
 generic.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 generic.menu.eesz.4M2M.build.spiffs_start=0x200000
-generic.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+generic.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 generic.menu.eesz.4M2M.build.spiffs_blocksize=8192
 generic.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 generic.menu.eesz.4M3M.build.flash_size=4M
@@ -281,7 +281,7 @@ generic.menu.eesz.4M3M.build.spiffs_pagesize=256
 generic.menu.eesz.4M3M.upload.maximum_size=1044464
 generic.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 generic.menu.eesz.4M3M.build.spiffs_start=0x100000
-generic.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+generic.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 generic.menu.eesz.4M3M.build.spiffs_blocksize=8192
 generic.menu.eesz.8M6M=8MB (FS:6MB OTA:~1019KB)
 generic.menu.eesz.8M6M.build.flash_size=8M
@@ -291,7 +291,7 @@ generic.menu.eesz.8M6M.build.spiffs_pagesize=256
 generic.menu.eesz.8M6M.upload.maximum_size=1044464
 generic.menu.eesz.8M6M.build.rfcal_addr=0x7FC000
 generic.menu.eesz.8M6M.build.spiffs_start=0x200000
-generic.menu.eesz.8M6M.build.spiffs_end=0x7FB000
+generic.menu.eesz.8M6M.build.spiffs_end=0x7FA000
 generic.menu.eesz.8M6M.build.spiffs_blocksize=8192
 generic.menu.eesz.8M7M=8MB (FS:7MB OTA:~512KB)
 generic.menu.eesz.8M7M.build.flash_size=8M
@@ -301,7 +301,7 @@ generic.menu.eesz.8M7M.build.spiffs_pagesize=256
 generic.menu.eesz.8M7M.upload.maximum_size=1044464
 generic.menu.eesz.8M7M.build.rfcal_addr=0x7FC000
 generic.menu.eesz.8M7M.build.spiffs_start=0x100000
-generic.menu.eesz.8M7M.build.spiffs_end=0x7FB000
+generic.menu.eesz.8M7M.build.spiffs_end=0x7FA000
 generic.menu.eesz.8M7M.build.spiffs_blocksize=8192
 generic.menu.eesz.16M14M=16MB (FS:14MB OTA:~1019KB)
 generic.menu.eesz.16M14M.build.flash_size=16M
@@ -311,7 +311,7 @@ generic.menu.eesz.16M14M.build.spiffs_pagesize=256
 generic.menu.eesz.16M14M.upload.maximum_size=1044464
 generic.menu.eesz.16M14M.build.rfcal_addr=0xFFC000
 generic.menu.eesz.16M14M.build.spiffs_start=0x200000
-generic.menu.eesz.16M14M.build.spiffs_end=0xFFB000
+generic.menu.eesz.16M14M.build.spiffs_end=0xFFA000
 generic.menu.eesz.16M14M.build.spiffs_blocksize=8192
 generic.menu.eesz.16M15M=16MB (FS:15MB OTA:~512KB)
 generic.menu.eesz.16M15M.build.flash_size=16M
@@ -321,7 +321,7 @@ generic.menu.eesz.16M15M.build.spiffs_pagesize=256
 generic.menu.eesz.16M15M.upload.maximum_size=1044464
 generic.menu.eesz.16M15M.build.rfcal_addr=0xFFC000
 generic.menu.eesz.16M15M.build.spiffs_start=0x100000
-generic.menu.eesz.16M15M.build.spiffs_end=0xFFB000
+generic.menu.eesz.16M15M.build.spiffs_end=0xFFA000
 generic.menu.eesz.16M15M.build.spiffs_blocksize=8192
 generic.menu.led.2=2
 generic.menu.led.2.build.led=-DLED_BUILTIN=2
@@ -600,7 +600,7 @@ esp8285.menu.eesz.1M512.upload.maximum_size=499696
 esp8285.menu.eesz.1M512.build.rfcal_addr=0xFC000
 esp8285.menu.eesz.1M512.build.spiffs_start=0x7B000
 esp8285.menu.eesz.1M512.build.spiffs_end=0xFB000
-esp8285.menu.eesz.1M512.build.spiffs_blocksize=4096
+esp8285.menu.eesz.1M512.build.spiffs_blocksize=8192
 esp8285.menu.led.2=2
 esp8285.menu.led.2.build.led=-DLED_BUILTIN=2
 esp8285.menu.led.0=0
@@ -807,7 +807,7 @@ espduino.menu.eesz.4M1M.build.spiffs_pagesize=256
 espduino.menu.eesz.4M1M.upload.maximum_size=1044464
 espduino.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 espduino.menu.eesz.4M1M.build.spiffs_start=0x300000
-espduino.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+espduino.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 espduino.menu.eesz.4M1M.build.spiffs_blocksize=8192
 espduino.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 espduino.menu.eesz.4M2M.build.flash_size=4M
@@ -817,7 +817,7 @@ espduino.menu.eesz.4M2M.build.spiffs_pagesize=256
 espduino.menu.eesz.4M2M.upload.maximum_size=1044464
 espduino.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 espduino.menu.eesz.4M2M.build.spiffs_start=0x200000
-espduino.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+espduino.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 espduino.menu.eesz.4M2M.build.spiffs_blocksize=8192
 espduino.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 espduino.menu.eesz.4M3M.build.flash_size=4M
@@ -827,7 +827,7 @@ espduino.menu.eesz.4M3M.build.spiffs_pagesize=256
 espduino.menu.eesz.4M3M.upload.maximum_size=1044464
 espduino.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 espduino.menu.eesz.4M3M.build.spiffs_start=0x100000
-espduino.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+espduino.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 espduino.menu.eesz.4M3M.build.spiffs_blocksize=8192
 espduino.menu.ip.lm2f=v2 Lower Memory
 espduino.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -995,7 +995,7 @@ huzzah.menu.eesz.4M1M.build.spiffs_pagesize=256
 huzzah.menu.eesz.4M1M.upload.maximum_size=1044464
 huzzah.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 huzzah.menu.eesz.4M1M.build.spiffs_start=0x300000
-huzzah.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+huzzah.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 huzzah.menu.eesz.4M1M.build.spiffs_blocksize=8192
 huzzah.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 huzzah.menu.eesz.4M2M.build.flash_size=4M
@@ -1005,7 +1005,7 @@ huzzah.menu.eesz.4M2M.build.spiffs_pagesize=256
 huzzah.menu.eesz.4M2M.upload.maximum_size=1044464
 huzzah.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 huzzah.menu.eesz.4M2M.build.spiffs_start=0x200000
-huzzah.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+huzzah.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 huzzah.menu.eesz.4M2M.build.spiffs_blocksize=8192
 huzzah.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 huzzah.menu.eesz.4M3M.build.flash_size=4M
@@ -1015,7 +1015,7 @@ huzzah.menu.eesz.4M3M.build.spiffs_pagesize=256
 huzzah.menu.eesz.4M3M.upload.maximum_size=1044464
 huzzah.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 huzzah.menu.eesz.4M3M.build.spiffs_start=0x100000
-huzzah.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+huzzah.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 huzzah.menu.eesz.4M3M.build.spiffs_blocksize=8192
 huzzah.menu.ip.lm2f=v2 Lower Memory
 huzzah.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -1183,7 +1183,7 @@ inventone.menu.eesz.4M1M.build.spiffs_pagesize=256
 inventone.menu.eesz.4M1M.upload.maximum_size=1044464
 inventone.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 inventone.menu.eesz.4M1M.build.spiffs_start=0x300000
-inventone.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+inventone.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 inventone.menu.eesz.4M1M.build.spiffs_blocksize=8192
 inventone.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 inventone.menu.eesz.4M2M.build.flash_size=4M
@@ -1193,7 +1193,7 @@ inventone.menu.eesz.4M2M.build.spiffs_pagesize=256
 inventone.menu.eesz.4M2M.upload.maximum_size=1044464
 inventone.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 inventone.menu.eesz.4M2M.build.spiffs_start=0x200000
-inventone.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+inventone.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 inventone.menu.eesz.4M2M.build.spiffs_blocksize=8192
 inventone.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 inventone.menu.eesz.4M3M.build.flash_size=4M
@@ -1203,7 +1203,7 @@ inventone.menu.eesz.4M3M.build.spiffs_pagesize=256
 inventone.menu.eesz.4M3M.upload.maximum_size=1044464
 inventone.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 inventone.menu.eesz.4M3M.build.spiffs_start=0x100000
-inventone.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+inventone.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 inventone.menu.eesz.4M3M.build.spiffs_blocksize=8192
 inventone.menu.ip.lm2f=v2 Lower Memory
 inventone.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -1374,7 +1374,7 @@ cw01.menu.eesz.4M1M.build.spiffs_pagesize=256
 cw01.menu.eesz.4M1M.upload.maximum_size=1044464
 cw01.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 cw01.menu.eesz.4M1M.build.spiffs_start=0x300000
-cw01.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+cw01.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 cw01.menu.eesz.4M1M.build.spiffs_blocksize=8192
 cw01.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 cw01.menu.eesz.4M2M.build.flash_size=4M
@@ -1384,7 +1384,7 @@ cw01.menu.eesz.4M2M.build.spiffs_pagesize=256
 cw01.menu.eesz.4M2M.upload.maximum_size=1044464
 cw01.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 cw01.menu.eesz.4M2M.build.spiffs_start=0x200000
-cw01.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+cw01.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 cw01.menu.eesz.4M2M.build.spiffs_blocksize=8192
 cw01.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 cw01.menu.eesz.4M3M.build.flash_size=4M
@@ -1394,7 +1394,7 @@ cw01.menu.eesz.4M3M.build.spiffs_pagesize=256
 cw01.menu.eesz.4M3M.upload.maximum_size=1044464
 cw01.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 cw01.menu.eesz.4M3M.build.spiffs_start=0x100000
-cw01.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+cw01.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 cw01.menu.eesz.4M3M.build.spiffs_blocksize=8192
 cw01.menu.ip.lm2f=v2 Lower Memory
 cw01.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -1561,7 +1561,7 @@ espresso_lite_v1.menu.eesz.4M1M.build.spiffs_pagesize=256
 espresso_lite_v1.menu.eesz.4M1M.upload.maximum_size=1044464
 espresso_lite_v1.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 espresso_lite_v1.menu.eesz.4M1M.build.spiffs_start=0x300000
-espresso_lite_v1.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+espresso_lite_v1.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 espresso_lite_v1.menu.eesz.4M1M.build.spiffs_blocksize=8192
 espresso_lite_v1.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 espresso_lite_v1.menu.eesz.4M2M.build.flash_size=4M
@@ -1571,7 +1571,7 @@ espresso_lite_v1.menu.eesz.4M2M.build.spiffs_pagesize=256
 espresso_lite_v1.menu.eesz.4M2M.upload.maximum_size=1044464
 espresso_lite_v1.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 espresso_lite_v1.menu.eesz.4M2M.build.spiffs_start=0x200000
-espresso_lite_v1.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+espresso_lite_v1.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 espresso_lite_v1.menu.eesz.4M2M.build.spiffs_blocksize=8192
 espresso_lite_v1.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 espresso_lite_v1.menu.eesz.4M3M.build.flash_size=4M
@@ -1581,7 +1581,7 @@ espresso_lite_v1.menu.eesz.4M3M.build.spiffs_pagesize=256
 espresso_lite_v1.menu.eesz.4M3M.upload.maximum_size=1044464
 espresso_lite_v1.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 espresso_lite_v1.menu.eesz.4M3M.build.spiffs_start=0x100000
-espresso_lite_v1.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+espresso_lite_v1.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 espresso_lite_v1.menu.eesz.4M3M.build.spiffs_blocksize=8192
 espresso_lite_v1.menu.ResetMethod.ck=ck
 espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=ck
@@ -1752,7 +1752,7 @@ espresso_lite_v2.menu.eesz.4M1M.build.spiffs_pagesize=256
 espresso_lite_v2.menu.eesz.4M1M.upload.maximum_size=1044464
 espresso_lite_v2.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 espresso_lite_v2.menu.eesz.4M1M.build.spiffs_start=0x300000
-espresso_lite_v2.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+espresso_lite_v2.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 espresso_lite_v2.menu.eesz.4M1M.build.spiffs_blocksize=8192
 espresso_lite_v2.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 espresso_lite_v2.menu.eesz.4M2M.build.flash_size=4M
@@ -1762,7 +1762,7 @@ espresso_lite_v2.menu.eesz.4M2M.build.spiffs_pagesize=256
 espresso_lite_v2.menu.eesz.4M2M.upload.maximum_size=1044464
 espresso_lite_v2.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 espresso_lite_v2.menu.eesz.4M2M.build.spiffs_start=0x200000
-espresso_lite_v2.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+espresso_lite_v2.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 espresso_lite_v2.menu.eesz.4M2M.build.spiffs_blocksize=8192
 espresso_lite_v2.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 espresso_lite_v2.menu.eesz.4M3M.build.flash_size=4M
@@ -1772,7 +1772,7 @@ espresso_lite_v2.menu.eesz.4M3M.build.spiffs_pagesize=256
 espresso_lite_v2.menu.eesz.4M3M.upload.maximum_size=1044464
 espresso_lite_v2.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 espresso_lite_v2.menu.eesz.4M3M.build.spiffs_start=0x100000
-espresso_lite_v2.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+espresso_lite_v2.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 espresso_lite_v2.menu.eesz.4M3M.build.spiffs_blocksize=8192
 espresso_lite_v2.menu.ResetMethod.ck=ck
 espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=ck
@@ -1943,7 +1943,7 @@ phoenix_v1.menu.eesz.4M1M.build.spiffs_pagesize=256
 phoenix_v1.menu.eesz.4M1M.upload.maximum_size=1044464
 phoenix_v1.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 phoenix_v1.menu.eesz.4M1M.build.spiffs_start=0x300000
-phoenix_v1.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+phoenix_v1.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 phoenix_v1.menu.eesz.4M1M.build.spiffs_blocksize=8192
 phoenix_v1.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 phoenix_v1.menu.eesz.4M2M.build.flash_size=4M
@@ -1953,7 +1953,7 @@ phoenix_v1.menu.eesz.4M2M.build.spiffs_pagesize=256
 phoenix_v1.menu.eesz.4M2M.upload.maximum_size=1044464
 phoenix_v1.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 phoenix_v1.menu.eesz.4M2M.build.spiffs_start=0x200000
-phoenix_v1.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+phoenix_v1.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 phoenix_v1.menu.eesz.4M2M.build.spiffs_blocksize=8192
 phoenix_v1.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 phoenix_v1.menu.eesz.4M3M.build.flash_size=4M
@@ -1963,7 +1963,7 @@ phoenix_v1.menu.eesz.4M3M.build.spiffs_pagesize=256
 phoenix_v1.menu.eesz.4M3M.upload.maximum_size=1044464
 phoenix_v1.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 phoenix_v1.menu.eesz.4M3M.build.spiffs_start=0x100000
-phoenix_v1.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+phoenix_v1.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 phoenix_v1.menu.eesz.4M3M.build.spiffs_blocksize=8192
 phoenix_v1.menu.ResetMethod.ck=ck
 phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=ck
@@ -2134,7 +2134,7 @@ phoenix_v2.menu.eesz.4M1M.build.spiffs_pagesize=256
 phoenix_v2.menu.eesz.4M1M.upload.maximum_size=1044464
 phoenix_v2.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 phoenix_v2.menu.eesz.4M1M.build.spiffs_start=0x300000
-phoenix_v2.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+phoenix_v2.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 phoenix_v2.menu.eesz.4M1M.build.spiffs_blocksize=8192
 phoenix_v2.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 phoenix_v2.menu.eesz.4M2M.build.flash_size=4M
@@ -2144,7 +2144,7 @@ phoenix_v2.menu.eesz.4M2M.build.spiffs_pagesize=256
 phoenix_v2.menu.eesz.4M2M.upload.maximum_size=1044464
 phoenix_v2.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 phoenix_v2.menu.eesz.4M2M.build.spiffs_start=0x200000
-phoenix_v2.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+phoenix_v2.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 phoenix_v2.menu.eesz.4M2M.build.spiffs_blocksize=8192
 phoenix_v2.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 phoenix_v2.menu.eesz.4M3M.build.flash_size=4M
@@ -2154,7 +2154,7 @@ phoenix_v2.menu.eesz.4M3M.build.spiffs_pagesize=256
 phoenix_v2.menu.eesz.4M3M.upload.maximum_size=1044464
 phoenix_v2.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 phoenix_v2.menu.eesz.4M3M.build.spiffs_start=0x100000
-phoenix_v2.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+phoenix_v2.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 phoenix_v2.menu.eesz.4M3M.build.spiffs_blocksize=8192
 phoenix_v2.menu.ResetMethod.ck=ck
 phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=ck
@@ -2326,7 +2326,7 @@ nodemcu.menu.eesz.4M1M.build.spiffs_pagesize=256
 nodemcu.menu.eesz.4M1M.upload.maximum_size=1044464
 nodemcu.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 nodemcu.menu.eesz.4M1M.build.spiffs_start=0x300000
-nodemcu.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+nodemcu.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 nodemcu.menu.eesz.4M1M.build.spiffs_blocksize=8192
 nodemcu.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 nodemcu.menu.eesz.4M2M.build.flash_size=4M
@@ -2336,7 +2336,7 @@ nodemcu.menu.eesz.4M2M.build.spiffs_pagesize=256
 nodemcu.menu.eesz.4M2M.upload.maximum_size=1044464
 nodemcu.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 nodemcu.menu.eesz.4M2M.build.spiffs_start=0x200000
-nodemcu.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+nodemcu.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 nodemcu.menu.eesz.4M2M.build.spiffs_blocksize=8192
 nodemcu.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 nodemcu.menu.eesz.4M3M.build.flash_size=4M
@@ -2346,7 +2346,7 @@ nodemcu.menu.eesz.4M3M.build.spiffs_pagesize=256
 nodemcu.menu.eesz.4M3M.upload.maximum_size=1044464
 nodemcu.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 nodemcu.menu.eesz.4M3M.build.spiffs_start=0x100000
-nodemcu.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+nodemcu.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 nodemcu.menu.eesz.4M3M.build.spiffs_blocksize=8192
 nodemcu.menu.ip.lm2f=v2 Lower Memory
 nodemcu.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -2514,7 +2514,7 @@ nodemcuv2.menu.eesz.4M1M.build.spiffs_pagesize=256
 nodemcuv2.menu.eesz.4M1M.upload.maximum_size=1044464
 nodemcuv2.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 nodemcuv2.menu.eesz.4M1M.build.spiffs_start=0x300000
-nodemcuv2.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+nodemcuv2.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 nodemcuv2.menu.eesz.4M1M.build.spiffs_blocksize=8192
 nodemcuv2.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 nodemcuv2.menu.eesz.4M2M.build.flash_size=4M
@@ -2524,7 +2524,7 @@ nodemcuv2.menu.eesz.4M2M.build.spiffs_pagesize=256
 nodemcuv2.menu.eesz.4M2M.upload.maximum_size=1044464
 nodemcuv2.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 nodemcuv2.menu.eesz.4M2M.build.spiffs_start=0x200000
-nodemcuv2.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+nodemcuv2.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 nodemcuv2.menu.eesz.4M2M.build.spiffs_blocksize=8192
 nodemcuv2.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 nodemcuv2.menu.eesz.4M3M.build.flash_size=4M
@@ -2534,7 +2534,7 @@ nodemcuv2.menu.eesz.4M3M.build.spiffs_pagesize=256
 nodemcuv2.menu.eesz.4M3M.upload.maximum_size=1044464
 nodemcuv2.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 nodemcuv2.menu.eesz.4M3M.build.spiffs_start=0x100000
-nodemcuv2.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+nodemcuv2.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 nodemcuv2.menu.eesz.4M3M.build.spiffs_blocksize=8192
 nodemcuv2.menu.ip.lm2f=v2 Lower Memory
 nodemcuv2.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -2722,7 +2722,7 @@ modwifi.menu.eesz.2M512.build.spiffs_pagesize=256
 modwifi.menu.eesz.2M512.upload.maximum_size=1044464
 modwifi.menu.eesz.2M512.build.rfcal_addr=0x1FC000
 modwifi.menu.eesz.2M512.build.spiffs_start=0x180000
-modwifi.menu.eesz.2M512.build.spiffs_end=0x1FB000
+modwifi.menu.eesz.2M512.build.spiffs_end=0x1FA000
 modwifi.menu.eesz.2M512.build.spiffs_blocksize=8192
 modwifi.menu.eesz.2M1M=2MB (FS:1MB OTA:~512KB)
 modwifi.menu.eesz.2M1M.build.flash_size=2M
@@ -2732,7 +2732,7 @@ modwifi.menu.eesz.2M1M.build.spiffs_pagesize=256
 modwifi.menu.eesz.2M1M.upload.maximum_size=1044464
 modwifi.menu.eesz.2M1M.build.rfcal_addr=0x1FC000
 modwifi.menu.eesz.2M1M.build.spiffs_start=0x100000
-modwifi.menu.eesz.2M1M.build.spiffs_end=0x1FB000
+modwifi.menu.eesz.2M1M.build.spiffs_end=0x1FA000
 modwifi.menu.eesz.2M1M.build.spiffs_blocksize=8192
 modwifi.menu.ip.lm2f=v2 Lower Memory
 modwifi.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -3276,7 +3276,7 @@ esp210.menu.eesz.4M1M.build.spiffs_pagesize=256
 esp210.menu.eesz.4M1M.upload.maximum_size=1044464
 esp210.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 esp210.menu.eesz.4M1M.build.spiffs_start=0x300000
-esp210.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+esp210.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 esp210.menu.eesz.4M1M.build.spiffs_blocksize=8192
 esp210.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 esp210.menu.eesz.4M2M.build.flash_size=4M
@@ -3286,7 +3286,7 @@ esp210.menu.eesz.4M2M.build.spiffs_pagesize=256
 esp210.menu.eesz.4M2M.upload.maximum_size=1044464
 esp210.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 esp210.menu.eesz.4M2M.build.spiffs_start=0x200000
-esp210.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+esp210.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 esp210.menu.eesz.4M2M.build.spiffs_blocksize=8192
 esp210.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 esp210.menu.eesz.4M3M.build.flash_size=4M
@@ -3296,7 +3296,7 @@ esp210.menu.eesz.4M3M.build.spiffs_pagesize=256
 esp210.menu.eesz.4M3M.upload.maximum_size=1044464
 esp210.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 esp210.menu.eesz.4M3M.build.spiffs_start=0x100000
-esp210.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+esp210.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 esp210.menu.eesz.4M3M.build.spiffs_blocksize=8192
 esp210.menu.ip.lm2f=v2 Lower Memory
 esp210.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -3464,7 +3464,7 @@ d1_mini.menu.eesz.4M1M.build.spiffs_pagesize=256
 d1_mini.menu.eesz.4M1M.upload.maximum_size=1044464
 d1_mini.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 d1_mini.menu.eesz.4M1M.build.spiffs_start=0x300000
-d1_mini.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+d1_mini.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 d1_mini.menu.eesz.4M1M.build.spiffs_blocksize=8192
 d1_mini.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 d1_mini.menu.eesz.4M2M.build.flash_size=4M
@@ -3474,7 +3474,7 @@ d1_mini.menu.eesz.4M2M.build.spiffs_pagesize=256
 d1_mini.menu.eesz.4M2M.upload.maximum_size=1044464
 d1_mini.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 d1_mini.menu.eesz.4M2M.build.spiffs_start=0x200000
-d1_mini.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+d1_mini.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 d1_mini.menu.eesz.4M2M.build.spiffs_blocksize=8192
 d1_mini.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 d1_mini.menu.eesz.4M3M.build.flash_size=4M
@@ -3484,7 +3484,7 @@ d1_mini.menu.eesz.4M3M.build.spiffs_pagesize=256
 d1_mini.menu.eesz.4M3M.upload.maximum_size=1044464
 d1_mini.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 d1_mini.menu.eesz.4M3M.build.spiffs_start=0x100000
-d1_mini.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+d1_mini.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 d1_mini.menu.eesz.4M3M.build.spiffs_blocksize=8192
 d1_mini.menu.ip.lm2f=v2 Lower Memory
 d1_mini.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -3645,7 +3645,7 @@ d1_mini_pro.menu.eesz.16M14M.build.spiffs_pagesize=256
 d1_mini_pro.menu.eesz.16M14M.upload.maximum_size=1044464
 d1_mini_pro.menu.eesz.16M14M.build.rfcal_addr=0xFFC000
 d1_mini_pro.menu.eesz.16M14M.build.spiffs_start=0x200000
-d1_mini_pro.menu.eesz.16M14M.build.spiffs_end=0xFFB000
+d1_mini_pro.menu.eesz.16M14M.build.spiffs_end=0xFFA000
 d1_mini_pro.menu.eesz.16M14M.build.spiffs_blocksize=8192
 d1_mini_pro.menu.eesz.16M15M=16MB (FS:15MB OTA:~512KB)
 d1_mini_pro.menu.eesz.16M15M.build.flash_size=16M
@@ -3655,7 +3655,7 @@ d1_mini_pro.menu.eesz.16M15M.build.spiffs_pagesize=256
 d1_mini_pro.menu.eesz.16M15M.upload.maximum_size=1044464
 d1_mini_pro.menu.eesz.16M15M.build.rfcal_addr=0xFFC000
 d1_mini_pro.menu.eesz.16M15M.build.spiffs_start=0x100000
-d1_mini_pro.menu.eesz.16M15M.build.spiffs_end=0xFFB000
+d1_mini_pro.menu.eesz.16M15M.build.spiffs_end=0xFFA000
 d1_mini_pro.menu.eesz.16M15M.build.spiffs_blocksize=8192
 d1_mini_pro.menu.ip.lm2f=v2 Lower Memory
 d1_mini_pro.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -3884,7 +3884,7 @@ d1_mini_lite.menu.eesz.1M512.upload.maximum_size=499696
 d1_mini_lite.menu.eesz.1M512.build.rfcal_addr=0xFC000
 d1_mini_lite.menu.eesz.1M512.build.spiffs_start=0x7B000
 d1_mini_lite.menu.eesz.1M512.build.spiffs_end=0xFB000
-d1_mini_lite.menu.eesz.1M512.build.spiffs_blocksize=4096
+d1_mini_lite.menu.eesz.1M512.build.spiffs_blocksize=8192
 d1_mini_lite.menu.ip.lm2f=v2 Lower Memory
 d1_mini_lite.menu.ip.lm2f.build.lwip_include=lwip2/include
 d1_mini_lite.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -4051,7 +4051,7 @@ d1.menu.eesz.4M1M.build.spiffs_pagesize=256
 d1.menu.eesz.4M1M.upload.maximum_size=1044464
 d1.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 d1.menu.eesz.4M1M.build.spiffs_start=0x300000
-d1.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+d1.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 d1.menu.eesz.4M1M.build.spiffs_blocksize=8192
 d1.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 d1.menu.eesz.4M2M.build.flash_size=4M
@@ -4061,7 +4061,7 @@ d1.menu.eesz.4M2M.build.spiffs_pagesize=256
 d1.menu.eesz.4M2M.upload.maximum_size=1044464
 d1.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 d1.menu.eesz.4M2M.build.spiffs_start=0x200000
-d1.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+d1.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 d1.menu.eesz.4M2M.build.spiffs_blocksize=8192
 d1.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 d1.menu.eesz.4M3M.build.flash_size=4M
@@ -4071,7 +4071,7 @@ d1.menu.eesz.4M3M.build.spiffs_pagesize=256
 d1.menu.eesz.4M3M.upload.maximum_size=1044464
 d1.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 d1.menu.eesz.4M3M.build.spiffs_start=0x100000
-d1.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+d1.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 d1.menu.eesz.4M3M.build.spiffs_blocksize=8192
 d1.menu.ip.lm2f=v2 Lower Memory
 d1.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -4242,7 +4242,7 @@ espino.menu.eesz.4M1M.build.spiffs_pagesize=256
 espino.menu.eesz.4M1M.upload.maximum_size=1044464
 espino.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 espino.menu.eesz.4M1M.build.spiffs_start=0x300000
-espino.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+espino.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 espino.menu.eesz.4M1M.build.spiffs_blocksize=8192
 espino.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 espino.menu.eesz.4M2M.build.flash_size=4M
@@ -4252,7 +4252,7 @@ espino.menu.eesz.4M2M.build.spiffs_pagesize=256
 espino.menu.eesz.4M2M.upload.maximum_size=1044464
 espino.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 espino.menu.eesz.4M2M.build.spiffs_start=0x200000
-espino.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+espino.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 espino.menu.eesz.4M2M.build.spiffs_blocksize=8192
 espino.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 espino.menu.eesz.4M3M.build.flash_size=4M
@@ -4262,7 +4262,7 @@ espino.menu.eesz.4M3M.build.spiffs_pagesize=256
 espino.menu.eesz.4M3M.upload.maximum_size=1044464
 espino.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 espino.menu.eesz.4M3M.build.spiffs_start=0x100000
-espino.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+espino.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 espino.menu.eesz.4M3M.build.spiffs_blocksize=8192
 espino.menu.ip.lm2f=v2 Lower Memory
 espino.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -4430,7 +4430,7 @@ espinotee.menu.eesz.4M1M.build.spiffs_pagesize=256
 espinotee.menu.eesz.4M1M.upload.maximum_size=1044464
 espinotee.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 espinotee.menu.eesz.4M1M.build.spiffs_start=0x300000
-espinotee.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+espinotee.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 espinotee.menu.eesz.4M1M.build.spiffs_blocksize=8192
 espinotee.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 espinotee.menu.eesz.4M2M.build.flash_size=4M
@@ -4440,7 +4440,7 @@ espinotee.menu.eesz.4M2M.build.spiffs_pagesize=256
 espinotee.menu.eesz.4M2M.upload.maximum_size=1044464
 espinotee.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 espinotee.menu.eesz.4M2M.build.spiffs_start=0x200000
-espinotee.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+espinotee.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 espinotee.menu.eesz.4M2M.build.spiffs_blocksize=8192
 espinotee.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 espinotee.menu.eesz.4M3M.build.flash_size=4M
@@ -4450,7 +4450,7 @@ espinotee.menu.eesz.4M3M.build.spiffs_pagesize=256
 espinotee.menu.eesz.4M3M.upload.maximum_size=1044464
 espinotee.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 espinotee.menu.eesz.4M3M.build.spiffs_start=0x100000
-espinotee.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+espinotee.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 espinotee.menu.eesz.4M3M.build.spiffs_blocksize=8192
 espinotee.menu.ip.lm2f=v2 Lower Memory
 espinotee.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -4699,7 +4699,7 @@ wifinfo.menu.eesz.1M512.upload.maximum_size=499696
 wifinfo.menu.eesz.1M512.build.rfcal_addr=0xFC000
 wifinfo.menu.eesz.1M512.build.spiffs_start=0x7B000
 wifinfo.menu.eesz.1M512.build.spiffs_end=0xFB000
-wifinfo.menu.eesz.1M512.build.spiffs_blocksize=4096
+wifinfo.menu.eesz.1M512.build.spiffs_blocksize=8192
 wifinfo.menu.ip.lm2f=v2 Lower Memory
 wifinfo.menu.ip.lm2f.build.lwip_include=lwip2/include
 wifinfo.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -4878,7 +4878,7 @@ arduino-esp8266.menu.eesz.4M1M.build.spiffs_pagesize=256
 arduino-esp8266.menu.eesz.4M1M.upload.maximum_size=1044464
 arduino-esp8266.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 arduino-esp8266.menu.eesz.4M1M.build.spiffs_start=0x300000
-arduino-esp8266.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+arduino-esp8266.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 arduino-esp8266.menu.eesz.4M1M.build.spiffs_blocksize=8192
 arduino-esp8266.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 arduino-esp8266.menu.eesz.4M2M.build.flash_size=4M
@@ -4888,7 +4888,7 @@ arduino-esp8266.menu.eesz.4M2M.build.spiffs_pagesize=256
 arduino-esp8266.menu.eesz.4M2M.upload.maximum_size=1044464
 arduino-esp8266.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 arduino-esp8266.menu.eesz.4M2M.build.spiffs_start=0x200000
-arduino-esp8266.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+arduino-esp8266.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 arduino-esp8266.menu.eesz.4M2M.build.spiffs_blocksize=8192
 arduino-esp8266.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 arduino-esp8266.menu.eesz.4M3M.build.flash_size=4M
@@ -4898,7 +4898,7 @@ arduino-esp8266.menu.eesz.4M3M.build.spiffs_pagesize=256
 arduino-esp8266.menu.eesz.4M3M.upload.maximum_size=1044464
 arduino-esp8266.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 arduino-esp8266.menu.eesz.4M3M.build.spiffs_start=0x100000
-arduino-esp8266.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+arduino-esp8266.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 arduino-esp8266.menu.eesz.4M3M.build.spiffs_blocksize=8192
 arduino-esp8266.menu.ip.lm2f=v2 Lower Memory
 arduino-esp8266.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -5256,7 +5256,7 @@ oak.menu.eesz.4M1M.build.spiffs_pagesize=256
 oak.menu.eesz.4M1M.upload.maximum_size=1044464
 oak.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 oak.menu.eesz.4M1M.build.spiffs_start=0x300000
-oak.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+oak.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 oak.menu.eesz.4M1M.build.spiffs_blocksize=8192
 oak.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 oak.menu.eesz.4M2M.build.flash_size=4M
@@ -5266,7 +5266,7 @@ oak.menu.eesz.4M2M.build.spiffs_pagesize=256
 oak.menu.eesz.4M2M.upload.maximum_size=1044464
 oak.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 oak.menu.eesz.4M2M.build.spiffs_start=0x200000
-oak.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+oak.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 oak.menu.eesz.4M2M.build.spiffs_blocksize=8192
 oak.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 oak.menu.eesz.4M3M.build.flash_size=4M
@@ -5276,7 +5276,7 @@ oak.menu.eesz.4M3M.build.spiffs_pagesize=256
 oak.menu.eesz.4M3M.upload.maximum_size=1044464
 oak.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 oak.menu.eesz.4M3M.build.spiffs_start=0x100000
-oak.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+oak.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 oak.menu.eesz.4M3M.build.spiffs_blocksize=8192
 oak.menu.ip.lm2f=v2 Lower Memory
 oak.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -5444,7 +5444,7 @@ wifiduino.menu.eesz.4M1M.build.spiffs_pagesize=256
 wifiduino.menu.eesz.4M1M.upload.maximum_size=1044464
 wifiduino.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 wifiduino.menu.eesz.4M1M.build.spiffs_start=0x300000
-wifiduino.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+wifiduino.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 wifiduino.menu.eesz.4M1M.build.spiffs_blocksize=8192
 wifiduino.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 wifiduino.menu.eesz.4M2M.build.flash_size=4M
@@ -5454,7 +5454,7 @@ wifiduino.menu.eesz.4M2M.build.spiffs_pagesize=256
 wifiduino.menu.eesz.4M2M.upload.maximum_size=1044464
 wifiduino.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 wifiduino.menu.eesz.4M2M.build.spiffs_start=0x200000
-wifiduino.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+wifiduino.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 wifiduino.menu.eesz.4M2M.build.spiffs_blocksize=8192
 wifiduino.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 wifiduino.menu.eesz.4M3M.build.flash_size=4M
@@ -5464,7 +5464,7 @@ wifiduino.menu.eesz.4M3M.build.spiffs_pagesize=256
 wifiduino.menu.eesz.4M3M.upload.maximum_size=1044464
 wifiduino.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 wifiduino.menu.eesz.4M3M.build.spiffs_start=0x100000
-wifiduino.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+wifiduino.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 wifiduino.menu.eesz.4M3M.build.spiffs_blocksize=8192
 wifiduino.menu.ip.lm2f=v2 Lower Memory
 wifiduino.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -5706,7 +5706,7 @@ wifi_slot.menu.eesz.1M512.upload.maximum_size=499696
 wifi_slot.menu.eesz.1M512.build.rfcal_addr=0xFC000
 wifi_slot.menu.eesz.1M512.build.spiffs_start=0x7B000
 wifi_slot.menu.eesz.1M512.build.spiffs_end=0xFB000
-wifi_slot.menu.eesz.1M512.build.spiffs_blocksize=4096
+wifi_slot.menu.eesz.1M512.build.spiffs_blocksize=8192
 wifi_slot.menu.eesz.2M=2MB (FS:no OTA:~1019KB)
 wifi_slot.menu.eesz.2M.build.flash_size=2M
 wifi_slot.menu.eesz.2M.build.flash_size_bytes=0x200000
@@ -5742,7 +5742,7 @@ wifi_slot.menu.eesz.2M512.build.spiffs_pagesize=256
 wifi_slot.menu.eesz.2M512.upload.maximum_size=1044464
 wifi_slot.menu.eesz.2M512.build.rfcal_addr=0x1FC000
 wifi_slot.menu.eesz.2M512.build.spiffs_start=0x180000
-wifi_slot.menu.eesz.2M512.build.spiffs_end=0x1FB000
+wifi_slot.menu.eesz.2M512.build.spiffs_end=0x1FA000
 wifi_slot.menu.eesz.2M512.build.spiffs_blocksize=8192
 wifi_slot.menu.eesz.2M1M=2MB (FS:1MB OTA:~512KB)
 wifi_slot.menu.eesz.2M1M.build.flash_size=2M
@@ -5752,7 +5752,7 @@ wifi_slot.menu.eesz.2M1M.build.spiffs_pagesize=256
 wifi_slot.menu.eesz.2M1M.upload.maximum_size=1044464
 wifi_slot.menu.eesz.2M1M.build.rfcal_addr=0x1FC000
 wifi_slot.menu.eesz.2M1M.build.spiffs_start=0x100000
-wifi_slot.menu.eesz.2M1M.build.spiffs_end=0x1FB000
+wifi_slot.menu.eesz.2M1M.build.spiffs_end=0x1FA000
 wifi_slot.menu.eesz.2M1M.build.spiffs_blocksize=8192
 wifi_slot.menu.ip.lm2f=v2 Lower Memory
 wifi_slot.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -5920,7 +5920,7 @@ wiolink.menu.eesz.4M1M.build.spiffs_pagesize=256
 wiolink.menu.eesz.4M1M.upload.maximum_size=1044464
 wiolink.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 wiolink.menu.eesz.4M1M.build.spiffs_start=0x300000
-wiolink.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+wiolink.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 wiolink.menu.eesz.4M1M.build.spiffs_blocksize=8192
 wiolink.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 wiolink.menu.eesz.4M2M.build.flash_size=4M
@@ -5930,7 +5930,7 @@ wiolink.menu.eesz.4M2M.build.spiffs_pagesize=256
 wiolink.menu.eesz.4M2M.upload.maximum_size=1044464
 wiolink.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 wiolink.menu.eesz.4M2M.build.spiffs_start=0x200000
-wiolink.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+wiolink.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 wiolink.menu.eesz.4M2M.build.spiffs_blocksize=8192
 wiolink.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 wiolink.menu.eesz.4M3M.build.flash_size=4M
@@ -5940,7 +5940,7 @@ wiolink.menu.eesz.4M3M.build.spiffs_pagesize=256
 wiolink.menu.eesz.4M3M.upload.maximum_size=1044464
 wiolink.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 wiolink.menu.eesz.4M3M.build.spiffs_start=0x100000
-wiolink.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+wiolink.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 wiolink.menu.eesz.4M3M.build.spiffs_blocksize=8192
 wiolink.menu.ip.lm2f=v2 Lower Memory
 wiolink.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -6108,7 +6108,7 @@ espectro.menu.eesz.4M1M.build.spiffs_pagesize=256
 espectro.menu.eesz.4M1M.upload.maximum_size=1044464
 espectro.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
 espectro.menu.eesz.4M1M.build.spiffs_start=0x300000
-espectro.menu.eesz.4M1M.build.spiffs_end=0x3FB000
+espectro.menu.eesz.4M1M.build.spiffs_end=0x3FA000
 espectro.menu.eesz.4M1M.build.spiffs_blocksize=8192
 espectro.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
 espectro.menu.eesz.4M2M.build.flash_size=4M
@@ -6118,7 +6118,7 @@ espectro.menu.eesz.4M2M.build.spiffs_pagesize=256
 espectro.menu.eesz.4M2M.upload.maximum_size=1044464
 espectro.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
 espectro.menu.eesz.4M2M.build.spiffs_start=0x200000
-espectro.menu.eesz.4M2M.build.spiffs_end=0x3FB000
+espectro.menu.eesz.4M2M.build.spiffs_end=0x3FA000
 espectro.menu.eesz.4M2M.build.spiffs_blocksize=8192
 espectro.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
 espectro.menu.eesz.4M3M.build.flash_size=4M
@@ -6128,7 +6128,7 @@ espectro.menu.eesz.4M3M.build.spiffs_pagesize=256
 espectro.menu.eesz.4M3M.upload.maximum_size=1044464
 espectro.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
 espectro.menu.eesz.4M3M.build.spiffs_start=0x100000
-espectro.menu.eesz.4M3M.build.spiffs_end=0x3FB000
+espectro.menu.eesz.4M3M.build.spiffs_end=0x3FA000
 espectro.menu.eesz.4M3M.build.spiffs_blocksize=8192
 espectro.menu.ip.lm2f=v2 Lower Memory
 espectro.menu.ip.lm2f.build.lwip_include=lwip2/include
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
index d1de116a6..10a628599 100755
--- a/tools/boards.txt.py
+++ b/tools/boards.txt.py
@@ -1161,7 +1161,7 @@ def all_debug ():
 ################################################################
 # flash size
 
-def flash_map (flashsize_kb, spiffs_kb = 0):
+def flash_map (flashsize_kb, fs_kb = 0):
 
     # mapping:
     # flash | reserved | empty | spiffs | eeprom | rf-cal | sdk-wifi-settings
@@ -1172,29 +1172,32 @@ def flash_map (flashsize_kb, spiffs_kb = 0):
     eeprom_size_kb = 4
     rfcal_size_kb = 4
     sdkwifi_size_kb = 12
-    spiffs_end = (flashsize_kb - sdkwifi_size_kb - rfcal_size_kb - eeprom_size_kb) * 1024
+    fs_end = (flashsize_kb - sdkwifi_size_kb - rfcal_size_kb - eeprom_size_kb) * 1024
     rfcal_addr = (flashsize_kb - sdkwifi_size_kb - rfcal_size_kb) * 1024
     if flashsize_kb <= 1024:
-        max_upload_size = (flashsize_kb - (spiffs_kb + eeprom_size_kb + rfcal_size_kb + sdkwifi_size_kb)) * 1024 - reserved
-        spiffs_start = spiffs_end - spiffs_kb * 1024
-        spiffs_blocksize = 4096
+        max_upload_size = (flashsize_kb - (fs_kb + eeprom_size_kb + rfcal_size_kb + sdkwifi_size_kb)) * 1024 - reserved
+        fs_start = fs_end - fs_kb * 1024
     else:
         max_upload_size = 1024 * 1024 - reserved
-        spiffs_start = (flashsize_kb - spiffs_kb) * 1024
-        if spiffs_kb < 512:
-            spiffs_blocksize = 4096
-        else:
-            spiffs_blocksize = 8192
+        fs_start = (flashsize_kb - fs_kb) * 1024
 
-    max_ota_size = min(max_upload_size, spiffs_start / 2) # =(max_upload_size+empty_size)/2
+    if fs_kb < 512:
+        fs_blocksize = 4096
+    else:
+        fs_blocksize = 8192
+
+    # Adjust SPIFFS_end to be a multiple of the block size
+    fs_end = fs_blocksize * (int)((fs_end - fs_start)/fs_blocksize) + fs_start;
+
+    max_ota_size = min(max_upload_size, fs_start / 2) # =(max_upload_size+empty_size)/2
     strsize = str(int(flashsize_kb / 1024)) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K'
-    strspiffs = str(int(spiffs_kb / 1024)) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) + 'K'
-    strspiffs_strip = str(int(spiffs_kb / 1024)) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) if (spiffs_kb > 0) else ''
+    strfs = str(int(fs_kb / 1024)) + 'M' if (fs_kb >= 1024) else str(fs_kb) + 'K'
+    strfs_strip = str(int(fs_kb / 1024)) + 'M' if (fs_kb >= 1024) else str(fs_kb) if (fs_kb > 0) else ''
 
-    ld = 'eagle.flash.' + strsize.lower() + strspiffs_strip.lower() + '.ld'
-    menu = '.menu.eesz.' + strsize + strspiffs_strip
+    ld = 'eagle.flash.' + strsize.lower() + strfs_strip.lower() + '.ld'
+    menu = '.menu.eesz.' + strsize + strfs_strip
     menub = menu + '.build.'
-    desc = 'no' if (spiffs_kb == 0) else strspiffs + 'B'
+    desc = 'no' if (fs_kb == 0) else strfs + 'B'
     d = collections.OrderedDict([
         ( menu, strsize + 'B (FS:' + desc + ' OTA:~%iKB)' % (max_ota_size / 1024)),
         ( menub + 'flash_size', strsize ),
@@ -1204,11 +1207,11 @@ def flash_map (flashsize_kb, spiffs_kb = 0):
         ( menu + '.upload.maximum_size', "%i" % max_upload_size ),
         ( menub + 'rfcal_addr', "0x%X" % rfcal_addr)
         ])
-    if spiffs_kb > 0:
+    if fs_kb > 0:
         d.update(collections.OrderedDict([
-            ( menub + 'spiffs_start', "0x%05X" % spiffs_start ),
-            ( menub + 'spiffs_end', "0x%05X" % spiffs_end ),
-            ( menub + 'spiffs_blocksize', "%i" % spiffs_blocksize ),
+            ( menub + 'spiffs_start', "0x%05X" % fs_start ),
+            ( menub + 'spiffs_end', "0x%05X" % fs_end ),
+            ( menub + 'spiffs_blocksize', "%i" % fs_blocksize ),
             ]))
 
     if ldshow:
@@ -1224,23 +1227,19 @@ def flash_map (flashsize_kb, spiffs_kb = 0):
             realstdout = sys.stdout
             sys.stdout = open(lddir + ld, 'w')
 
-        if spiffs_kb == 0:
-            spiffs_start = spiffs_end
+        if fs_kb == 0:
+            fs_start = fs_end
             page = 0
-            block = 0
-        elif spiffs_kb < 0x80000 / 1024:
-            page = 0x100
-            block = 0x1000
+            fs_blocksize = 0
         else:
             page = 0x100
-            block = 0x2000
 
         print("/* Flash Split for %s chips */" % strsize)
         print("/* sketch @0x%X (~%dKB) (%dB) */" % (spi, (max_upload_size / 1024), max_upload_size))
-        empty_size = spiffs_start - max_upload_size
+        empty_size = fs_start - max_upload_size
         if empty_size > 0:
             print("/* empty  @0x%X (~%dKB) (%dB) */" % (spi + max_upload_size, empty_size / 1024, empty_size))
-        print("/* spiffs @0x%X (~%dKB) (%dB) */" % (spi + spiffs_start, ((spiffs_end - spiffs_start) / 1024), spiffs_end - spiffs_start))
+        print("/* spiffs @0x%X (~%dKB) (%dB) */" % (spi + fs_start, ((fs_end - fs_start) / 1024), fs_end - fs_start))
         print("/* eeprom @0x%X (%dKB) */" % (spi + rfcal_addr - eeprom_size_kb * 1024, eeprom_size_kb))
         print("/* rfcal  @0x%X (%dKB) */" % (spi + rfcal_addr, rfcal_size_kb))
         print("/* wifi   @0x%X (%dKB) */" % (spi + rfcal_addr + rfcal_size_kb * 1024, sdkwifi_size_kb))
@@ -1253,10 +1252,10 @@ def flash_map (flashsize_kb, spiffs_kb = 0):
         print("  irom0_0_seg :                         org = 0x40201010, len = 0x%x" % max_upload_size)
         print("}")
         print("")
-        print("PROVIDE ( _FS_start = 0x%08X );" % (0x40200000 + spiffs_start))
-        print("PROVIDE ( _FS_end = 0x%08X );" % (0x40200000 + spiffs_end))
+        print("PROVIDE ( _FS_start = 0x%08X );" % (0x40200000 + fs_start))
+        print("PROVIDE ( _FS_end = 0x%08X );" % (0x40200000 + fs_end))
         print("PROVIDE ( _FS_page = 0x%X );" % page)
-        print("PROVIDE ( _FS_block = 0x%X );" % block)
+        print("PROVIDE ( _FS_block = 0x%X );" % fs_blocksize)
         print("")
         print('INCLUDE "local.eagle.app.v6.common.ld"')
 
diff --git a/tools/sdk/ld/eagle.flash.16m14m.ld b/tools/sdk/ld/eagle.flash.16m14m.ld
index cba3a57b4..ccc5eb828 100644
--- a/tools/sdk/ld/eagle.flash.16m14m.ld
+++ b/tools/sdk/ld/eagle.flash.16m14m.ld
@@ -1,7 +1,7 @@
 /* Flash Split for 16M chips */
 /* sketch @0x40200000 (~1019KB) (1044464B) */
 /* empty  @0x402FEFF0 (~1028KB) (1052688B) */
-/* spiffs @0x40400000 (~14316KB) (14659584B) */
+/* spiffs @0x40400000 (~14312KB) (14655488B) */
 /* eeprom @0x411FB000 (4KB) */
 /* rfcal  @0x411FC000 (4KB) */
 /* wifi   @0x411FD000 (12KB) */
@@ -15,7 +15,7 @@ MEMORY
 }
 
 PROVIDE ( _FS_start = 0x40400000 );
-PROVIDE ( _FS_end = 0x411FB000 );
+PROVIDE ( _FS_end = 0x411FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
 
diff --git a/tools/sdk/ld/eagle.flash.16m15m.ld b/tools/sdk/ld/eagle.flash.16m15m.ld
index 4e4c30a8d..dcb650f66 100644
--- a/tools/sdk/ld/eagle.flash.16m15m.ld
+++ b/tools/sdk/ld/eagle.flash.16m15m.ld
@@ -1,7 +1,7 @@
 /* Flash Split for 16M chips */
 /* sketch @0x40200000 (~1019KB) (1044464B) */
 /* empty  @0x402FEFF0 (~4KB) (4112B) */
-/* spiffs @0x40300000 (~15340KB) (15708160B) */
+/* spiffs @0x40300000 (~15336KB) (15704064B) */
 /* eeprom @0x411FB000 (4KB) */
 /* rfcal  @0x411FC000 (4KB) */
 /* wifi   @0x411FD000 (12KB) */
@@ -15,7 +15,7 @@ MEMORY
 }
 
 PROVIDE ( _FS_start = 0x40300000 );
-PROVIDE ( _FS_end = 0x411FB000 );
+PROVIDE ( _FS_end = 0x411FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
 
diff --git a/tools/sdk/ld/eagle.flash.2m1m.ld b/tools/sdk/ld/eagle.flash.2m1m.ld
index 2e0cbe704..21195281e 100644
--- a/tools/sdk/ld/eagle.flash.2m1m.ld
+++ b/tools/sdk/ld/eagle.flash.2m1m.ld
@@ -1,7 +1,7 @@
 /* Flash Split for 2M chips */
 /* sketch @0x40200000 (~1019KB) (1044464B) */
 /* empty  @0x402FEFF0 (~4KB) (4112B) */
-/* spiffs @0x40300000 (~1004KB) (1028096B) */
+/* spiffs @0x40300000 (~1000KB) (1024000B) */
 /* eeprom @0x403FB000 (4KB) */
 /* rfcal  @0x403FC000 (4KB) */
 /* wifi   @0x403FD000 (12KB) */
@@ -15,7 +15,7 @@ MEMORY
 }
 
 PROVIDE ( _FS_start = 0x40300000 );
-PROVIDE ( _FS_end = 0x403FB000 );
+PROVIDE ( _FS_end = 0x403FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
 
diff --git a/tools/sdk/ld/eagle.flash.2m512.ld b/tools/sdk/ld/eagle.flash.2m512.ld
index 7f3b264ea..a6015dd2d 100644
--- a/tools/sdk/ld/eagle.flash.2m512.ld
+++ b/tools/sdk/ld/eagle.flash.2m512.ld
@@ -1,7 +1,7 @@
 /* Flash Split for 2M chips */
 /* sketch @0x40200000 (~1019KB) (1044464B) */
 /* empty  @0x402FEFF0 (~516KB) (528400B) */
-/* spiffs @0x40380000 (~492KB) (503808B) */
+/* spiffs @0x40380000 (~488KB) (499712B) */
 /* eeprom @0x403FB000 (4KB) */
 /* rfcal  @0x403FC000 (4KB) */
 /* wifi   @0x403FD000 (12KB) */
@@ -15,7 +15,7 @@ MEMORY
 }
 
 PROVIDE ( _FS_start = 0x40380000 );
-PROVIDE ( _FS_end = 0x403FB000 );
+PROVIDE ( _FS_end = 0x403FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
 
diff --git a/tools/sdk/ld/eagle.flash.4m1m.ld b/tools/sdk/ld/eagle.flash.4m1m.ld
index 9feb6039d..4d295e306 100644
--- a/tools/sdk/ld/eagle.flash.4m1m.ld
+++ b/tools/sdk/ld/eagle.flash.4m1m.ld
@@ -1,7 +1,7 @@
 /* Flash Split for 4M chips */
 /* sketch @0x40200000 (~1019KB) (1044464B) */
 /* empty  @0x402FEFF0 (~2052KB) (2101264B) */
-/* spiffs @0x40500000 (~1004KB) (1028096B) */
+/* spiffs @0x40500000 (~1000KB) (1024000B) */
 /* eeprom @0x405FB000 (4KB) */
 /* rfcal  @0x405FC000 (4KB) */
 /* wifi   @0x405FD000 (12KB) */
@@ -15,7 +15,7 @@ MEMORY
 }
 
 PROVIDE ( _FS_start = 0x40500000 );
-PROVIDE ( _FS_end = 0x405FB000 );
+PROVIDE ( _FS_end = 0x405FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
 
diff --git a/tools/sdk/ld/eagle.flash.4m2m.ld b/tools/sdk/ld/eagle.flash.4m2m.ld
index 5fe26ccd9..d7034237c 100644
--- a/tools/sdk/ld/eagle.flash.4m2m.ld
+++ b/tools/sdk/ld/eagle.flash.4m2m.ld
@@ -1,7 +1,7 @@
 /* Flash Split for 4M chips */
 /* sketch @0x40200000 (~1019KB) (1044464B) */
 /* empty  @0x402FEFF0 (~1028KB) (1052688B) */
-/* spiffs @0x40400000 (~2028KB) (2076672B) */
+/* spiffs @0x40400000 (~2024KB) (2072576B) */
 /* eeprom @0x405FB000 (4KB) */
 /* rfcal  @0x405FC000 (4KB) */
 /* wifi   @0x405FD000 (12KB) */
@@ -15,7 +15,7 @@ MEMORY
 }
 
 PROVIDE ( _FS_start = 0x40400000 );
-PROVIDE ( _FS_end = 0x405FB000 );
+PROVIDE ( _FS_end = 0x405FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
 
diff --git a/tools/sdk/ld/eagle.flash.4m3m.ld b/tools/sdk/ld/eagle.flash.4m3m.ld
index f4e9e2461..604ed2fa5 100644
--- a/tools/sdk/ld/eagle.flash.4m3m.ld
+++ b/tools/sdk/ld/eagle.flash.4m3m.ld
@@ -1,7 +1,7 @@
 /* Flash Split for 4M chips */
 /* sketch @0x40200000 (~1019KB) (1044464B) */
 /* empty  @0x402FEFF0 (~4KB) (4112B) */
-/* spiffs @0x40300000 (~3052KB) (3125248B) */
+/* spiffs @0x40300000 (~3048KB) (3121152B) */
 /* eeprom @0x405FB000 (4KB) */
 /* rfcal  @0x405FC000 (4KB) */
 /* wifi   @0x405FD000 (12KB) */
@@ -15,7 +15,7 @@ MEMORY
 }
 
 PROVIDE ( _FS_start = 0x40300000 );
-PROVIDE ( _FS_end = 0x405FB000 );
+PROVIDE ( _FS_end = 0x405FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
 
diff --git a/tools/sdk/ld/eagle.flash.8m6m.ld b/tools/sdk/ld/eagle.flash.8m6m.ld
index c0cd9ed40..2b2671602 100644
--- a/tools/sdk/ld/eagle.flash.8m6m.ld
+++ b/tools/sdk/ld/eagle.flash.8m6m.ld
@@ -1,7 +1,7 @@
 /* Flash Split for 8M chips */
 /* sketch @0x40200000 (~1019KB) (1044464B) */
 /* empty  @0x402FEFF0 (~1028KB) (1052688B) */
-/* spiffs @0x40400000 (~6124KB) (6270976B) */
+/* spiffs @0x40400000 (~6120KB) (6266880B) */
 /* eeprom @0x409FB000 (4KB) */
 /* rfcal  @0x409FC000 (4KB) */
 /* wifi   @0x409FD000 (12KB) */
@@ -15,7 +15,7 @@ MEMORY
 }
 
 PROVIDE ( _FS_start = 0x40400000 );
-PROVIDE ( _FS_end = 0x409FB000 );
+PROVIDE ( _FS_end = 0x409FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
 
diff --git a/tools/sdk/ld/eagle.flash.8m7m.ld b/tools/sdk/ld/eagle.flash.8m7m.ld
index c5f7c2655..2dae7ac7f 100644
--- a/tools/sdk/ld/eagle.flash.8m7m.ld
+++ b/tools/sdk/ld/eagle.flash.8m7m.ld
@@ -1,7 +1,7 @@
 /* Flash Split for 8M chips */
 /* sketch @0x40200000 (~1019KB) (1044464B) */
 /* empty  @0x402FEFF0 (~4KB) (4112B) */
-/* spiffs @0x40300000 (~7148KB) (7319552B) */
+/* spiffs @0x40300000 (~7144KB) (7315456B) */
 /* eeprom @0x409FB000 (4KB) */
 /* rfcal  @0x409FC000 (4KB) */
 /* wifi   @0x409FD000 (12KB) */
@@ -15,7 +15,7 @@ MEMORY
 }
 
 PROVIDE ( _FS_start = 0x40300000 );
-PROVIDE ( _FS_end = 0x409FB000 );
+PROVIDE ( _FS_end = 0x409FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );