Fix mac address efuse (#871)

bjoernQ · web-flow · commit b8eb162539cd · 2025-05-30T15:12:49.000Z
* Fix mac-address trickery

* efuse update using esptool commit 90e3770c6716a2031d77d830c3455d40db648b0c
diff --git a/espflash/src/targets/efuse/esp32.rs b/espflash/src/targets/efuse/esp32.rs
@@ -1,6 +1,6 @@
 //! This file was automatically generated, please do not edit it manually!
 //!
-//! Generated: 2025-04-15 12:51
+//! Generated: 2025-05-30 12:24
 //! Version:   369d2d860d34e777c0f7d545a7dfc3c4
 
 #![allow(unused)]
@@ -21,9 +21,9 @@ pub(crate) const UART_DOWNLOAD_DIS: EfuseField = EfuseField::new(0, 0, 27, 1);
 /// reserved
 pub(crate) const RESERVED_0_28: EfuseField = EfuseField::new(0, 0, 28, 4);
 /// MAC address
-pub(crate) const MAC0: EfuseField = EfuseField::new(0, 1, 0, 32);
+pub(crate) const MAC0: EfuseField = EfuseField::new(0, 1, 32, 32);
 /// MAC address
-pub(crate) const MAC1: EfuseField = EfuseField::new(0, 2, 32, 16);
+pub(crate) const MAC1: EfuseField = EfuseField::new(0, 2, 64, 16);
 /// CRC8 for MAC address
 pub(crate) const MAC_CRC: EfuseField = EfuseField::new(0, 2, 80, 8);
 /// Reserved; it was created by set_missed_fields_in_regs func
diff --git a/espflash/src/targets/efuse/esp32c2.rs b/espflash/src/targets/efuse/esp32c2.rs
@@ -1,6 +1,6 @@
 //! This file was automatically generated, please do not edit it manually!
 //!
-//! Generated: 2025-04-22 11:33
+//! Generated: 2025-05-30 12:24
 //! Version:   897499b0349a608b895d467abbcf006b
 
 #![allow(unused)]
diff --git a/espflash/src/targets/efuse/esp32c3.rs b/espflash/src/targets/efuse/esp32c3.rs
@@ -1,6 +1,6 @@
 //! This file was automatically generated, please do not edit it manually!
 //!
-//! Generated: 2025-04-22 11:33
+//! Generated: 2025-05-30 12:24
 //! Version:   4622cf9245401eca0eb1df8122449a6d
 
 #![allow(unused)]
diff --git a/espflash/src/targets/efuse/esp32c5.rs b/espflash/src/targets/efuse/esp32c5.rs
diff --git a/espflash/src/targets/efuse/esp32c6.rs b/espflash/src/targets/efuse/esp32c6.rs
@@ -1,6 +1,6 @@
 //! This file was automatically generated, please do not edit it manually!
 //!
-//! Generated: 2025-04-22 11:33
+//! Generated: 2025-05-30 12:24
 //! Version:   df46b69f0ed3913114ba53d3a0b2b843
 
 #![allow(unused)]
diff --git a/espflash/src/targets/efuse/esp32h2.rs b/espflash/src/targets/efuse/esp32h2.rs
@@ -1,6 +1,6 @@
 //! This file was automatically generated, please do not edit it manually!
 //!
-//! Generated: 2025-04-22 11:33
+//! Generated: 2025-05-30 12:24
 //! Version:   44563d2af4ebdba4db6c0a34a50c94f9
 
 #![allow(unused)]
diff --git a/espflash/src/targets/efuse/esp32p4.rs b/espflash/src/targets/efuse/esp32p4.rs
@@ -1,6 +1,6 @@
 //! This file was automatically generated, please do not edit it manually!
 //!
-//! Generated: 2025-04-22 11:33
+//! Generated: 2025-05-30 12:24
 //! Version:   73787d3f5ae45b80abca925a7562120b
 
 #![allow(unused)]
@@ -36,7 +36,7 @@ pub(crate) const SPI_DOWNLOAD_MSPI_DIS: EfuseField = EfuseField::new(0, 1, 45, 1
 /// enabled
 pub(crate) const DIS_TWAI: EfuseField = EfuseField::new(0, 1, 46, 1);
 /// Represents whether the selection between usb_to_jtag and pad_to_jtag through
-/// strapping gpio15 when both EFUSE_DIS_PAD_JTAG and EFUSE_DIS_USB_JTAG are
+/// strapping gpio34 when both EFUSE_DIS_PAD_JTAG and EFUSE_DIS_USB_JTAG are
 /// equal to 0 is enabled or disabled. 1: enabled. 0: disabled
 pub(crate) const JTAG_SEL_ENABLE: EfuseField = EfuseField::new(0, 1, 47, 1);
 /// Represents whether JTAG is disabled in soft way. Odd number: disabled. Even
diff --git a/espflash/src/targets/efuse/esp32s2.rs b/espflash/src/targets/efuse/esp32s2.rs
@@ -1,6 +1,6 @@
 //! This file was automatically generated, please do not edit it manually!
 //!
-//! Generated: 2025-04-22 11:33
+//! Generated: 2025-05-30 12:24
 //! Version:   888a61f6f500d9c7ee0aa32016b0bee7
 
 #![allow(unused)]
diff --git a/espflash/src/targets/efuse/esp32s3.rs b/espflash/src/targets/efuse/esp32s3.rs
@@ -1,6 +1,6 @@
 //! This file was automatically generated, please do not edit it manually!
 //!
-//! Generated: 2025-04-22 11:33
+//! Generated: 2025-05-30 12:24
 //! Version:   7127dd097e72bb90d0b790d460993126
 
 #![allow(unused)]
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -162,12 +162,11 @@ fn process_efuse_definitions(efuse_fields: &mut EfuseFields) -> Result<()> {
         let mac_attrs = yaml.fields.get("MAC").unwrap();
 
         let mut mac0_attrs = mac_attrs.clone();
-        mac0_attrs.start = 0;
         mac0_attrs.len = 32;
 
         let mut mac1_attrs = mac_attrs.clone();
-        mac1_attrs.word += 1;
-        mac1_attrs.start = 32;
+        mac1_attrs.start = mac0_attrs.start + 32;
+        mac1_attrs.word = mac1_attrs.start / 32;
         mac1_attrs.len = 16;
 
         yaml.fields.remove("MAC").unwrap();
