Add support for flashing the ESP32-C6

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**, **ESP32-S2/S3**, and **ESP8266**.
+Supports the **ESP32**, **ESP32-C2/C3/C6**, **ESP32-S2/S3**, and **ESP8266**.
 
 ## [cargo-espflash](./cargo-espflash/)
 

cargo-espflash/README.md

@@ -6,7 +6,7 @@
 
 Cross-compiler and Cargo extension for flashing Espressif devices over serial.
 
-Supports the **ESP32**, **ESP32-C2/C3**, **ESP32-S2/S3**, and **ESP8266**.
+Supports the **ESP32**, **ESP32-C2/C3/C6**, **ESP32-S2/S3**, and **ESP8266**.
 
 ## Installation
 

espflash/README.md

@@ -7,7 +7,7 @@
 
 A library and command-line tool for flashing Espressif devices over serial.
 
-Supports the **ESP32**, **ESP32-C2/C3**, **ESP32-S2/S3**, and **ESP8266**.
+Supports the **ESP32**, **ESP32-C2/C3/C6**, **ESP32-S2/S3**, and **ESP8266**.
 
 ## Installation
 

espflash/resources/stubs/stub_flasher_32c6.toml

@@ -0,0 +1,5 @@
+entry = 1_082_131_920
+text = "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"
+text_start = 1_082_130_432
+data = "DACEQA=="
+data_start = 1_082_469_288

espflash/src/flasher/stubs.rs

