Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-51665-to-release/v6.1' into 'release/v6.1'

Browse Source 
fix(efuse): correct MAC_EXT byte order on ESP32-C5 and ESP32-H21 (v6.1)

See merge request espressif/esp-idf!52008
This commit is contained in:
Marius Vikhammer
2026-08-27 16:28:14 +08:00
parent bdb2e96103 42d5aec8d0
commit 3911fd0c8b
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/efuse/esp32c5/esp_efuse_table.c
View File

@@ -9,7 +9,7 @@
#include <assert.h>
#include "esp_efuse_table.h"
// md5_digest_table e18555ab3140262c47fb3f6a03944676
// md5_digest_table 9f3a487e680d0c4219890b2df1abdca8
// This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
// If you want to change some fields, you need to change esp_efuse_table.csv file
// then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.
@@ -706,7 +706,8 @@ static const esp_efuse_desc_t MAC[] = {
};
static const esp_efuse_desc_t MAC_EXT[] = {
{EFUSE_BLK1, 48, 16}, // [] Represents the extended bits of MAC address,
{EFUSE_BLK1, 56, 8}, // [] Stores the extended bits of MAC address,
{EFUSE_BLK1, 48, 8}, // [] Stores the extended bits of MAC address,
};
static const esp_efuse_desc_t WAFER_VERSION_MINOR[] = {
@@ -1779,7 +1780,8 @@ const esp_efuse_desc_t* ESP_EFUSE_MAC[] = {
};
const esp_efuse_desc_t* ESP_EFUSE_MAC_EXT[] = {
&MAC_EXT[0], // [] Represents the extended bits of MAC address
&MAC_EXT[0], // [] Stores the extended bits of MAC address
&MAC_EXT[1], // [] Stores the extended bits of MAC address
NULL
};

3
components/efuse/esp32c5/esp_efuse_table.csv
View File

@@ -188,7 +188,8 @@ MAC, EFUSE_BLK1, 40, 8, [MAC_FACT
, EFUSE_BLK1, 16, 8, [MAC_FACTORY] MAC address
, EFUSE_BLK1, 8, 8, [MAC_FACTORY] MAC address
, EFUSE_BLK1, 0, 8, [MAC_FACTORY] MAC address
MAC_EXT, EFUSE_BLK1, 48, 16, [] Represents the extended bits of MAC address
MAC_EXT, EFUSE_BLK1, 56, 8, [] Stores the extended bits of MAC address
, EFUSE_BLK1, 48, 8, [] Stores the extended bits of MAC address
WAFER_VERSION_MINOR, EFUSE_BLK1, 64, 4, [] Minor chip version
WAFER_VERSION_MAJOR, EFUSE_BLK1, 68, 2, [] Minor chip version
DISABLE_WAFER_VERSION_MAJOR, EFUSE_BLK1, 70, 1, [] Disables check of wafer version major
Can't render this file because it contains an unexpected character in line 8 and column 53.

2
components/efuse/esp32c5/include/esp_efuse_table.h
View File

@@ -10,7 +10,7 @@ extern "C" {
#include "esp_efuse.h"
// md5_digest_table e18555ab3140262c47fb3f6a03944676
// md5_digest_table 9f3a487e680d0c4219890b2df1abdca8
// This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
// If you want to change some fields, you need to change esp_efuse_table.csv file
// then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.

8
components/efuse/esp32h21/esp_efuse_table.c
View File

@@ -9,7 +9,7 @@
#include <assert.h>
#include "esp_efuse_table.h"
// md5_digest_table d2954679788e8cfb56ac5273aa5ed838
// md5_digest_table 8d84cb2601fb980390d26ebbb13062f5
// This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
// If you want to change some fields, you need to change esp_efuse_table.csv file
// then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.
@@ -561,7 +561,8 @@ static const esp_efuse_desc_t MAC[] = {
};
static const esp_efuse_desc_t MAC_EXT[] = {
{EFUSE_BLK1, 48, 16}, // [] Represents the extended bits of MAC address,
{EFUSE_BLK1, 56, 8}, // [] Stores the extended bits of MAC address,
{EFUSE_BLK1, 48, 8}, // [] Stores the extended bits of MAC address,
};
static const esp_efuse_desc_t PVT_CELL_SELECT[] = {
@@ -1353,7 +1354,8 @@ const esp_efuse_desc_t* ESP_EFUSE_MAC[] = {
};
const esp_efuse_desc_t* ESP_EFUSE_MAC_EXT[] = {
&MAC_EXT[0], // [] Represents the extended bits of MAC address
&MAC_EXT[0], // [] Stores the extended bits of MAC address
&MAC_EXT[1], // [] Stores the extended bits of MAC address
NULL
};

3
components/efuse/esp32h21/esp_efuse_table.csv
View File

@@ -151,7 +151,8 @@ MAC, EFUSE_BLK1, 40, 8, [MAC_FACT
, EFUSE_BLK1, 16, 8, [MAC_FACTORY] MAC address
, EFUSE_BLK1, 8, 8, [MAC_FACTORY] MAC address
, EFUSE_BLK1, 0, 8, [MAC_FACTORY] MAC address
MAC_EXT, EFUSE_BLK1, 48, 16, [] Represents the extended bits of MAC address
MAC_EXT, EFUSE_BLK1, 56, 8, [] Stores the extended bits of MAC address
, EFUSE_BLK1, 48, 8, [] Stores the extended bits of MAC address
PVT_CELL_SELECT, EFUSE_BLK1, 100, 7, [] Represents the selection of Power glitch monitor PVT cell.
BLK_VERSION_MINOR, EFUSE_BLK1, 114, 3, [] Minor version of BLOCK2
BLK_VERSION_MAJOR, EFUSE_BLK1, 117, 2, [] Major version of BLOCK2
Can't render this file because it contains an unexpected character in line 8 and column 53.

2
components/efuse/esp32h21/include/esp_efuse_table.h
View File

@@ -10,7 +10,7 @@ extern "C" {
#include "esp_efuse.h"
// md5_digest_table d2954679788e8cfb56ac5273aa5ed838
// md5_digest_table 8d84cb2601fb980390d26ebbb13062f5
// This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
// If you want to change some fields, you need to change esp_efuse_table.csv file
// then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.