Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions espflash/src/chip/esp32/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,16 @@ pub struct Esp32Params {
}

impl Esp32Params {
pub fn default_partition_table(&self) -> PartitionTable {
/// Generates a default partition table.
/// `flash_size` is used to scale app partition when present, otherwise the param defaults are used.
pub fn default_partition_table(&self, flash_size: Option<u32>) -> PartitionTable {
PartitionTable::basic(
self.nvs_addr,
self.nvs_size,
self.phy_init_data_addr,
self.phy_init_data_size,
self.app_addr,
self.app_size,
flash_size.map_or(self.app_size, |size| size - self.app_addr),
)
}
}
16 changes: 16 additions & 0 deletions espflash/src/flasher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,22 @@ impl FlashSize {
_ => Err(Error::UnsupportedFlash(FlashDetectError::from(value))),
}
}

/// Returns the flash size in bytes
pub fn size(self) -> u32 {
match self {
FlashSize::Flash256Kb => 0x0040000,
FlashSize::Flash512Kb => 0x0080000,
FlashSize::Flash1Mb => 0x0100000,
FlashSize::Flash2Mb => 0x0200000,
FlashSize::Flash4Mb => 0x0400000,
FlashSize::Flash8Mb => 0x0800000,
FlashSize::Flash16Mb => 0x1000000,
FlashSize::Flash32Mb => 0x2000000,
FlashSize::Flash64Mb => 0x4000000,
FlashSize::Flash128Mb => 0x8000000,
}
}
}

impl FromStr for FlashSize {
Expand Down
3 changes: 2 additions & 1 deletion espflash/src/image_format/esp32bootloader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ impl<'a> Esp32BootloaderFormat<'a> {
partition_table: Option<PartitionTable>,
bootloader: Option<Vec<u8>>,
) -> Result<Self, Error> {
let partition_table = partition_table.unwrap_or_else(|| params.default_partition_table());
let partition_table = partition_table
.unwrap_or_else(|| params.default_partition_table(image.flash_size.map(|v| v.size())));
let mut bootloader = if let Some(bytes) = bootloader {
Cow::Owned(bytes)
} else {
Expand Down