Skip to content

Commit ea066f5

Browse files
lucasssvazlucasssvaz
committed
fix(esptool): Bump esptool version to 4.9.dev1 on 3.0.x
1 parent dc8e81d commit ea066f5

File tree

2 files changed

+35
-42
lines changed

2 files changed

+35
-42
lines changed

Diff for: ‎package/package_esp32_index.template.json

+35-35
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
{
8383
"packager": "esp32",
8484
"name": "esptool_py",
85-
"version": "4.6"
85+
"version": "4.9.dev1"
8686
},
8787
{
8888
"packager": "esp32",
@@ -594,56 +594,56 @@
594594
},
595595
{
596596
"name": "esptool_py",
597-
"version": "4.6",
597+
"version": "4.9.dev1",
598598
"systems": [
599599
{
600600
"host": "x86_64-pc-linux-gnu",
601-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-src.tar.gz",
602-
"archiveFileName": "esptool-v4.6-src.tar.gz",
603-
"checksum": "SHA-256:22f9bad0cd1cea14e554ac1f4a6d8f67415ff7029a66ce9130756276e7264e5a",
604-
"size": "99141"
601+
"url": "https://github.com/espressif/arduino-esp32/releases/download/3.1.0-RC2/esptool-v4.9.dev1-linux-amd64.tar.gz",
602+
"archiveFileName": "esptool-v4.9.dev1-linux-amd64.tar.gz",
603+
"checksum": "SHA-256:21f6c2155f0ec9e5b475c8a4bf59803d8cfb4d74f4e488a80f97da3d77542bba",
604+
"size": "64632960"
605605
},
606606
{
607-
"host": "i686-pc-linux-gnu",
608-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-src.tar.gz",
609-
"archiveFileName": "esptool-v4.6-src.tar.gz",
610-
"checksum": "SHA-256:22f9bad0cd1cea14e554ac1f4a6d8f67415ff7029a66ce9130756276e7264e5a",
611-
"size": "99141"
607+
"host": "arm-linux-gnueabihf",
608+
"url": "https://github.com/espressif/arduino-esp32/releases/download/3.1.0-RC2/esptool-v4.9.dev1-linux-arm32.tar.gz",
609+
"archiveFileName": "esptool-v4.9.dev1-linux-arm32.tar.gz",
610+
"checksum": "SHA-256:818477f10814b2bd82078fc6695663ac84220d3947722ce1880a6c867d5c2997",
611+
"size": "46042432"
612612
},
613613
{
614614
"host": "aarch64-linux-gnu",
615-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-src.tar.gz",
616-
"archiveFileName": "esptool-v4.6-src.tar.gz",
617-
"checksum": "SHA-256:22f9bad0cd1cea14e554ac1f4a6d8f67415ff7029a66ce9130756276e7264e5a",
618-
"size": "99141"
619-
},
620-
{
621-
"host": "arm-linux-gnueabihf",
622-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-src.tar.gz",
623-
"archiveFileName": "esptool-v4.6-src.tar.gz",
624-
"checksum": "SHA-256:22f9bad0cd1cea14e554ac1f4a6d8f67415ff7029a66ce9130756276e7264e5a",
625-
"size": "99141"
615+
"url": "https://github.com/espressif/arduino-esp32/releases/download/3.1.0-RC2/esptool-v4.9.dev1-linux-arm64.tar.gz",
616+
"archiveFileName": "esptool-v4.9.dev1-linux-arm64.tar.gz",
617+
"checksum": "SHA-256:b377a130a4dca58f3a31c66ed0b9858cc057c998741222cccdb6e5a724651a1f",
618+
"size": "54459357"
626619
},
627620
{
628621
"host": "x86_64-apple-darwin",
629-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-macos.tar.gz",
630-
"archiveFileName": "esptool-v4.6-macos.tar.gz",
631-
"checksum": "SHA-256:885ec69fcffdcb9e7c6eacd2589f13a45ce6bcb6742bea368ec3a73bcca6dd59",
632-
"size": "5851297"
622+
"url": "https://github.com/espressif/arduino-esp32/releases/download/3.1.0-RC2/esptool-v4.9.dev1-macos-amd64.tar.gz",
623+
"archiveFileName": "esptool-v4.9.dev1-macos-amd64.tar.gz",
624+
"checksum": "SHA-256:25cc246b20230afc287ffdfe95f57b3fab23cec88a6dde3b5092ec05926b5431",
625+
"size": "32386336"
633626
},
634627
{
635-
"host": "x86_64-mingw32",
636-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-win64.zip",
637-
"archiveFileName": "esptool-v4.6-win64.zip",
638-
"checksum": "SHA-256:c7c68cd1aa520cbfce488ff6a77818ece272272eb012831b9d9ab1280a7c393f",
639-
"size": "6638480"
628+
"host": "arm64-apple-darwin",
629+
"url": "https://github.com/espressif/arduino-esp32/releases/download/3.1.0-RC2/esptool-v4.9.dev1-macos-arm64.tar.gz",
630+
"archiveFileName": "esptool-v4.9.dev1-macos-arm64.tar.gz",
631+
"checksum": "SHA-256:b845d678db1d1559d82894e68366683a7fc3809371a5f5def67c30c9dee15912",
632+
"size": "29841092"
640633
},
641634
{
642635
"host": "i686-mingw32",
643-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-win64.zip",
644-
"archiveFileName": "esptool-v4.6-win64.zip",
645-
"checksum": "SHA-256:c7c68cd1aa520cbfce488ff6a77818ece272272eb012831b9d9ab1280a7c393f",
646-
"size": "6638480"
636+
"url": "https://github.com/espressif/arduino-esp32/releases/download/3.1.0-RC2/esptool-v4.9.dev1-win64.zip",
637+
"archiveFileName": "esptool-v4.9.dev1-win64.zip",
638+
"checksum": "SHA-256:f649a212e086b06ca6ee595feffd7a4706696ea43a2cd1a4f49352829e8ac96e",
639+
"size": "35812159"
640+
},
641+
{
642+
"host": "x86_64-mingw32",
643+
"url": "https://github.com/espressif/arduino-esp32/releases/download/3.1.0-RC2/esptool-v4.9.dev1-win64.zip",
644+
"archiveFileName": "esptool-v4.9.dev1-win64.zip",
645+
"checksum": "SHA-256:f649a212e086b06ca6ee595feffd7a4706696ea43a2cd1a4f49352829e8ac96e",
646+
"size": "35812159"
647647
}
648648
]
649649
},

