Merge pull request #294 from ficeto/esp8266

Esp8266 SPIFFS Tool

boards.txt

@@ -25,6 +25,8 @@ generic.build.flash_freq=40
 generic.build.flash_ld=eagle.flash.512k.ld
 generic.build.spiffs_start=0x6B000
 generic.build.spiffs_end=0x7B000
+generic.build.spiffs_pagesize=256
+generic.build.spiffs_blocksize=4096
 
 generic.menu.CpuFrequency.80=80 MHz
 generic.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -55,46 +57,57 @@ generic.menu.FlashSize.512K.build.flash_size=512K
 generic.menu.FlashSize.512K.build.flash_ld=eagle.flash.512k.ld
 generic.menu.FlashSize.512K.build.spiffs_start=0x6B000
 generic.menu.FlashSize.512K.build.spiffs_end=0x7B000
+generic.menu.FlashSize.512K.build.spiffs_blocksize=4096
 generic.menu.FlashSize.1M512=1M (512K SPIFFS)
 generic.menu.FlashSize.1M512.build.flash_size=1M
 generic.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
 generic.menu.FlashSize.1M512.build.spiffs_start=0x6B000
 generic.menu.FlashSize.1M512.build.spiffs_end=0xFB000
+generic.menu.FlashSize.1M512.build.spiffs_blocksize=8192
 generic.menu.FlashSize.1M256=1M (256K SPIFFS)
 generic.menu.FlashSize.1M256.build.flash_size=1M
 generic.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
 generic.menu.FlashSize.1M256.build.spiffs_start=0xAB000
 generic.menu.FlashSize.1M256.build.spiffs_end=0xFB000
+generic.menu.FlashSize.1M256.build.spiffs_blocksize=4096
 generic.menu.FlashSize.1M128=1M (128K SPIFFS)
 generic.menu.FlashSize.1M128.build.flash_size=1M
 generic.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
 generic.menu.FlashSize.1M128.build.spiffs_start=0xCB000
 generic.menu.FlashSize.1M128.build.spiffs_end=0xFB000
+generic.menu.FlashSize.1M128.build.spiffs_blocksize=4096
 generic.menu.FlashSize.1M64=1M (64K SPIFFS)
 generic.menu.FlashSize.1M64.build.flash_size=1M
 generic.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
 generic.menu.FlashSize.1M64.build.spiffs_start=0xEB000
 generic.menu.FlashSize.1M64.build.spiffs_end=0xFB000
+generic.menu.FlashSize.1M64.build.spiffs_blocksize=4096
 generic.menu.FlashSize.2M=2M (1M SPIFFS)
 generic.menu.FlashSize.2M.build.flash_size=2M
 generic.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
 generic.menu.FlashSize.2M.build.spiffs_start=0x100000
 generic.menu.FlashSize.2M.build.spiffs_end=0x1FB000
+generic.menu.FlashSize.2M.build.spiffs_blocksize=8192
 generic.menu.FlashSize.4M=4M (3M SPIFFS)
 generic.menu.FlashSize.4M.build.flash_size=4M
 generic.menu.FlashSize.4M.build.flash_ld=eagle.flash.4m.ld
 generic.menu.FlashSize.4M.build.spiffs_start=0x100000
 generic.menu.FlashSize.4M.build.spiffs_end=0x3FB000
-generic.menu.FlashSize.8M=8M (7M SPIFFS)
+generic.menu.FlashSize.4M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.8M.build.flash_size=1M
+
-generic.menu.FlashSize.8M.build.flash_ld=eagle.flash.8m.ld
+# disabled because espressif's bootloader refuses to write above 4M
-generic.menu.FlashSize.8M.build.spiffs_start=0x100000
+# generic.menu.FlashSize.8M=8M (7M SPIFFS)
-generic.menu.FlashSize.8M.build.spiffs_end=0x800000
+# generic.menu.FlashSize.8M.build.flash_size=1M
-generic.menu.FlashSize.16M=16M (15M SPIFFS)
+# generic.menu.FlashSize.8M.build.flash_ld=eagle.flash.8m.ld
-generic.menu.FlashSize.16M.build.flash_size=1M
+# generic.menu.FlashSize.8M.build.spiffs_start=0x100000
-generic.menu.FlashSize.16M.build.flash_ld=eagle.flash.16m.ld
+# generic.menu.FlashSize.8M.build.spiffs_end=0x800000
-generic.menu.FlashSize.16M.build.spiffs_start=0x100000
+# generic.menu.FlashSize.8M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
+# generic.menu.FlashSize.16M=16M (15M SPIFFS)
+# generic.menu.FlashSize.16M.build.flash_size=1M
+# generic.menu.FlashSize.16M.build.flash_ld=eagle.flash.16m.ld
+# generic.menu.FlashSize.16M.build.spiffs_start=0x100000
+# generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
+# generic.menu.FlashSize.16M.build.spiffs_blocksize=8192
 
 # generic.menu.FlashFreq.40=40MHz
 # generic.menu.FlashFreq.40.build.flash_freq=40
