alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-19 07:55:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/replace_some_efuses_for_c6' into 'master'

Browse Source 
efuse(esp32c6): Replace PKG_VERSION BLK_VERSION_MINOR BLK_VERSION_MAJOR

Closes IDF-7174

See merge request espressif/esp-idf!22775
This commit is contained in:
Zim Kalinowski
2023-04-04 16:34:29 +08:00
parent 9813947f62 776a0e8a20
commit 6e67c54a92
5 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
components/soc/esp32c6/include/soc/efuse_reg.h
View File

@@ -686,27 +686,27 @@ extern "C" {
#define EFUSE_WAFER_VERSION_MAJOR_M (EFUSE_WAFER_VERSION_MAJOR_V << EFUSE_WAFER_VERSION_MAJOR_S)
#define EFUSE_WAFER_VERSION_MAJOR_V 0x00000003U
#define EFUSE_WAFER_VERSION_MAJOR_S 22
/** EFUSE_BLK_VERSION_MINOR : R; bitpos: [26:24]; default: 0;
* BLK_VERSION_MINOR of BLOCK2
*/
#define EFUSE_BLK_VERSION_MINOR 0x00000007U
#define EFUSE_BLK_VERSION_MINOR_M (EFUSE_BLK_VERSION_MINOR_V << EFUSE_BLK_VERSION_MINOR_S)
#define EFUSE_BLK_VERSION_MINOR_V 0x00000007U
#define EFUSE_BLK_VERSION_MINOR_S 24
/** EFUSE_BLK_VERSION_MAJOR : R; bitpos: [28:27]; default: 0;
* BLK_VERSION_MAJOR of BLOCK2
*/
#define EFUSE_BLK_VERSION_MAJOR 0x00000003U
#define EFUSE_BLK_VERSION_MAJOR_M (EFUSE_BLK_VERSION_MAJOR_V << EFUSE_BLK_VERSION_MAJOR_S)
#define EFUSE_BLK_VERSION_MAJOR_V 0x00000003U
#define EFUSE_BLK_VERSION_MAJOR_S 27
/** EFUSE_PKG_VERSION : R; bitpos: [31:29]; default: 0;
/** EFUSE_PKG_VERSION : R; bitpos: [26:24]; default: 0;
* Package version
*/
#define EFUSE_PKG_VERSION 0x00000007U
#define EFUSE_PKG_VERSION_M (EFUSE_PKG_VERSION_V << EFUSE_PKG_VERSION_S)
#define EFUSE_PKG_VERSION_V 0x00000007U
#define EFUSE_PKG_VERSION_S 29
#define EFUSE_PKG_VERSION_S 24
/** EFUSE_BLK_VERSION_MINOR : R; bitpos: [29:27]; default: 0;
* BLK_VERSION_MINOR of BLOCK2
*/
#define EFUSE_BLK_VERSION_MINOR 0x00000007U
#define EFUSE_BLK_VERSION_MINOR_M (EFUSE_BLK_VERSION_MINOR_V << EFUSE_BLK_VERSION_MINOR_S)
#define EFUSE_BLK_VERSION_MINOR_V 0x00000007U
#define EFUSE_BLK_VERSION_MINOR_S 27
/** EFUSE_BLK_VERSION_MAJOR : R; bitpos: [31:30]; default: 0;
* BLK_VERSION_MAJOR of BLOCK2
*/
#define EFUSE_BLK_VERSION_MAJOR 0x00000003U
#define EFUSE_BLK_VERSION_MAJOR_M (EFUSE_BLK_VERSION_MAJOR_V << EFUSE_BLK_VERSION_MAJOR_S)
#define EFUSE_BLK_VERSION_MAJOR_V 0x00000003U
#define EFUSE_BLK_VERSION_MAJOR_S 30
/** EFUSE_RD_MAC_SPI_SYS_4_REG register
* BLOCK1 data register $n.

18
components/soc/esp32c6/include/soc/efuse_struct.h
View File

@@ -534,18 +534,18 @@ typedef union {
uint32_t wafer_version_minor:4;
/** wafer_version_major : R; bitpos: [23:22]; default: 0; */
uint32_t wafer_version_major:2;
/** blk_version_minor : R; bitpos: [26:24]; default: 0;
* BLK_VERSION_MINOR of BLOCK2
*/
uint32_t blk_version_minor:3;
/** blk_version_major : R; bitpos: [28:27]; default: 0;
* BLK_VERSION_MAJOR of BLOCK2
*/
uint32_t blk_version_major:2;
/** pkg_version : R; bitpos: [31:29]; default: 0;
/** pkg_version : R; bitpos: [26:24]; default: 0;
* Package version
*/
uint32_t pkg_version:3;
/** blk_version_minor : R; bitpos: [29:27]; default: 0;
* BLK_VERSION_MINOR of BLOCK2
*/
uint32_t blk_version_minor:3;
/** blk_version_major : R; bitpos: [31:30]; default: 0;
* BLK_VERSION_MAJOR of BLOCK2
*/
uint32_t blk_version_major:2;
};
uint32_t val;
} efuse_rd_mac_spi_sys_3_reg_t;