Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/EEPROM/EEPROM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion package/package_esp8266com_index.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -359,4 +359,4 @@
]
}
]
}
}
6 changes: 6 additions & 0 deletions tools/boards.txt.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"')

Expand Down
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.16m14m.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.16m15m.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.1m.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.1m128.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.1m144.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.1m160.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.1m192.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.1m256.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.1m512.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.1m64.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.2m.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.2m128.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.2m1m.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.2m256.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.2m512.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.4m.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.4m1m.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.4m2m.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.4m3m.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.512k.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.512k128.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.512k32.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.512k64.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.8m6m.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.flash.8m7m.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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"