Crude POC for flash ESP app images instead of ELF files (esp-rs#770)

AVee · Feb 17, 2025 · 84a422e · 84a422e
1 parent a559957
commit 84a422e
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml
@@ -38,7 +38,7 @@ defmt-parser    = { version = "=0.4.1", features = ["unstable"], optional = true
 dialoguer       = { version = "0.11.0", optional = true }
 directories     = { version = "5.0.1", optional = true }
 env_logger      = { version = "0.11.6", optional = true }
-esp-idf-part    = "0.5.0"
+esp-idf-part    = { version = "0.5.0", git = "https://github.com/esp-rs/esp-idf-part", rev = "8cb16c0254d8299fe5a4a692e460f73844e024bf" }
 flate2          = "1.0.35"
 hex             = { version = "0.4.3", features = ["serde"] }
 indicatif       = { version = "0.17.9", optional = true }

diff --git a/espflash/src/bin/espflash.rs b/espflash/src/bin/espflash.rs
@@ -1,3 +1,4 @@
+use espflash::image_format;
 use std::{
     fs::{self, File},
     io::Read,

diff --git a/espflash/src/elf.rs b/espflash/src/elf.rs
@@ -9,7 +9,6 @@ use std::{
 };
 
 use xmas_elf::{
-    program::Type,
     sections::{SectionData, ShType},
     ElfFile,
 };

diff --git a/espflash/src/lib.rs b/espflash/src/lib.rs
@@ -39,7 +39,7 @@ pub mod flasher;
 pub mod image_format;
 pub mod targets;
 
-mod elf;
+pub mod elf;
 mod error;
 
 // Command-line interface

diff --git a/espflash/src/targets/flash_target/esp32.rs b/espflash/src/targets/flash_target/esp32.rs
@@ -4,7 +4,7 @@ use flate2::{
     write::{ZlibDecoder, ZlibEncoder},
     Compression,
 };
-use log::{info, warn};
+use log::info;
 use md5::{Digest, Md5};
 
 #[cfg(feature = "serialport")]
@@ -159,12 +159,6 @@ impl FlashTarget for Esp32Target {
                         .try_into()
                 })?;
 
-            if addr == 0x10000 {
-                warn!("Writing!");
-                std::fs::write("/home/avee/projects/xldata/flash/segment_md5_bin", &segment.data).unwrap();
-            }
-            info!("MD5 checksum: {:?}", checksum_md5);
-            info!("Flash MD5 checksum: {:?}", flash_checksum_md5.to_be_bytes());
             if checksum_md5.as_slice() == flash_checksum_md5.to_be_bytes() {
                 info!(
                     "Segment at address '0x{:x}' has not changed, skipping write",