Merge pull request #765 from pgollor/esp8266

fix bug for 4M huzzah with 1M file system  and add 1M file system for generic 4M module

Author: igrr

boards.txt

@@ -112,6 +112,15 @@ generic.menu.FlashSize.2M.build.spiffs_end=0x1FB000
 generic.menu.FlashSize.2M.build.spiffs_blocksize=8192
 generic.menu.FlashSize.2M.upload.maximum_size=1044464
 
+generic.menu.FlashSize.4M1M=4M (1M SPIFFS)
+generic.menu.FlashSize.4M1M.build.flash_size=4M
+generic.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+generic.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+generic.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+generic.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+generic.menu.FlashSize.4M1M.build.spiffs_pagesize=256
+generic.menu.FlashSize.4M1M.upload.maximum_size=3044464
+
 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
@@ -186,7 +195,7 @@ huzzah.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
 huzzah.menu.FlashSize.4M1M.build.spiffs_start=0x300000
 huzzah.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
 huzzah.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
-huzzah.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+huzzah.menu.FlashSize.4M1M.build.spiffs_pagesize=256
 
 ##############################################################
 nodemcu.name=NodeMCU 0.9 (ESP-12 Module)

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

@@ -0,0 +1,19 @@
+/* Flash Split for 4M chips */
+/* sketch 1019KB */
+/* spiffs 3052KB */
+/* eeprom 20KB */
+
+MEMORY
+{
+  dport0_0_seg :                        org = 0x3FF00000, len = 0x10
+  dram0_0_seg :                         org = 0x3FFE8000, len = 0x14000
+  iram1_0_seg :                         org = 0x40100000, len = 0x8000
+  irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
+}
+
+PROVIDE ( _SPIFFS_start = 0x40500000 );
+PROVIDE ( _SPIFFS_end = 0x405FB000 );
+PROVIDE ( _SPIFFS_page = 0x100 );
+PROVIDE ( _SPIFFS_block = 0x2000 );
+
+INCLUDE "../ld/eagle.app.v6.common.ld"