Skip to content

Commit a931150

Browse files
davisonjadavisonja
committed
Regenerated the files
1 parent ce6a824 commit a931150

26 files changed

+1
-80
lines changed

‎boards.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4762,15 +4762,11 @@ wifinfo.menu.FlashFreq.40=40MHz
47624762
wifinfo.menu.FlashFreq.40.build.flash_freq=40
47634763
wifinfo.menu.FlashFreq.80=80MHz
47644764
wifinfo.menu.FlashFreq.80.build.flash_freq=80
4765-
<<<<<<< HEAD
4766-
wifinfo.menu.eesz.1M64=1MB (FS:64KB OTA:~466KB)
4767-
=======
47684765
wifinfo.menu.FlashFreq.20=20MHz
47694766
wifinfo.menu.FlashFreq.20.build.flash_freq=20
47704767
wifinfo.menu.FlashFreq.26=26MHz
47714768
wifinfo.menu.FlashFreq.26.build.flash_freq=26
4772-
wifinfo.menu.eesz.1M64=1MB (FS:64KB OTA:~470KB)
4773-
>>>>>>> upstream/master
4769+
wifinfo.menu.eesz.1M64=1MB (FS:64KB OTA:~466KB)
47744770
wifinfo.menu.eesz.1M64.build.flash_size=1M
47754771
wifinfo.menu.eesz.1M64.build.flash_size_bytes=0x100000
47764772
wifinfo.menu.eesz.1M64.build.flash_ld=eagle.flash.1m64.ld

‎tools/sdk/ld/eagle.flash.16m14m.ld

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ PROVIDE ( _FS_start = 0x40400000 );
1919
PROVIDE ( _FS_end = 0x411FA000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x2000 );
22-
<<<<<<< HEAD
2322
PROVIDE ( _BOOTLOADER_DATA = 0x001FE000 );
2423
PROVIDE ( _SKETCH_AREA_end = _FS_start );
25-
=======
2624
PROVIDE ( _EEPROM_start = 0x411fb000 );
2725
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2826
PROVIDE ( _SPIFFS_start = 0x40400000 );
2927
PROVIDE ( _SPIFFS_end = 0x411FA000 );
3028
PROVIDE ( _SPIFFS_page = 0x100 );
3129
PROVIDE ( _SPIFFS_block = 0x2000 );
32-
>>>>>>> upstream/master
3330

3431
INCLUDE "local.eagle.app.v6.common.ld"

‎tools/sdk/ld/eagle.flash.16m15m.ld

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@ PROVIDE ( _FS_start = 0x40300000 );
1818
PROVIDE ( _FS_end = 0x411FA000 );
1919
PROVIDE ( _FS_page = 0x100 );
2020
PROVIDE ( _FS_block = 0x2000 );
21-
<<<<<<< HEAD
2221
PROVIDE ( _BOOTLOADER_DATA = 0x000FE000 );
2322
PROVIDE ( _SKETCH_AREA_end = _FS_start );
24-
=======
2523
PROVIDE ( _EEPROM_start = 0x411fb000 );
2624
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2725
PROVIDE ( _SPIFFS_start = 0x40300000 );
2826
PROVIDE ( _SPIFFS_end = 0x411FA000 );
2927
PROVIDE ( _SPIFFS_page = 0x100 );
3028
PROVIDE ( _SPIFFS_block = 0x2000 );
31-
>>>>>>> upstream/master
3229

3330
INCLUDE "local.eagle.app.v6.common.ld"

‎tools/sdk/ld/eagle.flash.1m.ld

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ PROVIDE ( _FS_start = 0x402FB000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x0 );
2121
PROVIDE ( _FS_block = 0x0 );
22-
<<<<<<< HEAD
2322
PROVIDE ( _BOOTLOADER_DATA = 0x000F9000 );
2423
PROVIDE ( _SKETCH_AREA_end = _FS_start );
25-
=======
2624
PROVIDE ( _EEPROM_start = 0x402fb000 );
2725
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2826
PROVIDE ( _SPIFFS_start = 0x402FB000 );
2927
PROVIDE ( _SPIFFS_end = 0x402FB000 );
3028
PROVIDE ( _SPIFFS_page = 0x0 );
3129
PROVIDE ( _SPIFFS_block = 0x0 );
32-
>>>>>>> upstream/master
3330

3431
INCLUDE "local.eagle.app.v6.common.ld"

‎tools/sdk/ld/eagle.flash.1m128.ld

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ PROVIDE ( _FS_start = 0x402DB000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x1000 );
22-
<<<<<<< HEAD
2322
PROVIDE ( _BOOTLOADER_DATA = 0x000D9000 );
2423
PROVIDE ( _SKETCH_AREA_end = _FS_start );
25-
=======
2624
PROVIDE ( _EEPROM_start = 0x402fb000 );
2725
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2826
PROVIDE ( _SPIFFS_start = 0x402DB000 );
2927
PROVIDE ( _SPIFFS_end = 0x402FB000 );
3028
PROVIDE ( _SPIFFS_page = 0x100 );
3129
PROVIDE ( _SPIFFS_block = 0x1000 );
32-
>>>>>>> upstream/master
3330