@@ -22,6 +22,7 @@ pub struct FlashStub {
 const STUB_32: &str = include_str!("../../resources/stubs/stub_flasher_32.toml");
 const STUB_32C2: &str = include_str!("../../resources/stubs/stub_flasher_32c2.toml");
 const STUB_32C3: &str = include_str!("../../resources/stubs/stub_flasher_32c3.toml");
+const STUB_32C6: &str = include_str!("../../resources/stubs/stub_flasher_32c6.toml");
 const STUB_32S2: &str = include_str!("../../resources/stubs/stub_flasher_32s2.toml");
 const STUB_32S3: &str = include_str!("../../resources/stubs/stub_flasher_32s3.toml");
 const STUB_8266: &str = include_str!("../../resources/stubs/stub_flasher_8266.toml");
@@ -33,6 +34,7 @@ impl FlashStub {
             Chip::Esp32 => STUB_32,
             Chip::Esp32c2 => STUB_32C2,
             Chip::Esp32c3 => STUB_32C3,
+            Chip::Esp32c6 => STUB_32C6,
             Chip::Esp32s2 => STUB_32S2,
             Chip::Esp32s3 => STUB_32S3,
             Chip::Esp8266 => STUB_8266,

espflash/src/targets/esp32c6.rs

@@ -0,0 +1,120 @@
+use std::ops::Range;
+
+use esp_idf_part::PartitionTable;
+
+use super::{Chip, Esp32Params, ReadEFuse, SpiRegisters, Target};
+use crate::{
+    connection::Connection,
+    elf::FirmwareImage,
+    error::Error,
+    flasher::{FlashFrequency, FlashMode, FlashSize},
+    image_format::{DirectBootFormat, IdfBootloaderFormat, ImageFormat, ImageFormatKind},
+};
+
+const CHIP_DETECT_MAGIC_VALUES: &[u32] = &[0x2CE0_806F];
+
+const FLASH_RANGES: &[Range<u32>] = &[
+    0x4200_0000..0x4280_0000, // IROM
+    0x4280_0000..0x4300_0000, // DROM
+];
+
+const PARAMS: Esp32Params = Esp32Params::new(
+    0x0,
+    0x1_0000,
+    0x3f_0000,
+    13,
+    include_bytes!("../../resources/bootloaders/esp32c6-bootloader.bin"),
+);
+
+/// ESP32-C6 Target
+pub struct Esp32c6;
+
+impl Esp32c6 {
+    pub fn has_magic_value(value: u32) -> bool {
+        CHIP_DETECT_MAGIC_VALUES.contains(&value)
+    }
+}
+
+impl ReadEFuse for Esp32c6 {
+    fn efuse_reg(&self) -> u32 {
+        0x600B_0800
+    }
+}
+
+impl Target for Esp32c6 {
+    fn addr_is_flash(&self, addr: u32) -> bool {
+        FLASH_RANGES.iter().any(|range| range.contains(&addr))
+    }
+
+    fn chip_features(&self, _connection: &mut Connection) -> Result<Vec<&str>, Error> {
+        Ok(vec!["WiFi 6", "BT 5"])
+    }
+
+    fn major_chip_version(&self, connection: &mut Connection) -> Result<u32, Error> {
+        Ok((self.read_efuse(connection, 22)? >> 24) & 0x3)
+    }
+
+    fn minor_chip_version(&self, connection: &mut Connection) -> Result<u32, Error> {
+        let hi = (self.read_efuse(connection, 22)? >> 23) & 0x1;
+        let lo = (self.read_efuse(connection, 20)? >> 18) & 0x7;
+
+        Ok((hi << 3) + lo)
+    }
+
+    fn crystal_freq(&self, _connection: &mut Connection) -> Result<u32, Error> {
+        // The ESP32-C6's XTAL has a fixed frequency of 40MHz.
+        Ok(40)
+    }
+
+    fn get_flash_image<'a>(
+        &self,
+        image: &'a dyn FirmwareImage<'a>,
+        bootloader: Option<Vec<u8>>,
+        partition_table: Option<PartitionTable>,
+        image_format: Option<ImageFormatKind>,
+        _chip_revision: Option<(u32, u32)>,
+        flash_mode: Option<FlashMode>,
+        flash_size: Option<FlashSize>,
+        flash_freq: Option<FlashFrequency>,
+    ) -> Result<Box<dyn ImageFormat<'a> + 'a>, Error> {
+        let image_format = image_format.unwrap_or(ImageFormatKind::EspBootloader);
+
+        match image_format {
+            ImageFormatKind::EspBootloader => Ok(Box::new(IdfBootloaderFormat::new(
+                image,
+                Chip::Esp32c6,
+                PARAMS,
+                partition_table,
+                bootloader,
+                flash_mode,
+                flash_size,
+                flash_freq,
+            )?)),
+            ImageFormatKind::DirectBoot => Ok(Box::new(DirectBootFormat::new(image, 0x0)?)),
+        }
+    }
+
+    fn spi_registers(&self) -> SpiRegisters {
+        SpiRegisters {
+            base: 0x6000_3000,
+            usr_offset: 0x18,
+            usr1_offset: 0x1c,
+            usr2_offset: 0x20,
+            w0_offset: 0x58,
+            mosi_length_offset: Some(0x24),
+            miso_length_offset: Some(0x28),
+        }
+    }
+
+    fn supported_image_formats(&self) -> &[ImageFormatKind] {
+        &[ImageFormatKind::EspBootloader, ImageFormatKind::DirectBoot]
+    }
+
+    fn supported_build_targets(&self) -> &[&str] {
+        &[
+            "riscv32imac-unknown-none-elf",
+            "riscv32imc-esp-espidf",
+            "riscv32imc-unknown-none-elf",
+        ]
+    }
+}

espflash/src/targets/mod.rs

@@ -16,6 +16,7 @@ pub use self::{
     esp32::Esp32,
     esp32c2::Esp32c2,
     esp32c3::Esp32c3,
+    esp32c6::Esp32c6,
     esp32s2::Esp32s2,
     esp32s3::Esp32s3,
     esp8266::Esp8266,
@@ -32,6 +33,7 @@ use crate::{
 mod esp32;
 mod esp32c2;
 mod esp32c3;
+mod esp32c6;
 mod esp32s2;
 mod esp32s3;
 mod esp8266;
@@ -47,6 +49,8 @@ pub enum Chip {
     Esp32c2,
     /// ESP32-C3, ESP8685
     Esp32c3,
+    /// ESP32-C6
+    Esp32c6,
     /// ESP32-S2
     Esp32s2,
     /// ESP32-S3
@@ -65,6 +69,7 @@ impl FromStr for Chip {
             "esp32" => Ok(Esp32),
             "esp32c2" => Ok(Esp32c2),
             "esp32c3" => Ok(Esp32c3),
+            "esp32c6" => Ok(Esp32c6),
             "esp32s2" => Ok(Esp32s2),
             "esp32s3" => Ok(Esp32s3),
             "esp8266" => Ok(Esp8266),
@@ -81,6 +86,8 @@ impl Chip {
             Ok(Chip::Esp32c2)
         } else if Esp32c3::has_magic_value(magic) {
             Ok(Chip::Esp32c3)
+        } else if Esp32c6::has_magic_value(magic) {
+            Ok(Chip::Esp32c6)
         } else if Esp32s2::has_magic_value(magic) {
             Ok(Chip::Esp32s2)
         } else if Esp32s3::has_magic_value(magic) {
@@ -97,6 +104,7 @@ impl Chip {
             Chip::Esp32 => Box::new(Esp32),
             Chip::Esp32c2 => Box::new(Esp32c2),
             Chip::Esp32c3 => Box::new(Esp32c3),
+            Chip::Esp32c6 => Box::new(Esp32c6),
             Chip::Esp32s2 => Box::new(Esp32s2),
             Chip::Esp32s3 => Box::new(Esp32s3),
             Chip::Esp8266 => Box::new(Esp8266),