Diff for: ‎platform.txt

-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ tools.riscv32-esp-elf-gdb.path={runtime.platform.path}/tools/riscv32-esp-elf-gdb
1212

1313
tools.esptool_py.path={runtime.platform.path}/tools/esptool
1414
tools.esptool_py.cmd=esptool
15-
tools.esptool_py.cmd.linux=esptool.py
1615
tools.esptool_py.cmd.windows=esptool.exe
1716

1817
tools.esptool_py.network_cmd=python3 "{runtime.platform.path}/tools/espota.py" -r
@@ -123,7 +122,6 @@ recipe.hooks.prebuild.3.pattern.windows=cmd /c if not exist "{build.path}\partit
123122
# Check if custom bootloader exist: source > variant > build.boot
124123
recipe.hooks.prebuild.4.pattern_args=--chip {build.mcu} elf2image --flash_mode {build.flash_mode} --flash_freq {build.img_freq} --flash_size {build.flash_size} -o
125124
recipe.hooks.prebuild.4.pattern=/usr/bin/env bash -c "[ -f "{build.source.path}"/bootloader.bin ] && cp -f "{build.source.path}"/bootloader.bin "{build.path}"/{build.project_name}.bootloader.bin || ( [ -f "{build.variant.path}"/{build.custom_bootloader}.bin ] && cp "{build.variant.path}"/{build.custom_bootloader}.bin "{build.path}"/{build.project_name}.bootloader.bin || "{tools.esptool_py.path}"/{tools.esptool_py.cmd} {recipe.hooks.prebuild.4.pattern_args} "{build.path}"/{build.project_name}.bootloader.bin "{compiler.sdk.path}"/bin/bootloader_{build.boot}_{build.boot_freq}.elf )"
126-
recipe.hooks.prebuild.4.pattern.linux=/usr/bin/env bash -c "[ -f "{build.source.path}"/bootloader.bin ] && cp -f "{build.source.path}"/bootloader.bin "{build.path}"/{build.project_name}.bootloader.bin || ( [ -f "{build.variant.path}"/{build.custom_bootloader}.bin ] && cp "{build.variant.path}"/{build.custom_bootloader}.bin "{build.path}"/{build.project_name}.bootloader.bin || python3 "{tools.esptool_py.path}"/{tools.esptool_py.cmd} {recipe.hooks.prebuild.4.pattern_args} "{build.path}"/{build.project_name}.bootloader.bin "{compiler.sdk.path}"/bin/bootloader_{build.boot}_{build.boot_freq}.elf )"
127125
recipe.hooks.prebuild.4.pattern.windows=cmd /c IF EXIST "{build.source.path}\bootloader.bin" ( COPY /y "{build.source.path}\bootloader.bin" "{build.path}\{build.project_name}.bootloader.bin" ) ELSE ( IF EXIST "{build.variant.path}\{build.custom_bootloader}.bin" ( COPY "{build.variant.path}\{build.custom_bootloader}.bin" "{build.path}\{build.project_name}.bootloader.bin" ) ELSE ( "{tools.esptool_py.path}\{tools.esptool_py.cmd}" {recipe.hooks.prebuild.4.pattern_args} "{build.path}\{build.project_name}.bootloader.bin" "{compiler.sdk.path}\bin\bootloader_{build.boot}_{build.boot_freq}.elf" ) )
128126

