diff --git a/libraries/EEPROM/EEPROM.cpp b/libraries/EEPROM/EEPROM.cpp
index fa1aa3ee06..3410b35de9 100644
--- a/libraries/EEPROM/EEPROM.cpp
+++ b/libraries/EEPROM/EEPROM.cpp
@@ -30,7 +30,7 @@ extern "C" {
 #include "spi_flash.h"
 }
 
-extern "C" uint32_t _FS_end;
+extern "C" uint32_t _EEPROM_start;
 
 EEPROMClass::EEPROMClass(uint32_t sector)
 : _sector(sector)
@@ -41,7 +41,7 @@ EEPROMClass::EEPROMClass(uint32_t sector)
 }
 
 EEPROMClass::EEPROMClass(void)
-: _sector((((uint32_t)&_FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE))
+: _sector((((uint32_t)&_EEPROM_start - 0x40200000) / SPI_FLASH_SEC_SIZE))
 , _data(0)
 , _size(0)
 , _dirty(false)
diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json
index cc4e3f866d..709238253c 100644
--- a/package/package_esp8266com_index.template.json
+++ b/package/package_esp8266com_index.template.json
@@ -359,4 +359,4 @@
          ]
       }
    ]
-}
+}
\ No newline at end of file
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
index 3d8c947b29..eea090f420 100755
--- a/tools/boards.txt.py
+++ b/tools/boards.txt.py
@@ -1181,6 +1181,11 @@ def flash_map (flashsize_kb, fs_kb = 0):
     rfcal_size_kb = 4
     sdkwifi_size_kb = 12
     fs_end = (flashsize_kb - sdkwifi_size_kb - rfcal_size_kb - eeprom_size_kb) * 1024
+
+    # For legacy reasons (#6531), the EEPROM sector needs to be at the old
+    # FS_end calculated without regards to block size
+    eeprom_start = fs_end
+
     rfcal_addr = (flashsize_kb - sdkwifi_size_kb - rfcal_size_kb) * 1024
     if flashsize_kb <= 1024:
         max_upload_size = (flashsize_kb - (fs_kb + eeprom_size_kb + rfcal_size_kb + sdkwifi_size_kb)) * 1024 - reserved
@@ -1264,6 +1269,7 @@ def flash_map (flashsize_kb, fs_kb = 0):
         print("PROVIDE ( _FS_end = 0x%08X );" % (0x40200000 + fs_end))
         print("PROVIDE ( _FS_page = 0x%X );" % page)
         print("PROVIDE ( _FS_block = 0x%X );" % fs_blocksize)
+        print("PROVIDE ( _EEPROM_start = 0x%08x );" % (0x40200000 + eeprom_start))
         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 ccc5eb828c..1895bfacc8 100644
