arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-27 18:02:17 +03:00
Code Activity

Restore EEPROM address to prior released location (#6537)

Browse Source 
When the FS_END was adjusted to end on a full block (i.e. rounded down)
to avoid filesystem issues, but _FS_end was changed.  The EEPROM library
used _FS_end to implicitly calculate the start of the EEPROM data, so
this means after the _FS_end fix, EEPROM data written with prior
releases would "disappear."

Avoid the issue by explicitly calculating the EEPROM start location in
the linker, using the same formula as prior release.

Fixes #6531
This commit is contained in:
Earle F. Philhower, III
2019-09-20 08:24:10 -07:00
committed by GitHub
parent 3733ece7e8
commit 69f3e81fb9
28 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/sdk/ld/eagle.flash.16m14m.ld
View File

@ -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
tools/sdk/ld/eagle.flash.16m15m.ld
View File

@ -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
tools/sdk/ld/eagle.flash.1m.ld
View File

@ -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
tools/sdk/ld/eagle.flash.1m128.ld
View File

@ -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
tools/sdk/ld/eagle.flash.1m144.ld
View File

@ -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
tools/sdk/ld/eagle.flash.1m160.ld
View File

@ -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
tools/sdk/ld/eagle.flash.1m192.ld
View File

@ -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
tools/sdk/ld/eagle.flash.1m256.ld
View File

@ -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
tools/sdk/ld/eagle.flash.1m512.ld
View File

@ -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
tools/sdk/ld/eagle.flash.1m64.ld
View File

@ -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
tools/sdk/ld/eagle.flash.2m.ld
View File

@ -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
tools/sdk/ld/eagle.flash.2m128.ld
View File

@ -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
tools/sdk/ld/eagle.flash.2m1m.ld
View File

@ -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
tools/sdk/ld/eagle.flash.2m256.ld
View File

@ -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
tools/sdk/ld/eagle.flash.2m512.ld
View File

@ -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
tools/sdk/ld/eagle.flash.4m.ld
View File

@ -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
tools/sdk/ld/eagle.flash.4m1m.ld
View File

@ -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
tools/sdk/ld/eagle.flash.4m2m.ld
View File

@ -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
tools/sdk/ld/eagle.flash.4m3m.ld
View File

@ -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
tools/sdk/ld/eagle.flash.512k.ld
View File

@ -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
tools/sdk/ld/eagle.flash.512k128.ld
View File

@ -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
tools/sdk/ld/eagle.flash.512k32.ld
View File

@ -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
tools/sdk/ld/eagle.flash.512k64.ld
View File

@ -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
tools/sdk/ld/eagle.flash.8m6m.ld
View File

@ -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
tools/sdk/ld/eagle.flash.8m7m.ld
View File

@ -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"