@@ -124,6 +137,8 @@ modwifi.build.flash_freq=40
 modwifi.build.flash_ld=eagle.flash.2m.ld
 modwifi.build.spiffs_start=0x100000
 modwifi.build.spiffs_end=0x1FB000
+modwifi.build.spiffs_pagesize=256
+modwifi.build.spiffs_blocksize=8192
 
 modwifi.menu.CpuFrequency.80=80 MHz
 modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -172,6 +187,8 @@ nodemcu.build.flash_freq=40
 nodemcu.build.flash_ld=eagle.flash.4m.ld
 nodemcu.build.spiffs_start=0x100000
 nodemcu.build.spiffs_end=0x3FB000
+nodemcu.build.spiffs_pagesize=256
+nodemcu.build.spiffs_blocksize=8192
 
 nodemcu.menu.CpuFrequency.80=80 MHz
 nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L

cores/esp8266/FileSystem.cpp

@@ -22,25 +22,25 @@
 #include "Arduino.h"
 #include "spiffs/spiffs_esp8266.h"
 
-#define LOGICAL_PAGE_SIZE       256
+// These addresses and sizes are defined in the linker script.
-#define LOGICAL_BLOCK_SIZE      (INTERNAL_FLASH_SECTOR_SIZE * 1)
-
-
-// These addresses are defined in the linker script.
 // For each flash memory size there is a linker script variant
 // which sets spiffs location and size.
 extern "C" uint32_t _SPIFFS_start;
 extern "C" uint32_t _SPIFFS_end;
+extern "C" uint32_t _SPIFFS_page;
+extern "C" uint32_t _SPIFFS_block;
 
 static s32_t api_spiffs_read(u32_t addr, u32_t size, u8_t *dst);
 static s32_t api_spiffs_write(u32_t addr, u32_t size, u8_t *src);
 static s32_t api_spiffs_erase(u32_t addr, u32_t size);
 
-FSClass FS((uint32_t) &_SPIFFS_start, (uint32_t) &_SPIFFS_end, 4);
+FSClass FS((uint32_t) &_SPIFFS_start, (uint32_t) &_SPIFFS_end, (uint32_t) &_SPIFFS_page, (uint32_t) &_SPIFFS_block, 4);
 
-FSClass::FSClass(uint32_t beginAddress, uint32_t endAddress, uint32_t maxOpenFiles)
+FSClass::FSClass(uint32_t beginAddress, uint32_t endAddress, uint32_t pageSize, uint32_t blockSize, uint32_t maxOpenFiles)
 : _beginAddress(beginAddress)
 , _endAddress(endAddress)