--- a/tools/sdk/ld/eagle.flash.16m14m.ld
+++ b/tools/sdk/ld/eagle.flash.16m14m.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x40400000 );
 PROVIDE ( _FS_end = 0x411FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
+PROVIDE ( _EEPROM_start = 0x411fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.16m15m.ld b/tools/sdk/ld/eagle.flash.16m15m.ld
index dcb650f662..c4dd056646 100644
--- a/tools/sdk/ld/eagle.flash.16m15m.ld
+++ b/tools/sdk/ld/eagle.flash.16m15m.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x40300000 );
 PROVIDE ( _FS_end = 0x411FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
+PROVIDE ( _EEPROM_start = 0x411fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.1m.ld b/tools/sdk/ld/eagle.flash.1m.ld
index 57c8ab2da6..a21d71e502 100644
--- a/tools/sdk/ld/eagle.flash.1m.ld
+++ b/tools/sdk/ld/eagle.flash.1m.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x402FB000 );
 PROVIDE ( _FS_end = 0x402FB000 );
 PROVIDE ( _FS_page = 0x0 );
 PROVIDE ( _FS_block = 0x0 );
+PROVIDE ( _EEPROM_start = 0x402fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.1m128.ld b/tools/sdk/ld/eagle.flash.1m128.ld
index 729f613986..63de63d987 100644
--- a/tools/sdk/ld/eagle.flash.1m128.ld
+++ b/tools/sdk/ld/eagle.flash.1m128.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x402DB000 );
 PROVIDE ( _FS_end = 0x402FB000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x1000 );
+PROVIDE ( _EEPROM_start = 0x402fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.1m144.ld b/tools/sdk/ld/eagle.flash.1m144.ld
index e644897c49..f466f9e35a 100644
--- a/tools/sdk/ld/eagle.flash.1m144.ld
+++ b/tools/sdk/ld/eagle.flash.1m144.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x402D7000 );
 PROVIDE ( _FS_end = 0x402FB000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x1000 );
+PROVIDE ( _EEPROM_start = 0x402fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.1m160.ld b/tools/sdk/ld/eagle.flash.1m160.ld
index 08b54f51f1..8e567fca35 100644
--- a/tools/sdk/ld/eagle.flash.1m160.ld
+++ b/tools/sdk/ld/eagle.flash.1m160.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x402D3000 );
 PROVIDE ( _FS_end = 0x402FB000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x1000 );
+PROVIDE ( _EEPROM_start = 0x402fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.1m192.ld b/tools/sdk/ld/eagle.flash.1m192.ld
index 77ddac33db..cea01a527b 100644
--- a/tools/sdk/ld/eagle.flash.1m192.ld
+++ b/tools/sdk/ld/eagle.flash.1m192.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x402CB000 );
 PROVIDE ( _FS_end = 0x402FB000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x1000 );
+PROVIDE ( _EEPROM_start = 0x402fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.1m256.ld b/tools/sdk/ld/eagle.flash.1m256.ld
index b197a2b1cc..2c2e9bed81 100644
--- a/tools/sdk/ld/eagle.flash.1m256.ld
+++ b/tools/sdk/ld/eagle.flash.1m256.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x402BB000 );
 PROVIDE ( _FS_end = 0x402FB000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x1000 );
+PROVIDE ( _EEPROM_start = 0x402fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.1m512.ld b/tools/sdk/ld/eagle.flash.1m512.ld
index 811f7a1505..9858694e08 100644
--- a/tools/sdk/ld/eagle.flash.1m512.ld
+++ b/tools/sdk/ld/eagle.flash.1m512.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x4027B000 );
 PROVIDE ( _FS_end = 0x402FB000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
+PROVIDE ( _EEPROM_start = 0x402fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.1m64.ld b/tools/sdk/ld/eagle.flash.1m64.ld
index 92447c0f9c..18cee2c271 100644
--- a/tools/sdk/ld/eagle.flash.1m64.ld
+++ b/tools/sdk/ld/eagle.flash.1m64.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x402EB000 );
 PROVIDE ( _FS_end = 0x402FB000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x1000 );
+PROVIDE ( _EEPROM_start = 0x402fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.2m.ld b/tools/sdk/ld/eagle.flash.2m.ld
index 00b11a0734..72832b4434 100644
--- a/tools/sdk/ld/eagle.flash.2m.ld
+++ b/tools/sdk/ld/eagle.flash.2m.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x403FB000 );
 PROVIDE ( _FS_end = 0x403FB000 );
 PROVIDE ( _FS_page = 0x0 );
 PROVIDE ( _FS_block = 0x0 );
+PROVIDE ( _EEPROM_start = 0x403fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.2m128.ld b/tools/sdk/ld/eagle.flash.2m128.ld
index 1e96769b9a..e0b0c14d06 100644
--- a/tools/sdk/ld/eagle.flash.2m128.ld
+++ b/tools/sdk/ld/eagle.flash.2m128.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x403E0000 );
 PROVIDE ( _FS_end = 0x403FB000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x1000 );
+PROVIDE ( _EEPROM_start = 0x403fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.2m1m.ld b/tools/sdk/ld/eagle.flash.2m1m.ld
index 21195281ec..566b86678e 100644
--- a/tools/sdk/ld/eagle.flash.2m1m.ld
+++ b/tools/sdk/ld/eagle.flash.2m1m.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x40300000 );
 PROVIDE ( _FS_end = 0x403FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
+PROVIDE ( _EEPROM_start = 0x403fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.2m256.ld b/tools/sdk/ld/eagle.flash.2m256.ld
index 4b59a1b15a..fd3ad317a7 100644
--- a/tools/sdk/ld/eagle.flash.2m256.ld
+++ b/tools/sdk/ld/eagle.flash.2m256.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x403C0000 );
 PROVIDE ( _FS_end = 0x403FB000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x1000 );
+PROVIDE ( _EEPROM_start = 0x403fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.2m512.ld b/tools/sdk/ld/eagle.flash.2m512.ld
index a6015dd2da..18ed121144 100644
--- a/tools/sdk/ld/eagle.flash.2m512.ld
+++ b/tools/sdk/ld/eagle.flash.2m512.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x40380000 );
 PROVIDE ( _FS_end = 0x403FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
+PROVIDE ( _EEPROM_start = 0x403fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.4m.ld b/tools/sdk/ld/eagle.flash.4m.ld
index f77c95ae1e..9e7f1444dd 100644
--- a/tools/sdk/ld/eagle.flash.4m.ld
+++ b/tools/sdk/ld/eagle.flash.4m.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x405FB000 );
 PROVIDE ( _FS_end = 0x405FB000 );
 PROVIDE ( _FS_page = 0x0 );
 PROVIDE ( _FS_block = 0x0 );
+PROVIDE ( _EEPROM_start = 0x405fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.4m1m.ld b/tools/sdk/ld/eagle.flash.4m1m.ld
index 4d295e3069..3f3f5fb0a0 100644
--- a/tools/sdk/ld/eagle.flash.4m1m.ld
+++ b/tools/sdk/ld/eagle.flash.4m1m.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x40500000 );
 PROVIDE ( _FS_end = 0x405FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
+PROVIDE ( _EEPROM_start = 0x405fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.4m2m.ld b/tools/sdk/ld/eagle.flash.4m2m.ld
index d7034237c8..840c3b28a6 100644
--- a/tools/sdk/ld/eagle.flash.4m2m.ld
+++ b/tools/sdk/ld/eagle.flash.4m2m.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x40400000 );
 PROVIDE ( _FS_end = 0x405FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
+PROVIDE ( _EEPROM_start = 0x405fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.4m3m.ld b/tools/sdk/ld/eagle.flash.4m3m.ld
index 604ed2fa54..e04500b803 100644
--- a/tools/sdk/ld/eagle.flash.4m3m.ld
+++ b/tools/sdk/ld/eagle.flash.4m3m.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x40300000 );
 PROVIDE ( _FS_end = 0x405FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
+PROVIDE ( _EEPROM_start = 0x405fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.512k.ld b/tools/sdk/ld/eagle.flash.512k.ld
index 4f421ab8eb..c0bbb1ad49 100644
--- a/tools/sdk/ld/eagle.flash.512k.ld
+++ b/tools/sdk/ld/eagle.flash.512k.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x4027B000 );
 PROVIDE ( _FS_end = 0x4027B000 );
 PROVIDE ( _FS_page = 0x0 );
 PROVIDE ( _FS_block = 0x0 );
+PROVIDE ( _EEPROM_start = 0x4027b000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.512k128.ld b/tools/sdk/ld/eagle.flash.512k128.ld
index 7a3c573af0..cf1c52d9ea 100644
--- a/tools/sdk/ld/eagle.flash.512k128.ld
+++ b/tools/sdk/ld/eagle.flash.512k128.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x4025B000 );
 PROVIDE ( _FS_end = 0x4027B000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x1000 );
+PROVIDE ( _EEPROM_start = 0x4027b000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.512k32.ld b/tools/sdk/ld/eagle.flash.512k32.ld
index 1334b8d8e4..a046a9ffdc 100644
--- a/tools/sdk/ld/eagle.flash.512k32.ld
+++ b/tools/sdk/ld/eagle.flash.512k32.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x40273000 );
 PROVIDE ( _FS_end = 0x4027B000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x1000 );
+PROVIDE ( _EEPROM_start = 0x4027b000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.512k64.ld b/tools/sdk/ld/eagle.flash.512k64.ld
index fdea4da8e3..ed88b7b495 100644
--- a/tools/sdk/ld/eagle.flash.512k64.ld
+++ b/tools/sdk/ld/eagle.flash.512k64.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x4026B000 );
 PROVIDE ( _FS_end = 0x4027B000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x1000 );
+PROVIDE ( _EEPROM_start = 0x4027b000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.8m6m.ld b/tools/sdk/ld/eagle.flash.8m6m.ld
index 2b26716022..05c1fd2058 100644
--- a/tools/sdk/ld/eagle.flash.8m6m.ld
+++ b/tools/sdk/ld/eagle.flash.8m6m.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x40400000 );
 PROVIDE ( _FS_end = 0x409FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
+PROVIDE ( _EEPROM_start = 0x409fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"
diff --git a/tools/sdk/ld/eagle.flash.8m7m.ld b/tools/sdk/ld/eagle.flash.8m7m.ld
index 2dae7ac7f6..1754a366ca 100644
--- a/tools/sdk/ld/eagle.flash.8m7m.ld
+++ b/tools/sdk/ld/eagle.flash.8m7m.ld
@@ -18,5 +18,6 @@ PROVIDE ( _FS_start = 0x40300000 );
 PROVIDE ( _FS_end = 0x409FA000 );
 PROVIDE ( _FS_page = 0x100 );
 PROVIDE ( _FS_block = 0x2000 );
+PROVIDE ( _EEPROM_start = 0x409fb000 );
 
 INCLUDE "local.eagle.app.v6.common.ld"