make the chip create the flash target

Author: icewind1991

espflash/src/chip/mod.rs

@@ -9,6 +9,8 @@ use crate::{
 
 use std::{io::Write, str::FromStr};
 
+use crate::flasher::SpiAttachParams;
+use crate::flashtarget::{ChipTarget, FlashTarget, RamTarget};
 pub use esp32::Esp32;
 pub use esp32c3::Esp32c3;
 pub use esp8266::Esp8266;
@@ -139,6 +141,14 @@ impl Chip {
             Chip::Esp8266 => Esp8266::SPI_REGISTERS,
         }
     }
+
+    pub fn ram_target(&self) -> Box<dyn FlashTarget> {
+        Box::new(RamTarget::new())
+    }
+
+    pub fn flash_target(&self, spi_params: SpiAttachParams) -> Box<dyn FlashTarget> {
+        Box::new(ChipTarget::new(*self, spi_params))
+    }
 }
 
 impl FromStr for Chip {

espflash/src/flasher.rs

@@ -5,7 +5,6 @@ use strum_macros::Display;
 use std::thread::sleep;
 
 use crate::elf::RomSegment;
-use crate::flashtarget::{ChipTarget, FlashTarget, RamTarget};
 use crate::{
     chip::Chip, connection::Connection, elf::FirmwareImage, encoder::SlipEncoder, error::RomError,
     Error, PartitionTable,
@@ -465,7 +464,7 @@ impl Flasher {
     pub fn load_elf_to_ram(&mut self, elf_data: &[u8]) -> Result<(), Error> {
         let image = FirmwareImage::from_data(elf_data).map_err(|_| Error::InvalidElf)?;
 
-        let mut target = RamTarget::new();
+        let mut target = self.chip.ram_target();
         target.begin(&mut self.connection, &image)?;
 
         if image.rom_segments(self.chip).next().is_some() {
@@ -495,7 +494,7 @@ impl Flasher {
         let mut image = FirmwareImage::from_data(elf_data).map_err(|_| Error::InvalidElf)?;
         image.flash_size = self.flash_size();
 
-        let mut target = ChipTarget::new(self.chip, self.spi_params);
+        let mut target = self.chip.flash_target(self.spi_params);
         target.begin(&mut self.connection, &image)?;
 
         for segment in self