3431
INCLUDE "local.eagle.app.v6.common.ld"

‎tools/sdk/ld/eagle.flash.1m144.ld

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ PROVIDE ( _FS_start = 0x402D7000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x1000 );
22-
<<<<<<< HEAD
2322
PROVIDE ( _BOOTLOADER_DATA = 0x000D5000 );
2423
PROVIDE ( _SKETCH_AREA_end = _FS_start );
25-
=======
2624
PROVIDE ( _EEPROM_start = 0x402fb000 );
2725
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2826
PROVIDE ( _SPIFFS_start = 0x402D7000 );
2927
PROVIDE ( _SPIFFS_end = 0x402FB000 );
3028
PROVIDE ( _SPIFFS_page = 0x100 );
3129
PROVIDE ( _SPIFFS_block = 0x1000 );
32-
>>>>>>> upstream/master
3330

3431
INCLUDE "local.eagle.app.v6.common.ld"

‎tools/sdk/ld/eagle.flash.1m160.ld

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ PROVIDE ( _FS_start = 0x402D3000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x1000 );
22-
<<<<<<< HEAD
2322
PROVIDE ( _BOOTLOADER_DATA = 0x000D1000 );
2423
PROVIDE ( _SKETCH_AREA_end = _FS_start );
25-
=======
2624
PROVIDE ( _EEPROM_start = 0x402fb000 );
2725
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2826
PROVIDE ( _SPIFFS_start = 0x402D3000 );
2927
PROVIDE ( _SPIFFS_end = 0x402FB000 );
3028
PROVIDE ( _SPIFFS_page = 0x100 );
3129
PROVIDE ( _SPIFFS_block = 0x1000 );
32-
>>>>>>> upstream/master
3330

3431
INCLUDE "local.eagle.app.v6.common.ld"

‎tools/sdk/ld/eagle.flash.1m192.ld

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ PROVIDE ( _FS_start = 0x402CB000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x1000 );
22-
<<<<<<< HEAD
2322
PROVIDE ( _BOOTLOADER_DATA = 0x000C9000 );
2423
PROVIDE ( _SKETCH_AREA_end = _FS_start );
25-
=======
2624
PROVIDE ( _EEPROM_start = 0x402fb000 );
2725
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2826
PROVIDE ( _SPIFFS_start = 0x402CB000 );
2927
PROVIDE ( _SPIFFS_end = 0x402FB000 );
3028
PROVIDE ( _SPIFFS_page = 0x100 );
3129
PROVIDE ( _SPIFFS_block = 0x1000 );
32-
>>>>>>> upstream/master
3330

3431
INCLUDE "local.eagle.app.v6.common.ld"

‎tools/sdk/ld/eagle.flash.1m256.ld

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ PROVIDE ( _FS_start = 0x402BB000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x1000 );
22-
<<<<<<< HEAD
2322
PROVIDE ( _BOOTLOADER_DATA = 0x000B9000 );
2423
PROVIDE ( _SKETCH_AREA_end = _FS_start );
25-
=======
2624
PROVIDE ( _EEPROM_start = 0x402fb000 );
2725
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2826
PROVIDE ( _SPIFFS_start = 0x402BB000 );
2927
PROVIDE ( _SPIFFS_end = 0x402FB000 );
3028
PROVIDE ( _SPIFFS_page = 0x100 );
3129
PROVIDE ( _SPIFFS_block = 0x1000 );
32-
>>>>>>> upstream/master
3330

3431
INCLUDE "local.eagle.app.v6.common.ld"

‎tools/sdk/ld/eagle.flash.1m512.ld

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ PROVIDE ( _FS_start = 0x4027B000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x2000 );
22-
<<<<<<< HEAD
2322
PROVIDE ( _BOOTLOADER_DATA = 0x00079000 );
2423
PROVIDE ( _SKETCH_AREA_end = _FS_start );
25-
=======
2624
PROVIDE ( _EEPROM_start = 0x402fb000 );
2725
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2826
PROVIDE ( _SPIFFS_start = 0x4027B000 );
2927
PROVIDE ( _SPIFFS_end = 0x402FB000 );
3028
PROVIDE ( _SPIFFS_page = 0x100 );
3129
PROVIDE ( _SPIFFS_block = 0x2000 );
32-
>>>>>>> upstream/master
3330

3431
INCLUDE "local.eagle.app.v6.common.ld"

0 commit comments

Comments
 (0)