Skip to content

Commit 639ef08

Browse files
authored
Backport esptool v5.0.0 support (#11566)
1 parent 0ab523d commit 639ef08

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

tools/pioarduino-build.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ def generate_bootloader_image(bootloader_elf):
9595
env.VerboseAction(
9696
" ".join(
9797
[
98-
'"$PYTHONEXE" "$OBJCOPY"',
98+
"$OBJCOPY",
9999
"--chip",
100100
build_mcu,
101101
"elf2image",
102-
"--flash_mode",
102+
"--flash-mode",
103103
"${__get_board_flash_mode(__env__)}",
104-
"--flash_freq",
104+
"--flash-freq",
105105
"${__get_board_f_image(__env__)}",
106-
"--flash_size",
106+
"--flash-size",
107107
board_config.get("upload.flash_size", "4MB"),
108108
"-o",
109109
"$TARGET",
@@ -216,8 +216,14 @@ def add_tinyuf2_extra_image():
216216
"0x1000" if build_mcu in ["esp32", "esp32s2"] else ("0x2000" if build_mcu in ["esp32p4"] else "0x0000"),
217217
get_bootloader_image(variants_dir),
218218
),
219-
("0x8000", join(env.subst("$BUILD_DIR"), "partitions.bin")),
220-
("0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin")),
219+
(
220+
board_config.get("upload.arduino.partitions_bin", "0x8000"),
221+
join(env.subst("$BUILD_DIR"), "partitions.bin"),
222+
),
223+
(
224+
board_config.get("upload.arduino.boot_app0", "0xe000"),
225+
join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"),
226+
),
221227
]
222228
+ [(offset, join(FRAMEWORK_DIR, img)) for offset, img in board_config.get("upload.arduino.flash_extra_images", [])],
223229
)

0 commit comments

Comments
 (0)