Skip to content

Replace old BLOCK_SIZES with definitions of the blocks themselves #971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace old BLOCK_SIZES with definitions of the blocks themselves #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/hil.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Install dependencies
env:
DEBIAN_FRONTEND: noninteractive
run: apt-get update && apt-get -y install curl musl-tools pkg-config
run: apt-get update && apt-get -y install curl musl-tools pkg-config python3-dev python3-intelhex python3-reedsolo python3-rich-click

- name: Install toolchain
run: |
Expand Down Expand Up @@ -119,4 +119,4 @@ jobs:
echo "$PWD/xtask_app" >> "$GITHUB_PATH"

- name: Run all tests
run: xtask run-tests --chip ${{ matrix.board.mcu }} -t 60 --no-build
run: xtask run-tests --chip ${{ matrix.board.mcu }} -t 60 --no-build
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Corrected eFuse BLOCK0 definitions for ESP32-C2, ESP32-C3, and ESP32-S3 (#961)
- Corrected eFuse block address calculations. (#971)
- Fixed Secure Download Mode detection on ESP32-P4 (#972)
- Several fixes in `read_efuse` (#969)

Expand Down
92 changes: 92 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions espflash/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,10 @@ pub enum Error {
/// The efuse field is larger than 32 bit.
#[error("Requested efuse field is larger than 32 bit. Use `read_efuse_le`.")]
EfuseFieldTooLarge,

/// Specified eFuse block does not exist
#[error("specified eFuse block does not exist: {0}")]
InvalidEfuseBlock(u32),
}

#[cfg(feature = "serialport")]
Expand Down
25 changes: 21 additions & 4 deletions espflash/src/target/efuse/esp32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,32 @@
//!
//! This file was automatically generated, please do not edit it manually!
//!
//! Generated: 2025-11-19 12:31
//! Generated: 2025-11-26 21:42
//! Version: 369d2d860d34e777c0f7d545a7dfc3c4

#![allow(unused)]

use super::EfuseField;
use super::{EfuseBlock, EfuseField};

/// Total size in bytes of each block
pub(crate) const BLOCK_SIZES: &[u32] = &[28, 32, 32, 32];
/// All eFuse blocks available on this device.
pub(crate) const BLOCKS: &[EfuseBlock] = &[
EfuseBlock {
length: 7u8,
read_address: 1073061888u32,
},
EfuseBlock {
length: 8u8,
read_address: 1073061944u32,
},
EfuseBlock {
length: 8u8,
read_address: 1073061976u32,
},
EfuseBlock {
length: 8u8,
read_address: 1073062008u32,
},
];

/// Efuse write disable mask
pub const WR_DIS: EfuseField = EfuseField::new(0, 0, 0, 16);
Expand Down
25 changes: 21 additions & 4 deletions espflash/src/target/efuse/esp32c2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,32 @@
//!
//! This file was automatically generated, please do not edit it manually!
//!
//! Generated: 2025-11-19 12:31
//! Generated: 2025-11-26 21:42
//! Version: 897499b0349a608b895d467abbcf006b

#![allow(unused)]

use super::EfuseField;
use super::{EfuseBlock, EfuseField};

/// Total size in bytes of each block
pub(crate) const BLOCK_SIZES: &[u32] = &[8, 12, 32, 32];
/// All eFuse blocks available on this device.
pub(crate) const BLOCKS: &[EfuseBlock] = &[
EfuseBlock {
length: 2u8,
read_address: 1610647596u32,
},
EfuseBlock {
length: 3u8,
read_address: 1610647604u32,
},
EfuseBlock {
length: 8u8,
read_address: 1610647616u32,
},
EfuseBlock {
length: 8u8,
read_address: 1610647648u32,
},
];

/// Disable programming of individual eFuses
pub const WR_DIS: EfuseField = EfuseField::new(0, 0, 0, 8);
Expand Down
53 changes: 49 additions & 4 deletions espflash/src/target/efuse/esp32c3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,60 @@
//!
//! This file was automatically generated, please do not edit it manually!
//!
//! Generated: 2025-11-19 12:31
//! Generated: 2025-11-26 21:42
//! Version: 4622cf9245401eca0eb1df8122449a6d

#![allow(unused)]

use super::EfuseField;
use super::{EfuseBlock, EfuseField};

/// Total size in bytes of each block
pub(crate) const BLOCK_SIZES: &[u32] = &[24, 24, 32, 32, 32, 32, 32, 32, 32, 32, 32];
/// All eFuse blocks available on this device.
pub(crate) const BLOCKS: &[EfuseBlock] = &[
EfuseBlock {
length: 6u8,
read_address: 1610647596u32,
},
EfuseBlock {
length: 6u8,
read_address: 1610647620u32,
},
EfuseBlock {
length: 8u8,
read_address: 1610647644u32,
},
EfuseBlock {
length: 8u8,
read_address: 1610647676u32,
},
EfuseBlock {
length: 8u8,
read_address: 1610647708u32,
},
EfuseBlock {
length: 8u8,
read_address: 1610647740u32,
},
EfuseBlock {
length: 8u8,
read_address: 1610647772u32,
},
EfuseBlock {
length: 8u8,
read_address: 1610647804u32,
},
EfuseBlock {
length: 8u8,
read_address: 1610647836u32,
},
EfuseBlock {
length: 8u8,
read_address: 1610647868u32,
},
EfuseBlock {
length: 8u8,
read_address: 1610647900u32,
},
];

/// Disable programming of individual eFuses
pub const WR_DIS: EfuseField = EfuseField::new(0, 0, 0, 32);
Expand Down
53 changes: 49 additions & 4 deletions espflash/src/target/efuse/esp32c5.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,60 @@
//!
//! This file was automatically generated, please do not edit it manually!
//!
//! Generated: 2025-11-19 12:31
//! Generated: 2025-11-26 21:42
//! Version: 31c7fe3f5f4e0a55b178a57126c0aca7

#![allow(unused)]

use super::EfuseField;
use super::{EfuseBlock, EfuseField};

/// Total size in bytes of each block
pub(crate) const BLOCK_SIZES: &[u32] = &[24, 24, 32, 32, 32, 32, 32, 32, 32, 32, 32];
/// All eFuse blocks available on this device.
pub(crate) const BLOCKS: &[EfuseBlock] = &[
EfuseBlock {
length: 6u8,
read_address: 1611352108u32,
},
EfuseBlock {
length: 6u8,
read_address: 1611352132u32,
},
EfuseBlock {
length: 8u8,
read_address: 1611352156u32,
},
EfuseBlock {
length: 8u8,
read_address: 1611352188u32,
},
EfuseBlock {
length: 8u8,
read_address: 1611352220u32,
},
EfuseBlock {
length: 8u8,
read_address: 1611352252u32,
},
EfuseBlock {
length: 8u8,
read_address: 1611352284u32,
},
EfuseBlock {
length: 8u8,
read_address: 1611352316u32,
},
EfuseBlock {
length: 8u8,
read_address: 1611352348u32,
},
EfuseBlock {
length: 8u8,
read_address: 1611352380u32,
},
EfuseBlock {
length: 8u8,
read_address: 1611352412u32,
},
];

/// Disable programming of individual eFuses
pub const WR_DIS: EfuseField = EfuseField::new(0, 0, 0, 32);
Expand Down
Loading
Loading