MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #890 from vowstar/dev-fix-flash-api 

Update flash_api due to flash size map is redefined by espressif.
This commit is contained in:
Johny Mattsson 2016-01-14 17:00:50 +11:00
parent 9772e7cdec f2e6c9366b
commit 2d82e622b6
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/platform/flash_api.c
View File

@ -132,13 +132,13 @@ uint32_t flash_rom_get_size_byte(void)
// 32Mbit, 4MByte // 32Mbit, 4MByte
flash_size = 4 * 1024 * 1024; flash_size = 4 * 1024 * 1024;
break; break;
case SIZE_64MBIT: case SIZE_16MBIT_8M_8M:
// 64Mbit, 8MByte // 16Mbit, 2MByte
flash_size = 8 * 1024 * 1024; flash_size = 2 * 1024 * 1024;
break; break;
case SIZE_128MBIT: case SIZE_32MBIT_8M_8M:
// 128Mbit, 16MByte // 32Mbit, 4MByte
flash_size = 16 * 1024 * 1024; flash_size = 4 * 1024 * 1024;
break; break;
default: default:
// Unknown flash size, fall back mode. // Unknown flash size, fall back mode.
@ -206,16 +206,18 @@ bool flash_rom_set_size_byte(uint32_t size)
flash_size = SIZE_32MBIT; flash_size = SIZE_32MBIT;
flash_rom_set_size_type(flash_size); flash_rom_set_size_type(flash_size);
break; break;
/*
case 8 * 1024 * 1024: case 8 * 1024 * 1024:
// 64Mbit, 8MByte // 64Mbit, 8MByte
flash_size = SIZE_64MBIT; flash_size = SIZE_16MBIT_8M_8M;
flash_rom_set_size_type(flash_size); flash_rom_set_size_type(flash_size);
break; break;
case 16 * 1024 * 1024: case 16 * 1024 * 1024:
// 128Mbit, 16MByte // 128Mbit, 16MByte
flash_size = SIZE_128MBIT; flash_size = SIZE_32MBIT_8M_8M;
flash_rom_set_size_type(flash_size); flash_rom_set_size_type(flash_size);
break; break;
*/
default: default:
// Unknown flash size. // Unknown flash size.
result = false; result = false;

6
app/platform/flash_api.h
View File

@ -78,12 +78,12 @@ typedef struct
SIZE_8MBIT = 2, SIZE_8MBIT = 2,
SIZE_16MBIT = 3, SIZE_16MBIT = 3,
SIZE_32MBIT = 4, SIZE_32MBIT = 4,
SIZE_64MBIT = 5, SIZE_16MBIT_8M_8M = 5,
SIZE_128MBIT = 6, SIZE_32MBIT_8M_8M = 6,
} size : 4; } size : 4;
uint32_t entry_point; uint32_t entry_point;
uint32_t memory_offset; uint32_t memory_offset;
uint32_t segment_size; uint32_t segment_size;
} ICACHE_STORE_TYPEDEF_ATTR SPIFlashInfo; } ICACHE_STORE_TYPEDEF_ATTR SPIFlashInfo;
uint32_t flash_detect_size_byte(void); uint32_t flash_detect_size_byte(void);