arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Add support for 8 and 16 MB Flash (#2351)

Browse Source 
Add to core dev config initially
This commit is contained in:
Me No Dev 2016-08-01 06:20:53 +03:00 committed by Ivan Grokhotkov
parent b7c7bc038d
commit f50a6c0a8a
5 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
boards.txt
View File

@ -1826,9 +1826,28 @@ coredev.menu.FlashSize.4M3M.build.flash_size=4M
coredev.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
coredev.menu.FlashSize.4M3M.build.spiffs_start=0x100000
coredev.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
coredev.menu.FlashSize.4M3M.build.spiffs_pagesize=256
coredev.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
coredev.menu.FlashSize.4M3M.upload.maximum_size=1044464
coredev.menu.FlashSize.8M7M=8M (7M SPIFFS)
coredev.menu.FlashSize.8M7M.build.flash_size=8M
coredev.menu.FlashSize.8M7M.build.flash_ld=eagle.flash.8m.ld
coredev.menu.FlashSize.8M7M.build.spiffs_start=0x100000
coredev.menu.FlashSize.8M7M.build.spiffs_end=0x7FB000
coredev.menu.FlashSize.8M7M.build.spiffs_pagesize=256
coredev.menu.FlashSize.8M7M.build.spiffs_blocksize=8192
coredev.menu.FlashSize.8M7M.upload.maximum_size=1044464
coredev.menu.FlashSize.16M15M=16M (15M SPIFFS)
coredev.menu.FlashSize.16M15M.build.flash_size=16M
coredev.menu.FlashSize.16M15M.build.flash_ld=eagle.flash.16m.ld
coredev.menu.FlashSize.16M15M.build.spiffs_start=0x100000
coredev.menu.FlashSize.16M15M.build.spiffs_end=0x17FB000
coredev.menu.FlashSize.16M15M.build.spiffs_pagesize=256
coredev.menu.FlashSize.16M15M.build.spiffs_blocksize=8192
coredev.menu.FlashSize.16M15M.upload.maximum_size=1044464
coredev.menu.ResetMethod.ck=ck
coredev.menu.ResetMethod.ck.upload.resetmethod=ck
coredev.menu.ResetMethod.nodemcu=nodemcu

7
cores/esp8266/Esp.cpp
View File

@ -249,12 +249,10 @@ uint32_t EspClass::magicFlashChipSize(uint8_t byte) {
return (2_MB);
case 0x4: // 32 MBit (4MB)
return (4_MB);
case 0x5: // 64 MBit (8MB)
case 0x8: // 64 MBit (8MB)
return (8_MB);
case 0x6: // 128 MBit (16MB)
case 0x9: // 128 MBit (16MB)
return (16_MB);
case 0x7: // 256 MBit (32MB)
return (32_MB);
default: // fail?
return 0;
}
@ -549,4 +547,3 @@ String EspClass::getSketchMD5()
result = md5.toString();
return result;
}

2
cores/esp8266/flash_utils.h
View File

@ -42,7 +42,7 @@ typedef struct {
/* SPI Flash Interface (0 = QIO, 1 = QOUT, 2 = DIO, 0x3 = DOUT) */
unsigned char flash_mode;
/* High four bits: 0 = 512K, 1 = 256K, 2 = 1M, 3 = 2M, 4 = 4M,
/* High four bits: 0 = 512K, 1 = 256K, 2 = 1M, 3 = 2M, 4 = 4M, 8 = 8M, 9 = 16M
Low four bits: 0 = 40MHz, 1= 26MHz, 2 = 20MHz, 0xf = 80MHz */
unsigned char flash_size_freq;

2
tools/sdk/ld/eagle.flash.16m.ld
View File

@ -12,7 +12,7 @@ MEMORY
}
PROVIDE ( _SPIFFS_start = 0x40300000 );
PROVIDE ( _SPIFFS_end = 0x41200000 );
PROVIDE ( _SPIFFS_end = 0x411FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x2000 );

2
tools/sdk/ld/eagle.flash.8m.ld
View File

@ -12,7 +12,7 @@ MEMORY
}
PROVIDE ( _SPIFFS_start = 0x40300000 );
PROVIDE ( _SPIFFS_end = 0x40A00000 );
PROVIDE ( _SPIFFS_end = 0x409FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x2000 );