fix: Fix rebase errors

esp-rs · Nov 22, 2023 · 515707b · 515707b
1 parent 7251cf6
commit 515707b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/cargo-espflash/src/main.rs b/cargo-espflash/src/main.rs
@@ -577,7 +577,6 @@ fn save_image(args: SaveImageArgs) -> Result<()> {
         flash_data,
         args.save_image_args.merge,
         args.save_image_args.skip_padding,
-        args.save_image_args.skip_padding,
     )?;
 
     Ok(())

diff --git a/espflash/src/bin/espflash.rs b/espflash/src/bin/espflash.rs
@@ -236,6 +236,7 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
         let flash_data = FlashData::new(
             bootloader,
             partition_table,
+            args.flash_args.partition_table_offset,
             args.flash_args.format,
             args.flash_args.target_app_partition,
             flash_settings,

diff --git a/espflash/src/flasher/mod.rs b/espflash/src/flasher/mod.rs
@@ -273,6 +273,7 @@ impl FlashData {
     pub fn new(
         bootloader: Option<&Path>,
         partition_table: Option<&Path>,
+        partition_table_offset: Option<u32>,
         image_format: Option<ImageFormatKind>,
         target_app_partition: Option<String>,
         flash_settings: FlashSettings,