Merge branch 'main' into write-sync-fix

Author: Dzuchun

.github/workflows/hil.yml

@@ -107,6 +107,14 @@ jobs:
             runner: esp32c6-usb
             port: uart
             host: armv7
+          - soc: esp32c61
+            runner: esp32c61-usb
+            port: usb
+            host: aarch64
+          - soc: esp32c61
+            runner: esp32c61-usb
+            port: uart
+            host: aarch64
           - soc: esp32h2
             runner: esp32h2-usb
             port: usb

.gitignore

@@ -1,5 +1,6 @@
 # Generated during tests
 *.bin
+!espflash/resources/bootloaders/*.bin
 
 # Generated by Cargo
 # will have compiled files and executables

CHANGELOG.md

@@ -14,14 +14,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support for binaries with INIT_ARRAY sections, which is needed for esp32p4 support. (#991)
 - Add sha256 calculation to match esptool generated binaries (#991)
 - Support flashing in secure download mode (#990, #1002)
+- Add ESP32-C61 chip support (#1009)
+- Added ESP32-P4 ROM ELFs (#1014)
+- Added ESP32-P4 rev < 300 bootloader (#1016)
+- USB VID/PID 303a:1001 is listed as known (#1022)
 
 ### Changed
 
 ### Fixed
 
+- Fix compilation on Linux when no other dependency transitively enables `nix`'s `signal` feature (#1015)
+- Fix ROM ELFs (#1014)
 - Fix Windows connection issue by aligning reset sequence with `esptool` including RTS/DTR workaround (#999)
 - Fix board-info misreporting the crystal frequency of ESP32-C5 (#1005)
 - Fix `espflash flash` getting stuck on `Sync` command
+- Use `0x4000` flash write blocks in stub mode for better throughput (#1021)
+- [cargo-espflash]: Use CARGO_BUILD_TARGET environment variable in `cargo-espflash` if `--target` is not provided before falling back to the `target` from `config.toml` (#1024)
 
 ### Removed
 

README.md

@@ -6,7 +6,7 @@
 
 Serial flasher utilities for Espressif devices, based loosely on [esptool.py](https://github.com/espressif/esptool/).
 
-Supports the **ESP32**, **ESP32-C2/C3/C5/C6**, **ESP32-H2**, **ESP32-P4**, and **ESP32-S2/S3**.
+Supports the **ESP32**, **ESP32-C2/C3/C5/C6/C61**, **ESP32-H2**, **ESP32-P4**, and **ESP32-S2/S3**.
 
 ## [cargo-espflash](./cargo-espflash/)
 

cargo-espflash/README.md

@@ -7,7 +7,7 @@
 
 Cross-compiler and Cargo extension for flashing Espressif devices.
 
-Supports the **ESP32**, **ESP32-C2/C3/C5/C6**, **ESP32-H2**, **ESP32-P4**, and **ESP32-S2/S3**.
+Supports the **ESP32**, **ESP32-C2/C3/C5/C6/C61**, **ESP32-H2**, **ESP32-P4**, and **ESP32-S2/S3**.
 
 <!-- omit in toc -->
 ## Table of Contents

cargo-espflash/src/error.rs

@@ -1,4 +1,4 @@
-#![expect(unused_assignments)]
+#![allow(unused_assignments)]
 
 use std::{
     fmt::{Display, Formatter},

cargo-espflash/src/main.rs

@@ -17,7 +17,7 @@ use espflash::{
     flasher::FlashSize,
     image_format::{ImageFormat, ImageFormatKind, idf::check_idf_bootloader},
     logging::initialize_logger,
-    target::{Chip, XtalFrequency},
+    target::Chip,
     update::check_for_update,
 };
 use log::{LevelFilter, debug, info};
@@ -354,7 +354,10 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
         &args.flash_args.erase_data_parts,
     )?;
 
-    print_board_info(&mut flasher)?;
+    let dev_info = print_board_info(&mut flasher)?;
+    let detected_chip_revision = dev_info
+        .revision
+        .map(|(major, minor)| (major * 100 + minor) as u16);
     ensure_chip_compatibility(chip, Some(elf_data.as_slice()))?;
 
     let mut flash_config = args.build_args.flash_config_args;
@@ -374,14 +377,15 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
             chip,
             target_xtal_freq,
         );
-        let image_format = make_image_format(
+        let image_format = make_image_format_with_chip_revision(
             &elf_data,
             &flash_data,
             args.format,
             config,
             Some(args.idf_format_args),
             build_ctx.bootloader_path,
             build_ctx.partition_table_path,
+            detected_chip_revision,
         )?;
 
         // If using ESP-IDF image format, check if we need to erase partitions.
@@ -402,22 +406,15 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
     if args.flash_args.monitor {
         let pid = flasher.connection().usb_pid();
 
-        // The 26MHz ESP32-C2's need to be treated as a special case.
-        if chip == Chip::Esp32c2
-            && target_xtal_freq == XtalFrequency::_26Mhz
-            && monitor_args.monitor_baud == 115_200
-        {
-            // 115_200 * 26 MHz / 40 MHz = 74_880
-            monitor_args.monitor_baud = 74_880;
-        }
-
+        preprocess_monitor_args(chip, target_xtal_freq, &mut monitor_args);
         monitor_args.elf = Some(build_ctx.artifact_path);
 
-        let elfs = vec![elf_data.as_ref()];
+        let elfs = load_monitor_elfs(Some(elf_data.as_ref()), &monitor_args, &dev_info)?;
+        let elf_refs = elfs.refs();
 
         monitor(
             flasher.into(),
-            elfs,
+            elf_refs,
             pid,
             monitor_args,
             args.connect_args.non_interactive,
@@ -432,9 +429,11 @@ fn build(
     cargo_config: &CargoConfig,
     chip: Chip,
 ) -> Result<BuildContext> {
+    let target_env = std::env::var("CARGO_BUILD_TARGET");
     let target = build_options
         .target
         .as_deref()
+        .or_else(|| target_env.as_deref().ok())
         .or_else(|| cargo_config.target())
         .ok_or_else(|| NoTargetError::new(Some(chip)))?;
 

espflash/Cargo.toml

@@ -65,7 +65,7 @@ update-informer = { version = "1.2", optional = true }
 libc = "0.2.174"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-nix = { version = "0.30", features = ["time"] }
+nix = { version = "0.30", features = ["signal", "time"] }
 
 [features]
 default = ["cli"]

espflash/README.md

@@ -8,7 +8,7 @@
 
 A library and command-line tool for flashing Espressif devices.
 
-Supports the **ESP32**, **ESP32-C2/C3/C5/C6**, **ESP32-H2**, **ESP32-P4**, and **ESP32-S2/S3**.
+Supports the **ESP32**, **ESP32-C2/C3/C5/C6/C61**, **ESP32-H2**, **ESP32-P4**, and **ESP32-S2/S3**.
 
 <!-- omit in toc -->
 ## Table of Contents

espflash/resources/README.md

@@ -10,5 +10,16 @@ CONFIG_ESPTOOLPY_FLASHSIZE_64MB=y
 CONFIG_ESPTOOLPY_FLASHSIZE="64MB"
 ```
 
+The `esp32p4-v0-bootloader.bin` was built using `v5.5.3` and the following configs:
+```
+CONFIG_ESP32P4_SELECTS_REV_LESS_V3=y
+CONFIG_ESP32P4_REV_MIN_100=y
+```
+
 The flasher stubs are taken from the `espressif/esptool` repository:
 https://github.com/espressif/esptool/tree/master/esptool/targets/stub_flasher/1
+
+
+The roms are taken from the (`esp-rom-elfs`)[https://github.com/espressif/esp-rom-elfs] repository. Expect for:
+- ESP32-P4 rev3: Was built from `esp-rom-elfs` gitlab merge request 30.
+- `esp32c5_rev100_rom.elf` and `esp32c61_rev100_rom.elf`: taken from release `20260313` of `esp-rom-elfs`: https://github.com/espressif/esp-rom-elfs/releases/tag/20260313