Update flash layout to use eboot

slootsky · Jun 2, 2015 · f265d0f · f265d0f
1 parent aeb83c8
commit f265d0f
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 32 deletions.
diff --git a/hardware/esp8266com/esp8266/boards.txt b/hardware/esp8266com/esp8266/boards.txt
@@ -9,7 +9,7 @@ generic.name=Generic ESP8266 Module
 generic.upload.tool=esptool
 generic.upload.speed=115200
 generic.upload.resetmethod=ck
-generic.upload.maximum_size=372736
+generic.upload.maximum_size=434160
 generic.upload.maximum_data_size=81920
 generic.upload.wait_for_upload_port=true
 generic.serial.disableDTR=true
@@ -59,55 +59,55 @@ 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.512K.upload.maximum_size=372736
+generic.menu.FlashSize.512K.upload.maximum_size=434160
 
 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_start=0x7B000
 generic.menu.FlashSize.1M512.build.spiffs_end=0xFB000
 generic.menu.FlashSize.1M512.build.spiffs_blocksize=8192
-generic.menu.FlashSize.1M512.upload.maximum_size=438272
+generic.menu.FlashSize.1M512.upload.maximum_size=499696
 
 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_start=0xBB000
 generic.menu.FlashSize.1M256.build.spiffs_end=0xFB000
 generic.menu.FlashSize.1M256.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M256.upload.maximum_size=700416
+generic.menu.FlashSize.1M256.upload.maximum_size=761840
 
 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_start=0xDB000
 generic.menu.FlashSize.1M128.build.spiffs_end=0xFB000
 generic.menu.FlashSize.1M128.build.spiffs_blocksize=4096
-generic.menu.FlashSize.1M128.upload.maximum_size=831488
+generic.menu.FlashSize.1M128.upload.maximum_size=892912
 
 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.1M64.upload.maximum_size=897024
+generic.menu.FlashSize.1M64.upload.maximum_size=958448
 
 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.2M.upload.maximum_size=983040
+generic.menu.FlashSize.2M.upload.maximum_size=1044464
 
 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.4M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.4M.upload.maximum_size=983040
+generic.menu.FlashSize.4M.upload.maximum_size=1044464
 
 # disabled because espressif's bootloader refuses to write above 4M
 # generic.menu.FlashSize.8M=8M (7M SPIFFS)

diff --git a/hardware/esp8266com/esp8266/platform.txt b/hardware/esp8266com/esp8266/platform.txt
@@ -74,11 +74,11 @@ recipe.objcopy.eep.pattern=
 ## Create hex
 #recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
 
-recipe.objcopy.hex.pattern="{runtime.tools.esptool.path}/{compiler.esptool.cmd}" -eo "{build.path}/{build.project_name}.elf" -bo "{build.path}/{build.project_name}_00000.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bs .data -bs .rodata -bc -ec -eo "{build.path}/{build.project_name}.elf" -es .irom0.text "{build.path}/{build.project_name}_10000.bin" -ec
+recipe.objcopy.hex.pattern="{runtime.tools.esptool.path}/{compiler.esptool.cmd}" -eo "{runtime.platform.path}/bootloaders/eboot/eboot.elf" -bo "{build.path}/{build.project_name}.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bp 4096 -ec -eo "{build.path}/{build.project_name}.elf" -bs .irom0.text -bs .text -bs .data -bs .rodata -bc -ec
 
 ## Compute size
 recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
-recipe.size.regex=^(?:\.irom0\.text|)\s+([0-9]+).*
+recipe.size.regex=^(?:\.irom0\.text|\.text|\.data|\.rodata|\.bss|)\s+([0-9]+).*
 recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
 #recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
 
@@ -91,4 +91,4 @@ tools.esptool.path={runtime.platform.path}/tools
 tools.esptool.upload.protocol=esp
 tools.esptool.upload.params.verbose=-vv
 tools.esptool.upload.params.quiet=
-tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" -ca 0x00000 -cf "{build.path}/{build.project_name}_00000.bin" -ca 0x10000 -cf "{build.path}/{build.project_name}_10000.bin"
+tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" -ca 0x00000 -cf "{build.path}/{build.project_name}.bin"
diff --git a/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.16m.ld b/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.16m.ld
@@ -1,5 +1,5 @@
 /* Flash Split for 16M chips */
-/* irom0  940KB */
+/* sketch 1019KB */
 /* eeprom 20KB */
 /* spiffs 15MB */
 