129127
# Check if custom build options exist in the sketch folder
@@ -168,7 +166,6 @@ recipe.objcopy.partitions.bin.pattern={tools.gen_esp32part.cmd} -q "{build.path}
168166
## Create bin
169167
recipe.objcopy.bin.pattern_args=--chip {build.mcu} elf2image --flash_mode "{build.flash_mode}" --flash_freq "{build.img_freq}" --flash_size "{build.flash_size}" --elf-sha256-offset 0xb0 -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"
170168
recipe.objcopy.bin.pattern="{tools.esptool_py.path}/{tools.esptool_py.cmd}" {recipe.objcopy.bin.pattern_args}
171-
recipe.objcopy.bin.pattern.linux=python3 "{tools.esptool_py.path}/{tools.esptool_py.cmd}" {recipe.objcopy.bin.pattern_args}
172169

173170
## Create Insights Firmware Package
174171
recipe.hooks.objcopy.postobjcopy.1.pattern_args={build.path} {build.project_name} "{build.source.path}"
@@ -182,7 +179,6 @@ recipe.hooks.objcopy.postobjcopy.2.pattern.windows=cmd /c if exist "{build.path}
182179
# Create merged binary
183180
recipe.hooks.objcopy.postobjcopy.3.pattern_args=--chip {build.mcu} merge_bin -o "{build.path}/{build.project_name}.merged.bin" --fill-flash-size {build.flash_size} --flash_mode keep --flash_freq keep --flash_size keep {build.bootloader_addr} "{build.path}/{build.project_name}.bootloader.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin" 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x10000 "{build.path}/{build.project_name}.bin"
184181
recipe.hooks.objcopy.postobjcopy.3.pattern="{tools.esptool_py.path}/{tools.esptool_py.cmd}" {recipe.hooks.objcopy.postobjcopy.3.pattern_args}
185-
recipe.hooks.objcopy.postobjcopy.3.pattern.linux=python3 "{tools.esptool_py.path}/{tools.esptool_py.cmd}" {recipe.hooks.objcopy.postobjcopy.3.pattern_args}
186182

187183
## Save bin
188184
recipe.output.tmp_file={build.project_name}.bin
@@ -292,15 +288,13 @@ tools.esptool_py.upload.params.verbose=
292288
tools.esptool_py.upload.params.quiet=
293289
tools.esptool_py.upload.pattern_args=--chip {build.mcu} --port "{serial.port}" --baud {upload.speed} {upload.flags} --before default_reset --after hard_reset write_flash {upload.erase_cmd} -z --flash_mode keep --flash_freq keep --flash_size keep {build.bootloader_addr} "{build.path}/{build.project_name}.bootloader.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin" 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x10000 "{build.path}/{build.project_name}.bin" {upload.extra_flags}
294290
tools.esptool_py.upload.pattern="{path}/{cmd}" {upload.pattern_args}
295-
tools.esptool_py.upload.pattern.linux=python3 "{path}/{cmd}" {upload.pattern_args}
296291

297292
## Program Application
298293
## -------------------
299294
tools.esptool_py.program.params.verbose=
300295
tools.esptool_py.program.params.quiet=
301296
tools.esptool_py.program.pattern_args=--chip {build.mcu} --port "{serial.port}" --baud {upload.speed} {upload.flags} --before default_reset --after hard_reset write_flash -z --flash_mode keep --flash_freq keep --flash_size keep 0x10000 "{build.path}/{build.project_name}.bin"
302297
tools.esptool_py.program.pattern="{path}/{cmd}" {program.pattern_args}
303-
tools.esptool_py.program.pattern.linux=python3 "{path}/{cmd}" {program.pattern_args}
304298

305299
## Erase Chip (before burning the bootloader)
306300
## ------------------------------------------
@@ -309,7 +303,6 @@ tools.esptool_py.erase.params.verbose=
309303
tools.esptool_py.erase.params.quiet=
310304
tools.esptool_py.erase.pattern_args=--chip {build.mcu} --port "{serial.port}" --baud {upload.speed} {upload.flags} --before default_reset --after hard_reset erase_flash
311305
tools.esptool_py.erase.pattern="{path}/{cmd}" {erase.pattern_args}
312-
tools.esptool_py.erase.pattern.linux=python3 "{path}/{cmd}" {erase.pattern_args}
313306

314307
## Burn Bootloader
315308
## ---------------

0 commit comments

Comments
 (0)