Skip to content

Commit b790bff

Browse files
igrrigrr
committed
Update flash layout to use eboot
1 parent de28edb commit b790bff

11 files changed

+32
-32
lines changed

‎boards.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ generic.name=Generic ESP8266 Module
99
generic.upload.tool=esptool
1010
generic.upload.speed=115200
1111
generic.upload.resetmethod=ck
12-
generic.upload.maximum_size=372736
12+
generic.upload.maximum_size=434160
1313
generic.upload.maximum_data_size=81920
1414
generic.upload.wait_for_upload_port=true
1515
generic.serial.disableDTR=true
@@ -59,55 +59,55 @@ generic.menu.FlashSize.512K.build.flash_ld=eagle.flash.512k.ld
5959
generic.menu.FlashSize.512K.build.spiffs_start=0x6B000
6060
generic.menu.FlashSize.512K.build.spiffs_end=0x7B000
6161
generic.menu.FlashSize.512K.build.spiffs_blocksize=4096
62-
generic.menu.FlashSize.512K.upload.maximum_size=372736
62+
generic.menu.FlashSize.512K.upload.maximum_size=434160
6363

6464
generic.menu.FlashSize.1M512=1M (512K SPIFFS)
6565
generic.menu.FlashSize.1M512.build.flash_size=1M
6666
generic.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
67-
generic.menu.FlashSize.1M512.build.spiffs_start=0x6B000
67+
generic.menu.FlashSize.1M512.build.spiffs_start=0x7B000
6868
generic.menu.FlashSize.1M512.build.spiffs_end=0xFB000
6969
generic.menu.FlashSize.1M512.build.spiffs_blocksize=8192
70-
generic.menu.FlashSize.1M512.upload.maximum_size=438272
70+
generic.menu.FlashSize.1M512.upload.maximum_size=499696
7171

7272
generic.menu.FlashSize.1M256=1M (256K SPIFFS)
7373
generic.menu.FlashSize.1M256.build.flash_size=1M
7474
generic.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
75-
generic.menu.FlashSize.1M256.build.spiffs_start=0xAB000
75+
generic.menu.FlashSize.1M256.build.spiffs_start=0xBB000
7676
generic.menu.FlashSize.1M256.build.spiffs_end=0xFB000
7777
generic.menu.FlashSize.1M256.build.spiffs_blocksize=4096
78-
generic.menu.FlashSize.1M256.upload.maximum_size=700416
78+
generic.menu.FlashSize.1M256.upload.maximum_size=761840
7979

8080
generic.menu.FlashSize.1M128=1M (128K SPIFFS)
8181
generic.menu.FlashSize.1M128.build.flash_size=1M
8282
generic.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
83-
generic.menu.FlashSize.1M128.build.spiffs_start=0xCB000
83+
generic.menu.FlashSize.1M128.build.spiffs_start=0xDB000
8484
generic.menu.FlashSize.1M128.build.spiffs_end=0xFB000
8585
generic.menu.FlashSize.1M128.build.spiffs_blocksize=4096
86-
generic.menu.FlashSize.1M128.upload.maximum_size=831488
86+
generic.menu.FlashSize.1M128.upload.maximum_size=892912
8787

8888
generic.menu.FlashSize.1M64=1M (64K SPIFFS)
8989
generic.menu.FlashSize.1M64.build.flash_size=1M
9090
generic.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
9191
generic.menu.FlashSize.1M64.build.spiffs_start=0xEB000
9292
generic.menu.FlashSize.1M64.build.spiffs_end=0xFB000
9393
generic.menu.FlashSize.1M64.build.spiffs_blocksize=4096
94-
generic.menu.FlashSize.1M64.upload.maximum_size=897024
94+
generic.menu.FlashSize.1M64.upload.maximum_size=958448
9595

9696
generic.menu.FlashSize.2M=2M (1M SPIFFS)
9797
generic.menu.FlashSize.2M.build.flash_size=2M
9898
generic.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
9999
generic.menu.FlashSize.2M.build.spiffs_start=0x100000
100100
generic.menu.FlashSize.2M.build.spiffs_end=0x1FB000
101101
generic.menu.FlashSize.2M.build.spiffs_blocksize=8192
102-
generic.menu.FlashSize.2M.upload.maximum_size=983040
102+
generic.menu.FlashSize.2M.upload.maximum_size=1044464
103103

104104
generic.menu.FlashSize.4M=4M (3M SPIFFS)
105105
generic.menu.FlashSize.4M.build.flash_size=4M
106106
generic.menu.FlashSize.4M.build.flash_ld=eagle.flash.4m.ld
107107
generic.menu.FlashSize.4M.build.spiffs_start=0x100000
108108
generic.menu.FlashSize.4M.build.spiffs_end=0x3FB000
109109
generic.menu.FlashSize.4M.build.spiffs_blocksize=8192
110-
generic.menu.FlashSize.4M.upload.maximum_size=983040
110+
generic.menu.FlashSize.4M.upload.maximum_size=1044464
111111

112112
# disabled because espressif's bootloader refuses to write above 4M
113113
# generic.menu.FlashSize.8M=8M (7M SPIFFS)

‎platform.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ recipe.objcopy.eep.pattern=
7474
## Create hex
7575
#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"
7676

77-
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
77+
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
7878

7979
## Compute size
8080
recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
81-
recipe.size.regex=^(?:\.irom0\.text|)\s+([0-9]+).*
81+
recipe.size.regex=^(?:\.irom0\.text|\.text|\.data|\.rodata|\.bss|)\s+([0-9]+).*
8282
recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
8383
#recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
8484

