Skip to content

Commit 64d001a

Browse files
authored
Correct bit start offset for MAC1 field (#852)
1 parent 04b7ebe commit 64d001a

File tree

8 files changed

+15
-14
lines changed

8 files changed

+15
-14
lines changed

espflash/src/targets/efuse/esp32c2.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! This file was automatically generated, please do not edit it manually!
22
//!
3-
//! Generated: 2025-04-15 12:51
3+
//! Generated: 2025-04-22 11:33
44
//! Version: 897499b0349a608b895d467abbcf006b
55
66
#![allow(unused)]
@@ -63,7 +63,7 @@ pub(crate) const SYSTEM_DATA2: EfuseField = EfuseField::new(1, 2, 64, 24);
6363
/// MAC address
6464
pub(crate) const MAC0: EfuseField = EfuseField::new(2, 0, 0, 32);
6565
/// MAC address
66-
pub(crate) const MAC1: EfuseField = EfuseField::new(2, 1, 0, 16);
66+
pub(crate) const MAC1: EfuseField = EfuseField::new(2, 1, 32, 16);
6767
/// WAFER_VERSION_MINOR
6868
pub(crate) const WAFER_VERSION_MINOR: EfuseField = EfuseField::new(2, 1, 48, 4);
6969
/// WAFER_VERSION_MAJOR

espflash/src/targets/efuse/esp32c3.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! This file was automatically generated, please do not edit it manually!
22
//!
3-
//! Generated: 2025-04-15 12:51
3+
//! Generated: 2025-04-22 11:33
44
//! Version: 4622cf9245401eca0eb1df8122449a6d
55
66
#![allow(unused)]
@@ -134,7 +134,7 @@ pub(crate) const RESERVED_0_162: EfuseField = EfuseField::new(0, 5, 162, 22);
134134
/// MAC address
135135
pub(crate) const MAC0: EfuseField = EfuseField::new(1, 0, 0, 32);
136136
/// MAC address
137-
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 0, 16);
137+
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 32, 16);
138138
/// SPI PAD CLK
139139
pub(crate) const SPI_PAD_CONFIG_CLK: EfuseField = EfuseField::new(1, 1, 48, 6);
140140
/// SPI PAD Q(D1)

espflash/src/targets/efuse/esp32c6.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! This file was automatically generated, please do not edit it manually!
22
//!
3-
//! Generated: 2025-04-15 12:51
3+
//! Generated: 2025-04-22 11:33
44
//! Version: df46b69f0ed3913114ba53d3a0b2b843
55
66
#![allow(unused)]
@@ -159,7 +159,7 @@ pub(crate) const RPT4_RESERVED4_0: EfuseField = EfuseField::new(0, 5, 184, 8);
159159
/// MAC address
160160
pub(crate) const MAC0: EfuseField = EfuseField::new(1, 0, 0, 32);
161161
/// MAC address
162-
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 0, 16);
162+
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 32, 16);
163163
/// Stores the extended bits of MAC address
164164
pub(crate) const MAC_EXT: EfuseField = EfuseField::new(1, 1, 48, 16);
165165
/// Stores the active hp dbias

espflash/src/targets/efuse/esp32h2.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! This file was automatically generated, please do not edit it manually!
22
//!
3-
//! Generated: 2025-04-15 12:51
3+
//! Generated: 2025-04-22 11:33
44
//! Version: 44563d2af4ebdba4db6c0a34a50c94f9
55
66
#![allow(unused)]
@@ -151,7 +151,7 @@ pub(crate) const RPT4_RESERVED4_0: EfuseField = EfuseField::new(0, 5, 184, 8);
151151
/// MAC address
152152
pub(crate) const MAC0: EfuseField = EfuseField::new(1, 0, 0, 32);
153153
/// MAC address
154-
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 0, 16);
154+
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 32, 16);
155155
/// Stores the extended bits of MAC address
156156
pub(crate) const MAC_EXT: EfuseField = EfuseField::new(1, 1, 48, 16);
157157
/// Stores RF Calibration data. RXIQ version

espflash/src/targets/efuse/esp32p4.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! This file was automatically generated, please do not edit it manually!
22
//!
3-
//! Generated: 2025-04-15 12:51
3+
//! Generated: 2025-04-22 11:33
44
//! Version: 73787d3f5ae45b80abca925a7562120b
55
66
#![allow(unused)]
@@ -192,7 +192,7 @@ pub(crate) const RESERVE_0_182: EfuseField = EfuseField::new(0, 5, 182, 10);
192192
/// MAC address
193193
pub(crate) const MAC0: EfuseField = EfuseField::new(1, 0, 0, 32);
194194
/// MAC address
195-
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 0, 16);
195+
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 32, 16);
196196
/// Stores the extended bits of MAC address
197197
pub(crate) const RESERVED_1_16: EfuseField = EfuseField::new(1, 1, 48, 16);
198198
/// Minor chip version

espflash/src/targets/efuse/esp32s2.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! This file was automatically generated, please do not edit it manually!
22
//!
3-
//! Generated: 2025-04-15 12:51
3+
//! Generated: 2025-04-22 11:33
44
//! Version: 888a61f6f500d9c7ee0aa32016b0bee7
55
66
#![allow(unused)]
@@ -149,7 +149,7 @@ pub(crate) const RESERVED_0_162: EfuseField = EfuseField::new(0, 5, 162, 30);
149149
/// MAC address
150150
pub(crate) const MAC0: EfuseField = EfuseField::new(1, 0, 0, 32);
151151
/// MAC address
152-
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 0, 16);
152+
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 32, 16);
153153
/// SPI_PAD_configure CLK
154154
pub(crate) const SPI_PAD_CONFIG_CLK: EfuseField = EfuseField::new(1, 1, 48, 6);
155155
/// SPI_PAD_configure Q(D1)

espflash/src/targets/efuse/esp32s3.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! This file was automatically generated, please do not edit it manually!
22
//!
3-
//! Generated: 2025-04-15 12:51
3+
//! Generated: 2025-04-22 11:33
44
//! Version: 7127dd097e72bb90d0b790d460993126
55
66
#![allow(unused)]
@@ -165,7 +165,7 @@ pub(crate) const RESERVED_0_162: EfuseField = EfuseField::new(0, 5, 162, 22);
165165
/// MAC address
166166
pub(crate) const MAC0: EfuseField = EfuseField::new(1, 0, 0, 32);
167167
/// MAC address
168-
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 0, 16);
168+
pub(crate) const MAC1: EfuseField = EfuseField::new(1, 1, 32, 16);
169169
/// SPI_PAD_configure CLK
170170
pub(crate) const SPI_PAD_CONFIG_CLK: EfuseField = EfuseField::new(1, 1, 48, 6);
171171
/// SPI_PAD_configure Q(D1)

xtask/src/main.rs

+1
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ fn process_efuse_definitions(efuse_fields: &mut EfuseFields) -> Result<()> {
166166

167167
let mut mac1_attrs = mac_attrs.clone();
168168
mac1_attrs.word += 1;
169+
mac1_attrs.start = 32;
169170
mac1_attrs.len = 16;
170171

171172
yaml.fields.remove("MAC").unwrap();

0 commit comments

Comments
 (0)