use load address when creating direct boot image

Author: bjoernQ

espflash/src/elf.rs

@@ -7,6 +7,7 @@ use crate::flasher::FlashSize;
 use std::fmt::{Debug, Formatter};
 use std::mem::take;
 use std::ops::AddAssign;
+use xmas_elf::program::Type;
 use xmas_elf::sections::{SectionData, ShType};
 use xmas_elf::ElfFile;
 
@@ -78,6 +79,21 @@ impl<'a> FirmwareImage<'a> {
             })
     }
 
+    pub fn segments_with_load_addresses(&'a self) -> impl Iterator<Item = CodeSegment<'a>> + 'a {
+        self.elf
+            .program_iter()
+            .filter(|header| {
+                header.file_size() > 0 && header.get_type() == Ok(Type::Load) && header.offset() > 0
+            })
+            .flat_map(move |header| {
+                let addr = header.physical_addr() as u32;
+                let from = header.offset() as usize;
+                let to = header.offset() as usize + header.file_size() as usize;
+                let data = &self.elf.input[from..to];
+                Some(CodeSegment::new(addr, data))
+            })
+    }
+
     pub fn rom_segments(&'a self, chip: Chip) -> impl Iterator<Item = CodeSegment<'a>> + 'a {
         self.segments()
             .filter(move |segment| chip.addr_is_flash(segment.addr))

espflash/src/image_format/esp32directboot.rs

@@ -14,7 +14,7 @@ pub struct Esp32DirectBootFormat<'a> {
 impl<'a> Esp32DirectBootFormat<'a> {
     pub fn new(image: &'a FirmwareImage) -> Result<Self, Error> {
         let mut segment = image
-            .segments()
+            .segments_with_load_addresses()
             .map(|mut segment| {
                 // map address to the first 4MB
                 segment.addr %= 0x400000;