@@ -91,4 +91,4 @@ tools.esptool.path={runtime.platform.path}/tools
9191
tools.esptool.upload.protocol=esp
9292
tools.esptool.upload.params.verbose=-vv
9393
tools.esptool.upload.params.quiet=
94-
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"
94+
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"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Flash Split for 16M chips */
2-
/* irom0 940KB */
2+
/* sketch 1019KB */
33
/* eeprom 20KB */
44
/* spiffs 15MB */
55

@@ -8,7 +8,7 @@ MEMORY
88
dport0_0_seg : org = 0x3FF00000, len = 0x10
99
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
1010
iram1_0_seg : org = 0x40100000, len = 0x8000
11-
irom0_0_seg : org = 0x40210000, len = 0xEB000
11+
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1212
}
1313

1414
PROVIDE ( _SPIFFS_start = 0x40300000 );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Flash Split for 1M chips */
2-
/* irom0 812KB */
2+
/* sketch 871KB */
33
/* spiffs 128KB */
44
/* eeprom 20KB */
55

@@ -8,7 +8,7 @@ MEMORY
88
dport0_0_seg : org = 0x3FF00000, len = 0x10
99
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
1010
iram1_0_seg : org = 0x40100000, len = 0x8000
11-
irom0_0_seg : org = 0x40210000, len = 0xCB000
11+
irom0_0_seg : org = 0x40201010, len = 0xd9ff0
1212
}
1313

1414
PROVIDE ( _SPIFFS_start = 0x402DB000 );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Flash Split for 1M chips */
2-
/* irom0 684KB */
2+
/* sketch 743KB */
33
/* spiffs 256KB */
44
/* eeprom 20KB */
55

@@ -8,7 +8,7 @@ MEMORY
88
dport0_0_seg : org = 0x3FF00000, len = 0x10
99
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
1010
iram1_0_seg : org = 0x40100000, len = 0x8000
11-
irom0_0_seg : org = 0x40210000, len = 0xAB000
11+
irom0_0_seg : org = 0x40201010, len = 0xb9ff0
1212
}
1313

1414
PROVIDE ( _SPIFFS_start = 0x402BB000 );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Flash Split for 1M chips */
2-
/* irom0 428KB */
2+
/* sketch 487KB */
33
/* spiffs 512KB */
44
/* eeprom 20KB */
55

@@ -8,7 +8,7 @@ MEMORY
88
dport0_0_seg : org = 0x3FF00000, len = 0x10
99
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
1010
iram1_0_seg : org = 0x40100000, len = 0x8000
11-
irom0_0_seg : org = 0x40210000, len = 0x6B000
11+
irom0_0_seg : org = 0x40201010, len = 0x79ff0
1212
}
1313

1414
PROVIDE ( _SPIFFS_start = 0x4027B000 );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Flash Split for 1M chips */
2-
/* irom0 876KB */
2+
/* sketch 935KB */
33
/* spiffs 64KB */
44
/* eeprom 20KB */
55

@@ -8,7 +8,7 @@ MEMORY
88
dport0_0_seg : org = 0x3FF00000, len = 0x10
99
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
1010
iram1_0_seg : org = 0x40100000, len = 0x8000
11-
irom0_0_seg : org = 0x40210000, len = 0xDB000
11+
irom0_0_seg : org = 0x40201010, len = 0xe9ff0
1212
}
1313

1414
PROVIDE ( _SPIFFS_start = 0x402EB000 );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Flash Split for 2M chips */
2-
/* irom0 960KB */
2+
/* sketch 1019KB */
33
/* spiffs 1004KB */
44
/* eeprom 20KB */
55

@@ -8,7 +8,7 @@ MEMORY
88
dport0_0_seg : org = 0x3FF00000, len = 0x10
99
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
1010
iram1_0_seg : org = 0x40100000, len = 0x8000
11-
irom0_0_seg : org = 0x40210000, len = 0xF0000
11+
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1212
}
1313

1414
PROVIDE ( _SPIFFS_start = 0x40300000 );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Flash Split for 4M chips */
2-
/* irom0 960KB */
2+
/* sketch 1019KB */
33
/* spiffs 3052KB */
44
/* eeprom 20KB */
55

@@ -8,7 +8,7 @@ MEMORY
88
dport0_0_seg : org = 0x3FF00000, len = 0x10
99
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
1010
iram1_0_seg : org = 0x40100000, len = 0x8000
11-
irom0_0_seg : org = 0x40210000, len = 0xF0000
11+
irom0_0_seg : org = 0x40201010, len = 0xfeff0
1212
}
1313

1414
PROVIDE ( _SPIFFS_start = 0x40300000 );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Flash Split for 512K chips */
2-
/* irom0 364KB */
2+
/* sketch 423KB */
33
/* spiffs 64KB */
44
/* eeprom 20KB */
55

@@ -8,7 +8,7 @@ MEMORY
88
dport0_0_seg : org = 0x3FF00000, len = 0x10
99
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
1010
iram1_0_seg : org = 0x40100000, len = 0x8000
11-
irom0_0_seg : org = 0x40210000, len = 0x5B000
11+
irom0_0_seg : org = 0x40201010, len = 0x69ff0
1212
}
1313

1414
PROVIDE ( _SPIFFS_start = 0x4026B000 );

0 commit comments

Comments
 (0)