+, _pageSize(pageSize)
+, _blockSize(blockSize)
 , _maxOpenFiles(maxOpenFiles)
 , _fs({0})
 {
@@ -51,23 +51,25 @@ int FSClass::_mountInternal(){
     SPIFFS_API_DBG_E("Can't start file system, wrong address\r\n");
     return SPIFFS_ERR_NOT_CONFIGURED;
   }
+  if(_pageSize == 0) _pageSize = 256;
+  if(_blockSize == 0) _blockSize = 4096;
   
   spiffs_config cfg = {0};
   cfg.phys_addr = _beginAddress;
   cfg.phys_size = _endAddress - _beginAddress;
   cfg.phys_erase_block = INTERNAL_FLASH_SECTOR_SIZE;
-  cfg.log_block_size = LOGICAL_BLOCK_SIZE;
+  cfg.log_block_size = _blockSize;
-  cfg.log_page_size = LOGICAL_PAGE_SIZE;
+  cfg.log_page_size = _pageSize;
   cfg.hal_read_f = api_spiffs_read;
   cfg.hal_write_f = api_spiffs_write;
   cfg.hal_erase_f = api_spiffs_erase;
   
   SPIFFS_API_DBG_V("FSClass::_mountInternal: start:%x, size:%d Kb\n", cfg.phys_addr, cfg.phys_size / 1024);
 
-  _work.reset(new uint8_t[2*LOGICAL_PAGE_SIZE]);
+  _work.reset(new uint8_t[2*_pageSize]);
   _fdsSize = 32 * _maxOpenFiles;
   _fds.reset(new uint8_t[_fdsSize]);
-  _cacheSize = (32 + LOGICAL_PAGE_SIZE) * _maxOpenFiles;
+  _cacheSize = (32 + _pageSize) * _maxOpenFiles;
   _cache.reset(new uint8_t[_cacheSize]);
 
   s32_t res = SPIFFS_mount(&_fs,

cores/esp8266/FileSystem.h

@@ -85,7 +85,7 @@ public:
 
 class FSClass {
 public:
-  FSClass(uint32_t beginAddress, uint32_t endAddress, uint32_t maxOpenFiles);
+  FSClass(uint32_t beginAddress, uint32_t endAddress, uint32_t pageSize, uint32_t blockSize, uint32_t maxOpenFiles);
 
   bool mount();
   void unmount();
@@ -117,6 +117,8 @@ protected:
   size_t _cacheSize;
   uint32_t _beginAddress;
   uint32_t _endAddress;
+  uint32_t _pageSize;
+  uint32_t _blockSize;
   uint32_t _maxOpenFiles;
   spiffs _fs;
 

tools/sdk/ld/eagle.flash.16m.ld

@@ -13,5 +13,7 @@ MEMORY
 
 PROVIDE ( _SPIFFS_start = 0x40300000 );
 PROVIDE ( _SPIFFS_end = 0x41200000 );
+PROVIDE ( _SPIFFS_page = 0x100 );
+PROVIDE ( _SPIFFS_block = 0x2000 );
 
 INCLUDE "../ld/eagle.app.v6.common.ld"

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

@@ -13,5 +13,7 @@ MEMORY
 
 PROVIDE ( _SPIFFS_start = 0x402DB000 );
 PROVIDE ( _SPIFFS_end = 0x402FB000 );
+PROVIDE ( _SPIFFS_page = 0x100 );
+PROVIDE ( _SPIFFS_block = 0x1000 );
 
 INCLUDE "../ld/eagle.app.v6.common.ld"

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

@@ -13,5 +13,7 @@ MEMORY
 
 PROVIDE ( _SPIFFS_start = 0x402BB000 );
 PROVIDE ( _SPIFFS_end = 0x402FB000 );
+PROVIDE ( _SPIFFS_page = 0x100 );
+PROVIDE ( _SPIFFS_block = 0x1000 );
 
 INCLUDE "../ld/eagle.app.v6.common.ld"

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

@@ -13,5 +13,7 @@ MEMORY
 
 PROVIDE ( _SPIFFS_start = 0x4027B000 );
 PROVIDE ( _SPIFFS_end = 0x402FB000 );
+PROVIDE ( _SPIFFS_page = 0x100 );
+PROVIDE ( _SPIFFS_block = 0x2000 );
 
 INCLUDE "../ld/eagle.app.v6.common.ld"

tools/sdk/ld/eagle.flash.1m64.ld

@@ -13,5 +13,7 @@ MEMORY
 
 PROVIDE ( _SPIFFS_start = 0x402EB000 );
 PROVIDE ( _SPIFFS_end = 0x402FB000 );
+PROVIDE ( _SPIFFS_page = 0x100 );
+PROVIDE ( _SPIFFS_block = 0x1000 );
 
 INCLUDE "../ld/eagle.app.v6.common.ld"

tools/sdk/ld/eagle.flash.2m.ld

@@ -13,5 +13,7 @@ MEMORY
 
 PROVIDE ( _SPIFFS_start = 0x40300000 );
 PROVIDE ( _SPIFFS_end = 0x403FB000 );
+PROVIDE ( _SPIFFS_page = 0x100 );
+PROVIDE ( _SPIFFS_block = 0x2000 );
 
 INCLUDE "../ld/eagle.app.v6.common.ld"

tools/sdk/ld/eagle.flash.4m.ld

@@ -13,5 +13,7 @@ MEMORY
 
 PROVIDE ( _SPIFFS_start = 0x40300000 );
 PROVIDE ( _SPIFFS_end = 0x405FB000 );
+PROVIDE ( _SPIFFS_page = 0x100 );
+PROVIDE ( _SPIFFS_block = 0x2000 );
 
 INCLUDE "../ld/eagle.app.v6.common.ld"

tools/sdk/ld/eagle.flash.512k.ld

@@ -13,5 +13,7 @@ MEMORY
 
 PROVIDE ( _SPIFFS_start = 0x4026B000 );
 PROVIDE ( _SPIFFS_end = 0x4027B000 );
+PROVIDE ( _SPIFFS_page = 0x100 );
+PROVIDE ( _SPIFFS_block = 0x1000 );
 
 INCLUDE "../ld/eagle.app.v6.common.ld"

tools/sdk/ld/eagle.flash.8m.ld

@@ -13,5 +13,7 @@ MEMORY
 
 PROVIDE ( _SPIFFS_start = 0x40300000 );
 PROVIDE ( _SPIFFS_end = 0x40A00000 );
+PROVIDE ( _SPIFFS_page = 0x100 );
+PROVIDE ( _SPIFFS_block = 0x2000 );
 
 INCLUDE "../ld/eagle.app.v6.common.ld"