@@ -8,7 +8,7 @@ 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 = 0x40210000, len = 0xEB000
+  irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
 PROVIDE ( _SPIFFS_start = 0x40300000 );

diff --git a/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.1m128.ld b/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.1m128.ld
@@ -1,5 +1,5 @@
 /* Flash Split for 1M chips */
-/* irom0  812KB */
+/* sketch 871KB */
 /* spiffs 128KB */
 /* eeprom 20KB */
 
@@ -8,7 +8,7 @@ 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 = 0x40210000, len = 0xCB000
+  irom0_0_seg :                         org = 0x40201010, len = 0xd9ff0
 }
 
 PROVIDE ( _SPIFFS_start = 0x402DB000 );

diff --git a/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.1m256.ld b/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.1m256.ld
@@ -1,5 +1,5 @@
 /* Flash Split for 1M chips */
-/* irom0  684KB */
+/* sketch 743KB */
 /* spiffs 256KB */
 /* eeprom 20KB */
 
@@ -8,7 +8,7 @@ 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 = 0x40210000, len = 0xAB000
+  irom0_0_seg :                         org = 0x40201010, len = 0xb9ff0
 }
 
 PROVIDE ( _SPIFFS_start = 0x402BB000 );

diff --git a/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.1m512.ld b/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.1m512.ld
@@ -1,5 +1,5 @@
 /* Flash Split for 1M chips */
-/* irom0  428KB */
+/* sketch 487KB */
 /* spiffs 512KB */
 /* eeprom 20KB */
 
@@ -8,7 +8,7 @@ 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 = 0x40210000, len = 0x6B000
+  irom0_0_seg :                         org = 0x40201010, len = 0x79ff0
 }
 
 PROVIDE ( _SPIFFS_start = 0x4027B000 );

diff --git a/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.1m64.ld b/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.1m64.ld
@@ -1,5 +1,5 @@
 /* Flash Split for 1M chips */
-/* irom0  876KB */
+/* sketch 935KB */
 /* spiffs 64KB */
 /* eeprom 20KB */
 
@@ -8,7 +8,7 @@ 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 = 0x40210000, len = 0xDB000
+  irom0_0_seg :                         org = 0x40201010, len = 0xe9ff0
 }
 
 PROVIDE ( _SPIFFS_start = 0x402EB000 );

diff --git a/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.2m.ld b/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.2m.ld
@@ -1,5 +1,5 @@
 /* Flash Split for 2M chips */
-/* irom0  960KB */
+/* sketch 1019KB */
 /* spiffs 1004KB */
 /* eeprom 20KB */
 
@@ -8,7 +8,7 @@ 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 = 0x40210000, len = 0xF0000
+  irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
 PROVIDE ( _SPIFFS_start = 0x40300000 );

diff --git a/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.4m.ld b/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.4m.ld
@@ -1,5 +1,5 @@
 /* Flash Split for 4M chips */
-/* irom0  960KB */
+/* sketch 1019KB */
 /* spiffs 3052KB */
 /* eeprom 20KB */
 
@@ -8,7 +8,7 @@ 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 = 0x40210000, len = 0xF0000
+  irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
 PROVIDE ( _SPIFFS_start = 0x40300000 );

diff --git a/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.512k.ld b/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.512k.ld
@@ -1,5 +1,5 @@
 /* Flash Split for 512K chips */
-/* irom0  364KB */
+/* sketch 423KB */
 /* spiffs 64KB */
 /* eeprom 20KB */
 
@@ -8,7 +8,7 @@ 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 = 0x40210000, len = 0x5B000
+  irom0_0_seg :                         org = 0x40201010, len = 0x69ff0
 }
 
 PROVIDE ( _SPIFFS_start = 0x4026B000 );

diff --git a/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.8m.ld b/hardware/esp8266com/esp8266/tools/sdk/ld/eagle.flash.8m.ld
@@ -1,5 +1,5 @@
 /* Flash Split for 8M chips */
-/* irom0  940KB */
+/* sketch 1019KB */
 /* eeprom 20KB */
 /* spiffs 7MB */
 
@@ -8,7 +8,7 @@ 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 = 0x40210000, len = 0xEB000
+  irom0_0_seg :                         org = 0x40201010, len = 0xfeff0
 }
 
 PROVIDE ( _SPIFFS_start = 0x40300000 );