mirror/blflash
1
0
Fork 0
mirror of https://github.com/spacemeowx2/blflash.git synced 2024-07-03 03:28:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add force option

Browse Source
This commit is contained in:
spacemeowx2 2020-12-04 23:52:29 +08:00
parent f1a09b12e2
commit 45d927f42a
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
blflash/src/flasher.rs
View File

@ -38,15 +38,25 @@ impl Flasher {
&self.boot_info
}
pub fn load_segments<'a>(&'a mut self, segments: impl Iterator<Item=RomSegment<'a>>) -> Result<(), Error> {
pub fn load_segments<'a>(&'a mut self, force: bool, segments: impl Iterator<Item=RomSegment<'a>>) -> Result<(), Error> {
self.load_eflash_loader()?;
self.connection.set_baud(BaudRate::BaudOther(2_000_000))?;
self.handshake()?;
for segment in segments {
let local_hash = Sha256::digest(&segment.data[0..segment.size() as usize]);
// skip segment if the contents are matched
if !force {
let sha256 = self.sha256_read(segment.addr, segment.size())?;
if sha256 == &local_hash[..] {
log::info!("Skip segment addr: {:x} size: {} sha256 matches", segment.addr, segment.size());
continue
}
}
log::info!("Erase flash addr: {:x} size: {}", segment.addr, segment.size());
self.flash_erase(segment.addr, segment.addr + segment.size())?;
let local_hash = Sha256::digest(&segment.data[0..segment.size() as usize]);
let mut reader = Cursor::new(&segment.data);
let mut cur = segment.addr;
@ -90,14 +100,14 @@ impl Flasher {
Ok(())
}
pub fn load_elf_to_flash(&mut self, elf_data: &[u8]) -> Result<(), Error> {
pub fn load_elf_to_flash(&mut self, force: bool, elf_data: &[u8]) -> Result<(), Error> {
let image = FirmwareImage::from_data(elf_data).map_err(|_| Error::InvalidElf)?;
let segs = image
.segments()
.filter_map(|segment| self.chip.get_flash_segment(segment))
.collect::<Vec<_>>();
self.load_segments(segs.into_iter())?;
self.load_segments(force, segs.into_iter())?;
Ok(())
}

7
blflash/src/main.rs
View File

@ -24,6 +24,9 @@ struct FlashOpt {
/// With boot2
#[structopt(short, long)]
without_boot2: bool,
/// Don't skip if hash matches
#[structopt(short, long)]
force: bool,
}
#[derive(StructOpt)]
@ -75,7 +78,7 @@ fn flash(opt: FlashOpt) -> Result<(), Error> {
log::info!("Bootrom version: {}", flasher.boot_info().bootrom_version);
log::trace!("Boot info: {:x?}", flasher.boot_info());
flasher.load_segments(segments.into_iter())?;
flasher.load_segments(opt.force, segments.into_iter())?;
flasher.reset()?;
} else {
@ -89,7 +92,7 @@ fn flash(opt: FlashOpt) -> Result<(), Error> {
log::trace!("Boot info: {:x?}", flasher.boot_info());
let input_bytes = read(&opt.image)?;
flasher.load_elf_to_flash(&input_bytes)?;
flasher.load_elf_to_flash(opt.force, &input_bytes)?;
flasher.reset()?;
}