From 776a0e8a20d68bddb4da07eed5dc154578cbb6ba Mon Sep 17 00:00:00 2001 From: KonstantinKondrashov Date: Wed, 15 Mar 2023 15:17:22 +0800 Subject: [PATCH] efuse(esp32c6): Replace PKG_VERSION BLK_VERSION_MINOR BLK_VERSION_MAJOR --- components/efuse/esp32c6/esp_efuse_table.c | 42 +++++++++---------- components/efuse/esp32c6/esp_efuse_table.csv | 10 ++--- .../efuse/esp32c6/include/esp_efuse_table.h | 6 +-- .../soc/esp32c6/include/soc/efuse_reg.h | 32 +++++++------- .../soc/esp32c6/include/soc/efuse_struct.h | 18 ++++---- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/components/efuse/esp32c6/esp_efuse_table.c b/components/efuse/esp32c6/esp_efuse_table.c index 7a8475c0c2..8f4ef4601e 100644 --- a/components/efuse/esp32c6/esp_efuse_table.c +++ b/components/efuse/esp32c6/esp_efuse_table.c @@ -9,7 +9,7 @@ #include #include "esp_efuse_table.h" -// md5_digest_table 995934abe6c7e7366404f837e547bb3f +// md5_digest_table ab312e31f6976fdf923a9809093323fd // 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. @@ -195,6 +195,10 @@ static const esp_efuse_desc_t WR_DIS_WAFER_VERSION_MAJOR[] = { {EFUSE_BLK0, 20, 1}, // [] wr_dis of WAFER_VERSION_MAJOR, }; +static const esp_efuse_desc_t WR_DIS_PKG_VERSION[] = { + {EFUSE_BLK0, 20, 1}, // [] wr_dis of PKG_VERSION, +}; + static const esp_efuse_desc_t WR_DIS_BLK_VERSION_MINOR[] = { {EFUSE_BLK0, 20, 1}, // [] wr_dis of BLK_VERSION_MINOR, }; @@ -203,10 +207,6 @@ static const esp_efuse_desc_t WR_DIS_BLK_VERSION_MAJOR[] = { {EFUSE_BLK0, 20, 1}, // [] wr_dis of BLK_VERSION_MAJOR, }; -static const esp_efuse_desc_t WR_DIS_PKG_VERSION[] = { - {EFUSE_BLK0, 20, 1}, // [] wr_dis of PKG_VERSION, -}; - static const esp_efuse_desc_t WR_DIS_FLASH_CAP[] = { {EFUSE_BLK0, 20, 1}, // [] wr_dis of FLASH_CAP, }; @@ -492,16 +492,16 @@ static const esp_efuse_desc_t WAFER_VERSION_MAJOR[] = { {EFUSE_BLK1, 118, 2}, // [], }; +static const esp_efuse_desc_t PKG_VERSION[] = { + {EFUSE_BLK1, 120, 3}, // [] Package version, +}; + static const esp_efuse_desc_t BLK_VERSION_MINOR[] = { - {EFUSE_BLK1, 120, 3}, // [] BLK_VERSION_MINOR of BLOCK2, + {EFUSE_BLK1, 123, 3}, // [] BLK_VERSION_MINOR of BLOCK2, }; static const esp_efuse_desc_t BLK_VERSION_MAJOR[] = { - {EFUSE_BLK1, 123, 2}, // [] BLK_VERSION_MAJOR of BLOCK2, -}; - -static const esp_efuse_desc_t PKG_VERSION[] = { - {EFUSE_BLK1, 125, 3}, // [] Package version, + {EFUSE_BLK1, 126, 2}, // [] BLK_VERSION_MAJOR of BLOCK2, }; static const esp_efuse_desc_t FLASH_CAP[] = { @@ -785,6 +785,11 @@ const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_WAFER_VERSION_MAJOR[] = { NULL }; +const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_PKG_VERSION[] = { + &WR_DIS_PKG_VERSION[0], // [] wr_dis of PKG_VERSION + NULL +}; + const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_BLK_VERSION_MINOR[] = { &WR_DIS_BLK_VERSION_MINOR[0], // [] wr_dis of BLK_VERSION_MINOR NULL @@ -795,11 +800,6 @@ const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_BLK_VERSION_MAJOR[] = { NULL }; -const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_PKG_VERSION[] = { - &WR_DIS_PKG_VERSION[0], // [] wr_dis of PKG_VERSION - NULL -}; - const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_FLASH_CAP[] = { &WR_DIS_FLASH_CAP[0], // [] wr_dis of FLASH_CAP NULL @@ -1155,6 +1155,11 @@ const esp_efuse_desc_t* ESP_EFUSE_WAFER_VERSION_MAJOR[] = { NULL }; +const esp_efuse_desc_t* ESP_EFUSE_PKG_VERSION[] = { + &PKG_VERSION[0], // [] Package version + NULL +}; + const esp_efuse_desc_t* ESP_EFUSE_BLK_VERSION_MINOR[] = { &BLK_VERSION_MINOR[0], // [] BLK_VERSION_MINOR of BLOCK2 NULL @@ -1165,11 +1170,6 @@ const esp_efuse_desc_t* ESP_EFUSE_BLK_VERSION_MAJOR[] = { NULL }; -const esp_efuse_desc_t* ESP_EFUSE_PKG_VERSION[] = { - &PKG_VERSION[0], // [] Package version - NULL -}; - const esp_efuse_desc_t* ESP_EFUSE_FLASH_CAP[] = { &FLASH_CAP[0], // [] NULL diff --git a/components/efuse/esp32c6/esp_efuse_table.csv b/components/efuse/esp32c6/esp_efuse_table.csv index f3adf4be91..d49e5f85ee 100644 --- a/components/efuse/esp32c6/esp_efuse_table.csv +++ b/components/efuse/esp32c6/esp_efuse_table.csv @@ -9,7 +9,7 @@ # this will generate new source files, next rebuild all the sources. # !!!!!!!!!!! # -# This file was generated by regtools.py based on the efuses.yaml file with the version: 1e4bcfa6a8578358a827410c1c8c243e +# This file was generated by regtools.py based on the efuses.yaml file with the version: 0a6c6206f42d0f0b7aeaceb8cecf1fc2 WR_DIS, EFUSE_BLK0, 0, 32, [] Disable programming of individual eFuses WR_DIS.RD_DIS, EFUSE_BLK0, 0, 1, [] wr_dis of RD_DIS @@ -56,9 +56,9 @@ WR_DIS.MAC, EFUSE_BLK0, 20, 1, [WR_DIS.M WR_DIS.MAC_EXT, EFUSE_BLK0, 20, 1, [] wr_dis of MAC_EXT WR_DIS.WAFER_VERSION_MINOR, EFUSE_BLK0, 20, 1, [] wr_dis of WAFER_VERSION_MINOR WR_DIS.WAFER_VERSION_MAJOR, EFUSE_BLK0, 20, 1, [] wr_dis of WAFER_VERSION_MAJOR +WR_DIS.PKG_VERSION, EFUSE_BLK0, 20, 1, [] wr_dis of PKG_VERSION WR_DIS.BLK_VERSION_MINOR, EFUSE_BLK0, 20, 1, [] wr_dis of BLK_VERSION_MINOR WR_DIS.BLK_VERSION_MAJOR, EFUSE_BLK0, 20, 1, [] wr_dis of BLK_VERSION_MAJOR -WR_DIS.PKG_VERSION, EFUSE_BLK0, 20, 1, [] wr_dis of PKG_VERSION WR_DIS.FLASH_CAP, EFUSE_BLK0, 20, 1, [] wr_dis of FLASH_CAP WR_DIS.FLASH_TEMP, EFUSE_BLK0, 20, 1, [] wr_dis of FLASH_TEMP WR_DIS.FLASH_VENDOR, EFUSE_BLK0, 20, 1, [] wr_dis of FLASH_VENDOR @@ -134,9 +134,9 @@ MAC, EFUSE_BLK1, 40, 8, [MAC_FACT MAC_EXT, EFUSE_BLK1, 48, 16, [] Stores the extended bits of MAC address WAFER_VERSION_MINOR, EFUSE_BLK1, 114, 4, [] WAFER_VERSION_MAJOR, EFUSE_BLK1, 118, 2, [] -BLK_VERSION_MINOR, EFUSE_BLK1, 120, 3, [] BLK_VERSION_MINOR of BLOCK2 -BLK_VERSION_MAJOR, EFUSE_BLK1, 123, 2, [] BLK_VERSION_MAJOR of BLOCK2 -PKG_VERSION, EFUSE_BLK1, 125, 3, [] Package version +PKG_VERSION, EFUSE_BLK1, 120, 3, [] Package version +BLK_VERSION_MINOR, EFUSE_BLK1, 123, 3, [] BLK_VERSION_MINOR of BLOCK2 +BLK_VERSION_MAJOR, EFUSE_BLK1, 126, 2, [] BLK_VERSION_MAJOR of BLOCK2 FLASH_CAP, EFUSE_BLK1, 128, 3, [] FLASH_TEMP, EFUSE_BLK1, 131, 2, [] FLASH_VENDOR, EFUSE_BLK1, 133, 3, [] diff --git a/components/efuse/esp32c6/include/esp_efuse_table.h b/components/efuse/esp32c6/include/esp_efuse_table.h index 15f3dc74fd..4d81d00566 100644 --- a/components/efuse/esp32c6/include/esp_efuse_table.h +++ b/components/efuse/esp32c6/include/esp_efuse_table.h @@ -10,7 +10,7 @@ extern "C" { #include "esp_efuse.h" -// md5_digest_table 995934abe6c7e7366404f837e547bb3f +// md5_digest_table ab312e31f6976fdf923a9809093323fd // 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. @@ -72,9 +72,9 @@ extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_MAC[]; extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_MAC_EXT[]; extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_WAFER_VERSION_MINOR[]; extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_WAFER_VERSION_MAJOR[]; +extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_PKG_VERSION[]; extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_BLK_VERSION_MINOR[]; extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_BLK_VERSION_MAJOR[]; -extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_PKG_VERSION[]; extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_FLASH_CAP[]; extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_FLASH_TEMP[]; extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_FLASH_VENDOR[]; @@ -172,9 +172,9 @@ extern const esp_efuse_desc_t* ESP_EFUSE_MAC[]; extern const esp_efuse_desc_t* ESP_EFUSE_MAC_EXT[]; extern const esp_efuse_desc_t* ESP_EFUSE_WAFER_VERSION_MINOR[]; extern const esp_efuse_desc_t* ESP_EFUSE_WAFER_VERSION_MAJOR[]; +extern const esp_efuse_desc_t* ESP_EFUSE_PKG_VERSION[]; extern const esp_efuse_desc_t* ESP_EFUSE_BLK_VERSION_MINOR[]; extern const esp_efuse_desc_t* ESP_EFUSE_BLK_VERSION_MAJOR[]; -extern const esp_efuse_desc_t* ESP_EFUSE_PKG_VERSION[]; extern const esp_efuse_desc_t* ESP_EFUSE_FLASH_CAP[]; extern const esp_efuse_desc_t* ESP_EFUSE_FLASH_TEMP[]; extern const esp_efuse_desc_t* ESP_EFUSE_FLASH_VENDOR[]; diff --git a/components/soc/esp32c6/include/soc/efuse_reg.h b/components/soc/esp32c6/include/soc/efuse_reg.h index c79ae993d8..2d539b5508 100644 --- a/components/soc/esp32c6/include/soc/efuse_reg.h +++ b/components/soc/esp32c6/include/soc/efuse_reg.h @@ -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. diff --git a/components/soc/esp32c6/include/soc/efuse_struct.h b/components/soc/esp32c6/include/soc/efuse_struct.h index 4a17343744..8342078efb 100644 --- a/components/soc/esp32c6/include/soc/efuse_struct.h +++ b/components/soc/esp32c6/include/soc/efuse_struct.h @@ -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;