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

Improved flash size detection. 

With the recent flash layout changes, it became very possible to misdetect the
flash size. We're now using the partition table as the guard marker, since
that really shouldn't be all 0xff. Also, we now don't clobber the flash
device id (and keep block/sector/page/mask values).
This commit is contained in:
Johny Mattsson 2016-11-17 11:56:39 +11:00
parent 2266670b46
commit 2b454abfdf
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/platform/flash_api.c
View File

@ -10,6 +10,7 @@
#include "rom/spi_flash.h" #include "rom/spi_flash.h"
#include "esp_image_format.h" #include "esp_image_format.h"
#include "esp_flash_data_types.h"
#define FLASH_HDR_ADDR 0x1000 #define FLASH_HDR_ADDR 0x1000
@ -26,10 +27,15 @@ static inline esp_image_header_t flash_load_rom_header (void)
} }
#define IRAM_SECTION __attribute__((section(".iram1"))) #define IRAM_SECTION __attribute__((section(".iram1")))
static void IRAM_SECTION do_flash_cfg_workaround (uint32_t sz) static void IRAM_SECTION update_flash_chip_size (uint32_t sz)
{ {
// workaround: configure SPI flash size manually (2nd argument) SPIParamCfg (
SPIParamCfg (0x1540ef, sz, 64*1024, 4096, 256, 0xffff); g_rom_flashchip.deviceId,
sz,
g_rom_flashchip.block_size,
g_rom_flashchip.sector_size,
g_rom_flashchip.page_size,
g_rom_flashchip.status_mask);
} }
static uint32_t __attribute__((section(".iram1"))) flash_detect_size_byte(void) static uint32_t __attribute__((section(".iram1"))) flash_detect_size_byte(void)
@ -38,18 +44,21 @@ static uint32_t __attribute__((section(".iram1"))) flash_detect_size_byte(void)
uint32_t detected_size = FLASH_SIZE_1MBYTE; uint32_t detected_size = FLASH_SIZE_1MBYTE;
uint8_t data_orig[DETECT_SZ] PLATFORM_ALIGNMENT = {0}; uint8_t data_orig[DETECT_SZ] PLATFORM_ALIGNMENT = {0};
uint8_t data_new[DETECT_SZ] PLATFORM_ALIGNMENT = {0}; uint8_t data_new[DETECT_SZ] PLATFORM_ALIGNMENT = {0};
// Ensure we read something which isn't just 0xff...
const uint32_t offs = ESP_PARTITION_TABLE_ADDR;
// Detect read failure or wrap-around on flash read to find end of flash // Detect read failure or wrap-around on flash read to find end of flash
if (ESP_OK == spi_flash_read (0, (uint32_t *)data_orig, DETECT_SZ)) if (ESP_OK == spi_flash_read (offs, (uint32_t *)data_orig, DETECT_SZ))
{ {
do_flash_cfg_workaround (FLASH_SIZE_16MBYTE); update_flash_chip_size (FLASH_SIZE_16MBYTE);
while ((detected_size < FLASH_SIZE_16MBYTE) && while ((detected_size < FLASH_SIZE_16MBYTE) &&
(ESP_OK == spi_flash_read ( (ESP_OK == spi_flash_read (
detected_size, (uint32_t *)data_new, DETECT_SZ)) && detected_size + offs, (uint32_t *)data_new, DETECT_SZ)) &&
(0 != memcmp(data_orig, data_new, DETECT_SZ))) (0 != memcmp(data_orig, data_new, DETECT_SZ)))
{ {
detected_size *= 2; detected_size *= 2;
} }
do_flash_cfg_workaround (detected_size);
update_flash_chip_size (detected_size);
}; };
return detected_size; return detected_size;
#undef FLASH_BUFFER_SIZE_DETECT #undef FLASH_BUFFER_SIZE_DETECT

2
components/platform/platform_flash.c
View File

@ -190,7 +190,7 @@ uint32_t platform_s_flash_read( void *to, uint32_t fromaddr, uint32_t size )
if(ESP_OK == r) if(ESP_OK == r)
return size; return size;
else{ else{
NODE_ERR( "ERROR in flash_read: r=%d at %08X\n", ( int )r, ( unsigned )fromaddr); NODE_ERR( "ERROR in flash_read: r=%d at %08X sz %x\n", ( int )r, ( unsigned )fromaddr, size);
return 0; return 0;
} }
} }