1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00

Merge branch 'ficeto-esp8266' into esp8266

* ficeto-esp8266:
  fix switched linkers
This commit is contained in:
Ivan Grokhotkov 2015-05-18 21:20:10 +03:00
commit 1a573c6f6c
2 changed files with 6 additions and 6 deletions

View File

@ -1,7 +1,7 @@
/* Flash Split for 8M chips */
/* Flash Split for 16M chips */
/* irom0 940KB */
/* eeprom 20KB */
/* spiffs 7MB */
/* spiffs 15MB */
MEMORY
{
@ -12,6 +12,6 @@ MEMORY
}
PROVIDE ( _SPIFFS_start = 0x40300000 );
PROVIDE ( _SPIFFS_end = 0x40A00000 );
PROVIDE ( _SPIFFS_end = 0x41200000 );
INCLUDE "../ld/eagle.app.v6.common.ld"

View File

@ -1,7 +1,7 @@
/* Flash Split for 16M chips */
/* Flash Split for 8M chips */
/* irom0 940KB */
/* eeprom 20KB */
/* spiffs 15MB */
/* spiffs 7MB */
MEMORY
{
@ -12,6 +12,6 @@ MEMORY
}
PROVIDE ( _SPIFFS_start = 0x40300000 );
PROVIDE ( _SPIFFS_end = 0x41200000 );
PROVIDE ( _SPIFFS_end = 0x40A00000 );
INCLUDE "../ld/eagle.app.v6.common.ld"