diff --git a/components/efuse/esp32h2/esp_efuse_table.c b/components/efuse/esp32h2/esp_efuse_table.c index 8fdd02593d..69f107657f 100644 --- a/components/efuse/esp32h2/esp_efuse_table.c +++ b/components/efuse/esp32h2/esp_efuse_table.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -9,7 +9,7 @@ #include #include "esp_efuse_table.h" -// md5_digest_table 8d520559b0ed30f0cef34704317f2815 +// md5_digest_table 2639eb7da0e777178c31231ea20a8cf8 // 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. @@ -175,10 +175,6 @@ static const esp_efuse_desc_t DIS_FORCE_DOWNLOAD[] = { {EFUSE_BLK0, 44, 1}, // Disable force chip go to download mode function, }; -static const esp_efuse_desc_t DIS_USB[] = { - {EFUSE_BLK0, 45, 1}, // Disable USB function, -}; - static const esp_efuse_desc_t DIS_TWAI[] = { {EFUSE_BLK0, 46, 1}, // Disable TWAI function, }; @@ -295,10 +291,6 @@ static const esp_efuse_desc_t UART_PRINT_CHANNEL[] = { {EFUSE_BLK0, 130, 1}, // 0: UART0. 1: UART1, }; -static const esp_efuse_desc_t FLASH_ECC_MODE[] = { - {EFUSE_BLK0, 131, 1}, // Set this bit to set flsah ecc mode. 0:flash ecc 16to18 byte mode. 1:flash ecc 16to17 byte mode, -}; - static const esp_efuse_desc_t DIS_USB_DOWNLOAD_MODE[] = { {EFUSE_BLK0, 132, 1}, // Disable download through USB, }; @@ -311,22 +303,6 @@ static const esp_efuse_desc_t UART_PRINT_CONTROL[] = { {EFUSE_BLK0, 134, 2}, // b00:force print. b01:control by GPIO8 - low level print. b10:control by GPIO8 - high level print. b11:force disable print., }; -static const esp_efuse_desc_t PIN_POWER_SELECTION[] = { - {EFUSE_BLK0, 136, 1}, // GPIO33-GPIO37 power supply selection in ROM code. 0:VDD3P3_CPU. 1:VDD_SPI., -}; - -static const esp_efuse_desc_t FLASH_TYPE[] = { - {EFUSE_BLK0, 137, 1}, // Connected Flash interface type. 0: 4 data line. 1: 8 data line, -}; - -static const esp_efuse_desc_t FLASH_PAGE_SIZE[] = { - {EFUSE_BLK0, 138, 2}, // Flash page size, -}; - -static const esp_efuse_desc_t FLASH_ECC_EN[] = { - {EFUSE_BLK0, 140, 1}, // Enable ECC for flash boot, -}; - static const esp_efuse_desc_t FORCE_SEND_RESUME[] = { {EFUSE_BLK0, 141, 1}, // Force ROM code to send a resume command during SPI boot, }; @@ -697,11 +673,6 @@ const esp_efuse_desc_t* ESP_EFUSE_DIS_FORCE_DOWNLOAD[] = { NULL }; -const esp_efuse_desc_t* ESP_EFUSE_DIS_USB[] = { - &DIS_USB[0], // Disable USB function - NULL -}; - const esp_efuse_desc_t* ESP_EFUSE_DIS_TWAI[] = { &DIS_TWAI[0], // Disable TWAI function NULL @@ -847,11 +818,6 @@ const esp_efuse_desc_t* ESP_EFUSE_UART_PRINT_CHANNEL[] = { NULL }; -const esp_efuse_desc_t* ESP_EFUSE_FLASH_ECC_MODE[] = { - &FLASH_ECC_MODE[0], // Set this bit to set flsah ecc mode. 0:flash ecc 16to18 byte mode. 1:flash ecc 16to17 byte mode - NULL -}; - const esp_efuse_desc_t* ESP_EFUSE_DIS_USB_DOWNLOAD_MODE[] = { &DIS_USB_DOWNLOAD_MODE[0], // Disable download through USB NULL @@ -867,26 +833,6 @@ const esp_efuse_desc_t* ESP_EFUSE_UART_PRINT_CONTROL[] = { NULL }; -const esp_efuse_desc_t* ESP_EFUSE_PIN_POWER_SELECTION[] = { - &PIN_POWER_SELECTION[0], // GPIO33-GPIO37 power supply selection in ROM code. 0:VDD3P3_CPU. 1:VDD_SPI. - NULL -}; - -const esp_efuse_desc_t* ESP_EFUSE_FLASH_TYPE[] = { - &FLASH_TYPE[0], // Connected Flash interface type. 0: 4 data line. 1: 8 data line - NULL -}; - -const esp_efuse_desc_t* ESP_EFUSE_FLASH_PAGE_SIZE[] = { - &FLASH_PAGE_SIZE[0], // Flash page size - NULL -}; - -const esp_efuse_desc_t* ESP_EFUSE_FLASH_ECC_EN[] = { - &FLASH_ECC_EN[0], // Enable ECC for flash boot - NULL -}; - const esp_efuse_desc_t* ESP_EFUSE_FORCE_SEND_RESUME[] = { &FORCE_SEND_RESUME[0], // Force ROM code to send a resume command during SPI boot NULL diff --git a/components/efuse/esp32h2/esp_efuse_table.csv b/components/efuse/esp32h2/esp_efuse_table.csv index 6159892ecb..490c5c0868 100644 --- a/components/efuse/esp32h2/esp_efuse_table.csv +++ b/components/efuse/esp32h2/esp_efuse_table.csv @@ -56,7 +56,6 @@ DIS_DOWNLOAD_ICACHE, EFUSE_BLK0, 42, 1, Disable Icache in download mode DIS_USB_DEVICE, EFUSE_BLK0, 43, 1, Disable USB_DEVICE DIS_FORCE_DOWNLOAD, EFUSE_BLK0, 44, 1, Disable force chip go to download mode function - DIS_USB, EFUSE_BLK0, 45, 1, Disable USB function DIS_TWAI, EFUSE_BLK0, 46, 1, Disable TWAI function JTAG_SEL_ENABLE, EFUSE_BLK0, 47, 1, Set this bit to enable selection between usb_to_jtag and pad_to_jtag through strapping gpio10 when both reg_dis_usb_jtag and reg_dis_pad_jtag are equal to 0. SOFT_DIS_JTAG, EFUSE_BLK0, 48, 3, Set these bits to disable JTAG in the soft way (odd number 1 means disable). JTAG can be enabled in HMAC module. @@ -92,14 +91,9 @@ DIS_DOWNLOAD_MODE, EFUSE_BLK0, 128, 1, Disble download mode include boot_mode[3:0] is 0 1 2 3 6 7 DIS_LEGACY_SPI_BOOT, EFUSE_BLK0, 129, 1, Disable_Legcy_SPI_boot mode include boot_mode[3:0] is 4 UART_PRINT_CHANNEL, EFUSE_BLK0, 130, 1, 0: UART0. 1: UART1 - FLASH_ECC_MODE, EFUSE_BLK0, 131, 1, Set this bit to set flsah ecc mode. 0:flash ecc 16to18 byte mode. 1:flash ecc 16to17 byte mode DIS_USB_DOWNLOAD_MODE, EFUSE_BLK0, 132, 1, Disable download through USB ENABLE_SECURITY_DOWNLOAD, EFUSE_BLK0, 133, 1, Enable security download mode UART_PRINT_CONTROL, EFUSE_BLK0, 134, 2, b00:force print. b01:control by GPIO8 - low level print. b10:control by GPIO8 - high level print. b11:force disable print. - PIN_POWER_SELECTION, EFUSE_BLK0, 136, 1, GPIO33-GPIO37 power supply selection in ROM code. 0:VDD3P3_CPU. 1:VDD_SPI. - FLASH_TYPE, EFUSE_BLK0, 137, 1, Connected Flash interface type. 0: 4 data line. 1: 8 data line - FLASH_PAGE_SIZE, EFUSE_BLK0, 138, 2, Flash page size - FLASH_ECC_EN, EFUSE_BLK0, 140, 1, Enable ECC for flash boot FORCE_SEND_RESUME, EFUSE_BLK0, 141, 1, Force ROM code to send a resume command during SPI boot SECURE_VERSION, EFUSE_BLK0, 142, 16, Secure version for anti-rollback BOOT_DISABLE_FAST_WAKE, EFUSE_BLK0, 158, 1, Fast verify on wake option in ROM for Secure Boot diff --git a/components/efuse/esp32h2/include/esp_efuse_table.h b/components/efuse/esp32h2/include/esp_efuse_table.h index c6ff87fd63..5c0aa3fc66 100644 --- a/components/efuse/esp32h2/include/esp_efuse_table.h +++ b/components/efuse/esp32h2/include/esp_efuse_table.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -9,7 +9,7 @@ extern "C" { #endif -// md5_digest_table 8d520559b0ed30f0cef34704317f2815 +// md5_digest_table 2639eb7da0e777178c31231ea20a8cf8 // 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. @@ -56,7 +56,6 @@ extern const esp_efuse_desc_t* ESP_EFUSE_DIS_USB_JTAG[]; extern const esp_efuse_desc_t* ESP_EFUSE_DIS_DOWNLOAD_ICACHE[]; extern const esp_efuse_desc_t* ESP_EFUSE_DIS_USB_DEVICE[]; extern const esp_efuse_desc_t* ESP_EFUSE_DIS_FORCE_DOWNLOAD[]; -extern const esp_efuse_desc_t* ESP_EFUSE_DIS_USB[]; extern const esp_efuse_desc_t* ESP_EFUSE_DIS_TWAI[]; extern const esp_efuse_desc_t* ESP_EFUSE_JTAG_SEL_ENABLE[]; extern const esp_efuse_desc_t* ESP_EFUSE_SOFT_DIS_JTAG[]; @@ -86,14 +85,9 @@ extern const esp_efuse_desc_t* ESP_EFUSE_FLASH_TPUW[]; extern const esp_efuse_desc_t* ESP_EFUSE_DIS_DOWNLOAD_MODE[]; extern const esp_efuse_desc_t* ESP_EFUSE_DIS_LEGACY_SPI_BOOT[]; extern const esp_efuse_desc_t* ESP_EFUSE_UART_PRINT_CHANNEL[]; -extern const esp_efuse_desc_t* ESP_EFUSE_FLASH_ECC_MODE[]; extern const esp_efuse_desc_t* ESP_EFUSE_DIS_USB_DOWNLOAD_MODE[]; extern const esp_efuse_desc_t* ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD[]; extern const esp_efuse_desc_t* ESP_EFUSE_UART_PRINT_CONTROL[]; -extern const esp_efuse_desc_t* ESP_EFUSE_PIN_POWER_SELECTION[]; -extern const esp_efuse_desc_t* ESP_EFUSE_FLASH_TYPE[]; -extern const esp_efuse_desc_t* ESP_EFUSE_FLASH_PAGE_SIZE[]; -extern const esp_efuse_desc_t* ESP_EFUSE_FLASH_ECC_EN[]; extern const esp_efuse_desc_t* ESP_EFUSE_FORCE_SEND_RESUME[]; extern const esp_efuse_desc_t* ESP_EFUSE_SECURE_VERSION[]; extern const esp_efuse_desc_t* ESP_EFUSE_BOOT_DISABLE_FAST_WAKE[]; diff --git a/components/hal/esp32h2/include/hal/efuse_ll.h b/components/hal/esp32h2/include/hal/efuse_ll.h index 8070067323..052fe92c26 100644 --- a/components/hal/esp32h2/include/hal/efuse_ll.h +++ b/components/hal/esp32h2/include/hal/efuse_ll.h @@ -30,11 +30,6 @@ __attribute__((always_inline)) static inline uint32_t efuse_ll_get_wdt_delay_sel return EFUSE.rd_repeat_data1.wdt_delay_sel; } -__attribute__((always_inline)) static inline uint32_t efuse_ll_get_flash_type(void) -{ - return EFUSE.rd_repeat_data3.flash_type; -} - __attribute__((always_inline)) static inline uint32_t efuse_ll_get_mac0(void) { return EFUSE.rd_mac_spi_sys_0; diff --git a/components/soc/esp32h2/include/rev1/soc/efuse_reg.h b/components/soc/esp32h2/include/rev1/soc/efuse_reg.h index 158e874421..29ad45fc52 100644 --- a/components/soc/esp32h2/include/rev1/soc/efuse_reg.h +++ b/components/soc/esp32h2/include/rev1/soc/efuse_reg.h @@ -274,30 +274,12 @@ extern "C" { #define EFUSE_FORCE_SEND_RESUME_M (BIT(13)) #define EFUSE_FORCE_SEND_RESUME_V 0x1 #define EFUSE_FORCE_SEND_RESUME_S 13 -/* EFUSE_FLASH_ECC_EN : R/W ;bitpos:[12] ;default: 1'b0 ; */ -/*description: Set 1 to enable ECC for flash boot.*/ -#define EFUSE_FLASH_ECC_EN (BIT(12)) -#define EFUSE_FLASH_ECC_EN_M (BIT(12)) -#define EFUSE_FLASH_ECC_EN_V 0x1 -#define EFUSE_FLASH_ECC_EN_S 12 -/* EFUSE_FLASH_PAGE_SIZE : R/W ;bitpos:[11:10] ;default: 2'h0 ; */ -/*description: Set Flash page size.*/ -#define EFUSE_FLASH_PAGE_SIZE 0x00000003 -#define EFUSE_FLASH_PAGE_SIZE_M ((EFUSE_FLASH_PAGE_SIZE_V)<<(EFUSE_FLASH_PAGE_SIZE_S)) -#define EFUSE_FLASH_PAGE_SIZE_V 0x3 -#define EFUSE_FLASH_PAGE_SIZE_S 10 -/* EFUSE_FLASH_TYPE : R/W ;bitpos:[9] ;default: 1'b0 ; */ -/*description: Set the maximum lines of SPI flash. 0: four lines. 1: eight lines.*/ -#define EFUSE_FLASH_TYPE (BIT(9)) -#define EFUSE_FLASH_TYPE_M (BIT(9)) -#define EFUSE_FLASH_TYPE_V 0x1 -#define EFUSE_FLASH_TYPE_S 9 -/* EFUSE_PIN_POWER_SELECTION : R/W ;bitpos:[8] ;default: 1'b0 ; */ -/*description: GPIO33-GPIO37 power supply selection in ROM code. 0: VDD3P3_CPU. 1: VDD_SPI.*/ -#define EFUSE_PIN_POWER_SELECTION (BIT(8)) -#define EFUSE_PIN_POWER_SELECTION_M (BIT(8)) -#define EFUSE_PIN_POWER_SELECTION_V 0x1 -#define EFUSE_PIN_POWER_SELECTION_S 8 +/* EFUSE_RPT4_RESERVED7 : R/W ;bitpos:[12:8] ;default: 5'h0 ; */ +/*description: Reserved (used for four backups method).*/ +#define EFUSE_RPT4_RESERVED7 0x0000001F +#define EFUSE_RPT4_RESERVED7_M ((EFUSE_RPT4_RESERVED7_V)<<(EFUSE_RPT4_RESERVED7_S)) +#define EFUSE_RPT4_RESERVED7_V 0x1F +#define EFUSE_RPT4_RESERVED7_S 8 /* EFUSE_UART_PRINT_CONTROL : R/W ;bitpos:[7:6] ;default: 2'h0 ; */ /*description: Set the default UARTboot message output mode. 00: Enabled. 01: Enabled when GPIO8 is low at reset. 10: Enabled when GPIO8 is high at reset. 11:disabled.*/ @@ -317,13 +299,12 @@ extern "C" { #define EFUSE_DIS_USB_DOWNLOAD_MODE_M (BIT(4)) #define EFUSE_DIS_USB_DOWNLOAD_MODE_V 0x1 #define EFUSE_DIS_USB_DOWNLOAD_MODE_S 4 -/* EFUSE_FLASH_ECC_MODE : R/W ;bitpos:[3] ;default: 1'b0 ; */ -/*description: Set ECC mode in ROM 0: ROM would Enable Flash ECC 16to18 byte - mode. 1:ROM would use 16to17 byte mode.*/ -#define EFUSE_FLASH_ECC_MODE (BIT(3)) -#define EFUSE_FLASH_ECC_MODE_M (BIT(3)) -#define EFUSE_FLASH_ECC_MODE_V 0x1 -#define EFUSE_FLASH_ECC_MODE_S 3 +/* EFUSE_RPT4_RESERVED8 : R/W ;bitpos:[3] ;default: 1'b0 ; */ +/*description: Reserved (used for four backups method).*/ +#define EFUSE_RPT4_RESERVED8 (BIT(3)) +#define EFUSE_RPT4_RESERVED8_M (BIT(3)) +#define EFUSE_RPT4_RESERVED8_V 0x1 +#define EFUSE_RPT4_RESERVED8_S 3 /* EFUSE_UART_PRINT_CHANNEL : R/W ;bitpos:[2] ;default: 1'b0 ; */ /*description: Selectes the default UART print channel. 0: UART0. 1: UART1.*/ #define EFUSE_UART_PRINT_CHANNEL (BIT(2)) @@ -646,30 +627,12 @@ extern "C" { #define EFUSE_FORCE_SEND_RESUME_M (BIT(13)) #define EFUSE_FORCE_SEND_RESUME_V 0x1 #define EFUSE_FORCE_SEND_RESUME_S 13 -/* EFUSE_FLASH_ECC_EN : RO ;bitpos:[12] ;default: 1'b0 ; */ -/*description: The value of FLASH_ECC_EN.*/ -#define EFUSE_FLASH_ECC_EN (BIT(12)) -#define EFUSE_FLASH_ECC_EN_M (BIT(12)) -#define EFUSE_FLASH_ECC_EN_V 0x1 -#define EFUSE_FLASH_ECC_EN_S 12 -/* EFUSE_FLASH_PAGE_SIZE : RO ;bitpos:[11:10] ;default: 2'h0 ; */ -/*description: The value of FLASH_PAGE_SIZE.*/ -#define EFUSE_FLASH_PAGE_SIZE 0x00000003 -#define EFUSE_FLASH_PAGE_SIZE_M ((EFUSE_FLASH_PAGE_SIZE_V)<<(EFUSE_FLASH_PAGE_SIZE_S)) -#define EFUSE_FLASH_PAGE_SIZE_V 0x3 -#define EFUSE_FLASH_PAGE_SIZE_S 10 -/* EFUSE_FLASH_TYPE : RO ;bitpos:[9] ;default: 1'b0 ; */ -/*description: The value of FLASH_TYPE.*/ -#define EFUSE_FLASH_TYPE (BIT(9)) -#define EFUSE_FLASH_TYPE_M (BIT(9)) -#define EFUSE_FLASH_TYPE_V 0x1 -#define EFUSE_FLASH_TYPE_S 9 -/* EFUSE_PIN_POWER_SELECTION : RO ;bitpos:[8] ;default: 1'b0 ; */ -/*description: The value of PIN_POWER_SELECTION.*/ -#define EFUSE_PIN_POWER_SELECTION (BIT(8)) -#define EFUSE_PIN_POWER_SELECTION_M (BIT(8)) -#define EFUSE_PIN_POWER_SELECTION_V 0x1 -#define EFUSE_PIN_POWER_SELECTION_S 8 +/* EFUSE_RPT4_RESERVED7 : RO ;bitpos:[12:8] ;default: 5'h0 ; */ +/*description: Reserved.*/ +#define EFUSE_RPT4_RESERVED7 0x0000001F +#define EFUSE_RPT4_RESERVED7_M ((EFUSE_RPT4_RESERVED7_V)<<(EFUSE_RPT4_RESERVED7_S)) +#define EFUSE_RPT4_RESERVED7_V 0x1F +#define EFUSE_RPT4_RESERVED7_S 8 /* EFUSE_UART_PRINT_CONTROL : RO ;bitpos:[7:6] ;default: 2'h0 ; */ /*description: The value of UART_PRINT_CONTROL.*/ #define EFUSE_UART_PRINT_CONTROL 0x00000003 @@ -688,12 +651,12 @@ extern "C" { #define EFUSE_DIS_USB_DOWNLOAD_MODE_M (BIT(4)) #define EFUSE_DIS_USB_DOWNLOAD_MODE_V 0x1 #define EFUSE_DIS_USB_DOWNLOAD_MODE_S 4 -/* EFUSE_FLASH_ECC_MODE : RO ;bitpos:[3] ;default: 1'b0 ; */ -/*description: The value of FLASH_ECC_MODE.*/ -#define EFUSE_FLASH_ECC_MODE (BIT(3)) -#define EFUSE_FLASH_ECC_MODE_M (BIT(3)) -#define EFUSE_FLASH_ECC_MODE_V 0x1 -#define EFUSE_FLASH_ECC_MODE_S 3 +/* EFUSE_RPT4_RESERVED8 : RO ;bitpos:[3] ;default: 1'b0 ; */ +/*description: Reserved.*/ +#define EFUSE_RPT4_RESERVED8 (BIT(3)) +#define EFUSE_RPT4_RESERVED8_M (BIT(3)) +#define EFUSE_RPT4_RESERVED8_V 0x1 +#define EFUSE_RPT4_RESERVED8_S 3 /* EFUSE_UART_PRINT_CHANNEL : RO ;bitpos:[2] ;default: 1'b0 ; */ /*description: The value of UART_PRINT_CHANNEL.*/ #define EFUSE_UART_PRINT_CHANNEL (BIT(2)) @@ -1616,30 +1579,12 @@ extern "C" { #define EFUSE_FORCE_SEND_RESUME_ERR_M (BIT(13)) #define EFUSE_FORCE_SEND_RESUME_ERR_V 0x1 #define EFUSE_FORCE_SEND_RESUME_ERR_S 13 -/* EFUSE_FLASH_ECC_EN : RO ;bitpos:[12] ;default: 1'b0 ; */ -/*description: If FLASH_ECC_EN_ERR is 1 then it indicates a programming error.*/ -#define EFUSE_FLASH_ECC_EN (BIT(12)) -#define EFUSE_FLASH_ECC_EN_M (BIT(12)) -#define EFUSE_FLASH_ECC_EN_V 0x1 -#define EFUSE_FLASH_ECC_EN_S 12 -/* EFUSE_FLASH_PAGE_SIZE : RO ;bitpos:[11:10] ;default: 2'h0 ; */ -/*description: If any bits in FLASH_PAGE_SIZE is 1 then it indicates a programming error.*/ -#define EFUSE_FLASH_PAGE_SIZE 0x00000003 -#define EFUSE_FLASH_PAGE_SIZE_M ((EFUSE_FLASH_PAGE_SIZE_V)<<(EFUSE_FLASH_PAGE_SIZE_S)) -#define EFUSE_FLASH_PAGE_SIZE_V 0x3 -#define EFUSE_FLASH_PAGE_SIZE_S 10 -/* EFUSE_FLASH_TYPE_ERR : RO ;bitpos:[9] ;default: 1'b0 ; */ -/*description: If FLASH_TYPE is 1 then it indicates a programming error.*/ -#define EFUSE_FLASH_TYPE_ERR (BIT(9)) -#define EFUSE_FLASH_TYPE_ERR_M (BIT(9)) -#define EFUSE_FLASH_TYPE_ERR_V 0x1 -#define EFUSE_FLASH_TYPE_ERR_S 9 -/* EFUSE_PIN_POWER_SELECTION_ERR : RO ;bitpos:[8] ;default: 1'b0 ; */ -/*description: If PIN_POWER_SELECTION is 1 then it indicates a programming error.*/ -#define EFUSE_PIN_POWER_SELECTION_ERR (BIT(8)) -#define EFUSE_PIN_POWER_SELECTION_ERR_M (BIT(8)) -#define EFUSE_PIN_POWER_SELECTION_ERR_V 0x1 -#define EFUSE_PIN_POWER_SELECTION_ERR_S 8 +/* EFUSE_RPT4_RESERVED7_ERR : RO ;bitpos:[12:8] ;default: 5'h0 ; */ +/*description: Reserved.*/ +#define EFUSE_RPT4_RESERVED7_ERR 0x0000001F +#define EFUSE_RPT4_RESERVED7_ERR_M ((EFUSE_RPT4_RESERVED7_ERR_V)<<(EFUSE_RPT4_RESERVED7_ERR_S)) +#define EFUSE_RPT4_RESERVED7_ERR_V 0x1F +#define EFUSE_RPT4_RESERVED7_ERR_S 8 /* EFUSE_UART_PRINT_CONTROL_ERR : RO ;bitpos:[7:6] ;default: 2'h0 ; */ /*description: If any bit in UART_PRINT_CONTROL is 1 then it indicates a programming error.*/ #define EFUSE_UART_PRINT_CONTROL_ERR 0x00000003 @@ -1658,12 +1603,12 @@ extern "C" { #define EFUSE_DIS_USB_DOWNLOAD_MODE_ERR_M (BIT(4)) #define EFUSE_DIS_USB_DOWNLOAD_MODE_ERR_V 0x1 #define EFUSE_DIS_USB_DOWNLOAD_MODE_ERR_S 4 -/* EFUSE_FLASH_ECC_MODE_ERR : RO ;bitpos:[3] ;default: 1'b0 ; */ -/*description: If FLASH_ECC_MODE is 1 then it indicates a programming error.*/ -#define EFUSE_FLASH_ECC_MODE_ERR (BIT(3)) -#define EFUSE_FLASH_ECC_MODE_ERR_M (BIT(3)) -#define EFUSE_FLASH_ECC_MODE_ERR_V 0x1 -#define EFUSE_FLASH_ECC_MODE_ERR_S 3 +/* EFUSE_RPT4_RESERVED8_ERR : RO ;bitpos:[3] ;default: 1'b0 ; */ +/*description: Reserved.*/ +#define EFUSE_RPT4_RESERVED8_ERR (BIT(3)) +#define EFUSE_RPT4_RESERVED8_ERR_M (BIT(3)) +#define EFUSE_RPT4_RESERVED8_ERR_V 0x1 +#define EFUSE_RPT4_RESERVED8_ERR_S 3 /* EFUSE_UART_PRINT_CHANNEL_ERR : RO ;bitpos:[2] ;default: 1'b0 ; */ /*description: If UART_PRINT_CHANNEL is 1 then it indicates a programming error.*/ #define EFUSE_UART_PRINT_CHANNEL_ERR (BIT(2)) diff --git a/components/soc/esp32h2/include/rev1/soc/efuse_struct.h b/components/soc/esp32h2/include/rev1/soc/efuse_struct.h index 2c773ec00b..a780ae1b0c 100644 --- a/components/soc/esp32h2/include/rev1/soc/efuse_struct.h +++ b/components/soc/esp32h2/include/rev1/soc/efuse_struct.h @@ -68,14 +68,11 @@ typedef volatile struct efuse_dev_s { uint32_t dis_download_mode: 1; /*Set this bit to disable download mode (boot_mode[3:0] = 0 1 2 3 6 7).*/ uint32_t dis_legacy_spi_boot: 1; /*Set this bit to disable Legacy SPI boot mode (boot_mode[3:0] = 4).*/ uint32_t uart_print_channel: 1; /*Selectes the default UART print channel. 0: UART0. 1: UART1.*/ - uint32_t flash_ecc_mode: 1; /*Set ECC mode in ROM 0: ROM would Enable Flash ECC 16to18 byte mode. 1:ROM would use 16to17 byte mode.*/ + uint32_t rpt4_reserved8: 1; /*Reserved (used for four backups method).*/ uint32_t dis_usb_download_mode: 1; /*Set this bit to disable UART download mode through USB.*/ uint32_t enable_security_download: 1; /*Set this bit to enable secure UART download mode.*/ uint32_t uart_print_control: 2; /*Set the default UARTboot message output mode. 00: Enabled. 01: Enabled when GPIO8 is low at reset. 10: Enabled when GPIO8 is high at reset. 11:disabled.*/ - uint32_t pin_power_selection: 1; /*GPIO33-GPIO37 power supply selection in ROM code. 0: VDD3P3_CPU. 1: VDD_SPI.*/ - uint32_t flash_type: 1; /*Set the maximum lines of SPI flash. 0: four lines. 1: eight lines.*/ - uint32_t flash_page_size: 2; /*Set Flash page size.*/ - uint32_t flash_ecc_en: 1; /*Set 1 to enable ECC for flash boot.*/ + uint32_t rpt4_reserved7: 5; /*Reserved (used for four backups method).*/ uint32_t force_send_resume: 1; /*Set this bit to force ROM code to send a resume command during SPI boot.*/ uint32_t secure_version: 16; /*Secure version (used by ESP-IDF anti-rollback feature).*/ uint32_t rpt4_reserved1: 2; /*Reserved (used for four backups method).*/ @@ -152,14 +149,11 @@ typedef volatile struct efuse_dev_s { uint32_t dis_download_mode: 1; /*The value of DIS_DOWNLOAD_MODE.*/ uint32_t dis_legacy_spi_boot: 1; /*The value of DIS_LEGACY_SPI_BOOT.*/ uint32_t uart_print_channel: 1; /*The value of UART_PRINT_CHANNEL.*/ - uint32_t flash_ecc_mode: 1; /*The value of FLASH_ECC_MODE.*/ + uint32_t rpt4_reserved8: 1; /*Reserved.*/ uint32_t dis_usb_download_mode: 1; /*The value of DIS_USB_DOWNLOAD_MODE.*/ uint32_t enable_security_download: 1; /*The value of ENABLE_SECURITY_DOWNLOAD.*/ uint32_t uart_print_control: 2; /*The value of UART_PRINT_CONTROL.*/ - uint32_t pin_power_selection: 1; /*The value of PIN_POWER_SELECTION.*/ - uint32_t flash_type: 1; /*The value of FLASH_TYPE.*/ - uint32_t flash_page_size: 2; /*The value of FLASH_PAGE_SIZE.*/ - uint32_t flash_ecc_en: 1; /*The value of FLASH_ECC_EN.*/ + uint32_t rpt4_reserved7: 5; /*Reserved.*/ uint32_t force_send_resume: 1; /*The value of FORCE_SEND_RESUME.*/ uint32_t secure_version: 16; /*The value of SECURE_VERSION.*/ uint32_t rpt4_reserved1: 2; /*Reserved.*/ @@ -322,14 +316,11 @@ typedef volatile struct efuse_dev_s { uint32_t dis_download_mode_err: 1; /*If DIS_DOWNLOAD_MODE is 1 then it indicates a programming error.*/ uint32_t dis_legacy_spi_boot_err: 1; /*If DIS_LEGACY_SPI_BOOT is 1 then it indicates a programming error.*/ uint32_t uart_print_channel_err: 1; /*If UART_PRINT_CHANNEL is 1 then it indicates a programming error.*/ - uint32_t flash_ecc_mode_err: 1; /*If FLASH_ECC_MODE is 1 then it indicates a programming error.*/ + uint32_t rpt4_reserved8_err: 1; /*Reserved.*/ uint32_t dis_usb_download_mode_err: 1; /*If DIS_USB_DOWNLOAD_MODE is 1 then it indicates a programming error.*/ uint32_t enable_security_download_err: 1; /*If ENABLE_SECURITY_DOWNLOAD is 1 then it indicates a programming error.*/ uint32_t uart_print_control_err: 2; /*If any bit in UART_PRINT_CONTROL is 1 then it indicates a programming error.*/ - uint32_t pin_power_selection_err: 1; /*If PIN_POWER_SELECTION is 1 then it indicates a programming error.*/ - uint32_t flash_type_err: 1; /*If FLASH_TYPE is 1 then it indicates a programming error.*/ - uint32_t flash_page_size: 2; /*If any bits in FLASH_PAGE_SIZE is 1 then it indicates a programming error.*/ - uint32_t flash_ecc_en: 1; /*If FLASH_ECC_EN_ERR is 1 then it indicates a programming error.*/ + uint32_t rpt4_reserved7_err: 5; /*Reserved*/ uint32_t force_send_resume_err: 1; /*If FORCE_SEND_RESUME is 1 then it indicates a programming error.*/ uint32_t secure_version_err: 16; /*If any bit in SECURE_VERSION is 1 then it indicates a programming error.*/ uint32_t rpt4_reserved1_err: 2; /*Reserved.*/ diff --git a/components/soc/esp32h2/include/rev2/soc/efuse_reg.h b/components/soc/esp32h2/include/rev2/soc/efuse_reg.h index 2a775d5fe0..6efc45236b 100644 --- a/components/soc/esp32h2/include/rev2/soc/efuse_reg.h +++ b/components/soc/esp32h2/include/rev2/soc/efuse_reg.h @@ -166,13 +166,13 @@ extern "C" { #define EFUSE_RD_DIS_M (EFUSE_RD_DIS_V << EFUSE_RD_DIS_S) #define EFUSE_RD_DIS_V 0x0000007FU #define EFUSE_RD_DIS_S 0 -/** EFUSE_DIS_RTC_RAM_BOOT : RO; bitpos: [7]; default: 0; - * The value of DIS_RTC_RAM_BOOT. +/** EFUSE_RPT4_RESERVED5 : R/W ;bitpos:[7] ;default: 1'b0 ; + * Reserved. */ -#define EFUSE_DIS_RTC_RAM_BOOT (BIT(7)) -#define EFUSE_DIS_RTC_RAM_BOOT_M (EFUSE_DIS_RTC_RAM_BOOT_V << EFUSE_DIS_RTC_RAM_BOOT_S) -#define EFUSE_DIS_RTC_RAM_BOOT_V 0x00000001U -#define EFUSE_DIS_RTC_RAM_BOOT_S 7 +#define EFUSE_RPT4_RESERVED5 (BIT(7)) +#define EFUSE_RPT4_RESERVED5_M (BIT(7)) +#define EFUSE_RPT4_RESERVED5_V 0x1 +#define EFUSE_RPT4_RESERVED5_S 7 /** EFUSE_DIS_ICACHE : RO; bitpos: [8]; default: 0; * The value of DIS_ICACHE. */ @@ -208,13 +208,13 @@ extern "C" { #define EFUSE_DIS_FORCE_DOWNLOAD_M (EFUSE_DIS_FORCE_DOWNLOAD_V << EFUSE_DIS_FORCE_DOWNLOAD_S) #define EFUSE_DIS_FORCE_DOWNLOAD_V 0x00000001U #define EFUSE_DIS_FORCE_DOWNLOAD_S 12 -/** EFUSE_DIS_USB : RO; bitpos: [13]; default: 0; - * The value of DIS_USB. +/** EFUSE_RPT4_RESERVED6 : RO ;bitpos:[13] ;default: 1'b0 ; + * Reserved. */ -#define EFUSE_DIS_USB (BIT(13)) -#define EFUSE_DIS_USB_M (EFUSE_DIS_USB_V << EFUSE_DIS_USB_S) -#define EFUSE_DIS_USB_V 0x00000001U -#define EFUSE_DIS_USB_S 13 +#define EFUSE_RPT4_RESERVED6 (BIT(13)) +#define EFUSE_RPT4_RESERVED6_M (BIT(13)) +#define EFUSE_RPT4_RESERVED6_V 0x1 +#define EFUSE_RPT4_RESERVED6_S 13 /** EFUSE_DIS_TWAI : RO; bitpos: [14]; default: 0; * The value of DIS_TWAI. */ @@ -454,13 +454,13 @@ extern "C" { #define EFUSE_UART_PRINT_CHANNEL_M (EFUSE_UART_PRINT_CHANNEL_V << EFUSE_UART_PRINT_CHANNEL_S) #define EFUSE_UART_PRINT_CHANNEL_V 0x00000001U #define EFUSE_UART_PRINT_CHANNEL_S 2 -/** EFUSE_FLASH_ECC_MODE : RO; bitpos: [3]; default: 0; - * The value of FLASH_ECC_MODE. +/** EFUSE_RPT4_RESERVED8 : RO; bitpos: [3]; default: 0; + * Reserved. */ -#define EFUSE_FLASH_ECC_MODE (BIT(3)) -#define EFUSE_FLASH_ECC_MODE_M (EFUSE_FLASH_ECC_MODE_V << EFUSE_FLASH_ECC_MODE_S) -#define EFUSE_FLASH_ECC_MODE_V 0x00000001U -#define EFUSE_FLASH_ECC_MODE_S 3 +#define EFUSE_RPT4_RESERVED8 (BIT(3)) +#define EFUSE_RPT4_RESERVED8_M (EFUSE_RPT4_RESERVED8_V << EFUSE_RPT4_RESERVED8_S) +#define EFUSE_RPT4_RESERVED8_V 0x00000001U +#define EFUSE_RPT4_RESERVED8_S 3 /** EFUSE_DIS_USB_DOWNLOAD_MODE : RO; bitpos: [4]; default: 0; * The value of DIS_USB_DOWNLOAD_MODE. */ @@ -482,34 +482,13 @@ extern "C" { #define EFUSE_UART_PRINT_CONTROL_M (EFUSE_UART_PRINT_CONTROL_V << EFUSE_UART_PRINT_CONTROL_S) #define EFUSE_UART_PRINT_CONTROL_V 0x00000003U #define EFUSE_UART_PRINT_CONTROL_S 6 -/** EFUSE_PIN_POWER_SELECTION : RO; bitpos: [8]; default: 0; - * The value of PIN_POWER_SELECTION. +/** EFUSE_RPT4_RESERVED7 : RO; bitpos: [12:8]; default: 0; + * Reserved. */ -#define EFUSE_PIN_POWER_SELECTION (BIT(8)) -#define EFUSE_PIN_POWER_SELECTION_M (EFUSE_PIN_POWER_SELECTION_V << EFUSE_PIN_POWER_SELECTION_S) -#define EFUSE_PIN_POWER_SELECTION_V 0x00000001U -#define EFUSE_PIN_POWER_SELECTION_S 8 -/** EFUSE_FLASH_TYPE : RO; bitpos: [9]; default: 0; - * The value of FLASH_TYPE. - */ -#define EFUSE_FLASH_TYPE (BIT(9)) -#define EFUSE_FLASH_TYPE_M (EFUSE_FLASH_TYPE_V << EFUSE_FLASH_TYPE_S) -#define EFUSE_FLASH_TYPE_V 0x00000001U -#define EFUSE_FLASH_TYPE_S 9 -/** EFUSE_FLASH_PAGE_SIZE : RO; bitpos: [11:10]; default: 0; - * The value of FLASH_PAGE_SIZE. - */ -#define EFUSE_FLASH_PAGE_SIZE 0x00000003U -#define EFUSE_FLASH_PAGE_SIZE_M (EFUSE_FLASH_PAGE_SIZE_V << EFUSE_FLASH_PAGE_SIZE_S) -#define EFUSE_FLASH_PAGE_SIZE_V 0x00000003U -#define EFUSE_FLASH_PAGE_SIZE_S 10 -/** EFUSE_FLASH_ECC_EN : RO; bitpos: [12]; default: 0; - * The value of FLASH_ECC_EN. - */ -#define EFUSE_FLASH_ECC_EN (BIT(12)) -#define EFUSE_FLASH_ECC_EN_M (EFUSE_FLASH_ECC_EN_V << EFUSE_FLASH_ECC_EN_S) -#define EFUSE_FLASH_ECC_EN_V 0x00000001U -#define EFUSE_FLASH_ECC_EN_S 12 +#define EFUSE_RPT4_RESERVED7 0x0000001FU +#define EFUSE_RPT4_RESERVED7_M (EFUSE_RPT4_RESERVED7_V << EFUSE_RPT4_RESERVED7_S) +#define EFUSE_RPT4_RESERVED7_V 0x0000001FU +#define EFUSE_RPT4_RESERVED7_S 8 /** EFUSE_FORCE_SEND_RESUME : RO; bitpos: [13]; default: 0; * The value of FORCE_SEND_RESUME. */ @@ -1515,13 +1494,13 @@ extern "C" { #define EFUSE_RD_DIS_ERR_M (EFUSE_RD_DIS_ERR_V << EFUSE_RD_DIS_ERR_S) #define EFUSE_RD_DIS_ERR_V 0x0000007FU #define EFUSE_RD_DIS_ERR_S 0 -/** EFUSE_DIS_RTC_RAM_BOOT_ERR : RO; bitpos: [7]; default: 0; - * If DIS_RTC_RAM_BOOT is 1, then it indicates a programming error. +/** EFUSE_RPT4_RESERVED5_ERR : RO; bitpos: [7]; default: 0; + * Reserved. */ -#define EFUSE_DIS_RTC_RAM_BOOT_ERR (BIT(7)) -#define EFUSE_DIS_RTC_RAM_BOOT_ERR_M (EFUSE_DIS_RTC_RAM_BOOT_ERR_V << EFUSE_DIS_RTC_RAM_BOOT_ERR_S) -#define EFUSE_DIS_RTC_RAM_BOOT_ERR_V 0x00000001U -#define EFUSE_DIS_RTC_RAM_BOOT_ERR_S 7 +#define EFUSE_RPT4_RESERVED5_ERR (BIT(7)) +#define EFUSE_RPT4_RESERVED5_ERR_M (EFUSE_RPT4_RESERVED5_ERR_V << EFUSE_RPT4_RESERVED5_ERR_S) +#define EFUSE_RPT4_RESERVED5_ERR_V 0x00000001U +#define EFUSE_RPT4_RESERVED5_ERR_S 7 /** EFUSE_DIS_ICACHE_ERR : RO; bitpos: [8]; default: 0; * If DIS_ICACHE is 1, then it indicates a programming error. */ @@ -1557,13 +1536,13 @@ extern "C" { #define EFUSE_DIS_FORCE_DOWNLOAD_ERR_M (EFUSE_DIS_FORCE_DOWNLOAD_ERR_V << EFUSE_DIS_FORCE_DOWNLOAD_ERR_S) #define EFUSE_DIS_FORCE_DOWNLOAD_ERR_V 0x00000001U #define EFUSE_DIS_FORCE_DOWNLOAD_ERR_S 12 -/** EFUSE_DIS_USB_ERR : RO; bitpos: [13]; default: 0; - * If DIS_USB is 1, then it indicates a programming error. +/** EFUSE_RPT4_RESERVED6_ERR : RO; bitpos: [13]; default: 0; + * Reserved. */ -#define EFUSE_DIS_USB_ERR (BIT(13)) -#define EFUSE_DIS_USB_ERR_M (EFUSE_DIS_USB_ERR_V << EFUSE_DIS_USB_ERR_S) -#define EFUSE_DIS_USB_ERR_V 0x00000001U -#define EFUSE_DIS_USB_ERR_S 13 +#define EFUSE_RPT4_RESERVED6_ERR (BIT(13)) +#define EFUSE_RPT4_RESERVED6_ERR_M (EFUSE_RPT4_RESERVED6_ERR_V << EFUSE_RPT4_RESERVED6_ERR_S) +#define EFUSE_RPT4_RESERVED6_ERR_V 0x00000001U +#define EFUSE_RPT4_RESERVED6_ERR_S 13 /** EFUSE_DIS_TWAI_ERR : RO; bitpos: [14]; default: 0; * If DIS_TWAI is 1, then it indicates a programming error. */ @@ -1803,13 +1782,13 @@ extern "C" { #define EFUSE_UART_PRINT_CHANNEL_ERR_M (EFUSE_UART_PRINT_CHANNEL_ERR_V << EFUSE_UART_PRINT_CHANNEL_ERR_S) #define EFUSE_UART_PRINT_CHANNEL_ERR_V 0x00000001U #define EFUSE_UART_PRINT_CHANNEL_ERR_S 2 -/** EFUSE_FLASH_ECC_MODE_ERR : RO; bitpos: [3]; default: 0; - * If FLASH_ECC_MODE is 1, then it indicates a programming error. +/** EFUSE_RPT4_RESERVED8_ERR : RO; bitpos: [3]; default: 0; + * Reserved. */ -#define EFUSE_FLASH_ECC_MODE_ERR (BIT(3)) -#define EFUSE_FLASH_ECC_MODE_ERR_M (EFUSE_FLASH_ECC_MODE_ERR_V << EFUSE_FLASH_ECC_MODE_ERR_S) -#define EFUSE_FLASH_ECC_MODE_ERR_V 0x00000001U -#define EFUSE_FLASH_ECC_MODE_ERR_S 3 +#define EFUSE_RPT4_RESERVED8_ERR (BIT(3)) +#define EFUSE_RPT4_RESERVED8_ERR_M (EFUSE_RPT4_RESERVED8_ERR_V << EFUSE_RPT4_RESERVED8_ERR_S) +#define EFUSE_RPT4_RESERVED8_ERR_V 0x00000001U +#define EFUSE_RPT4_RESERVED8_ERR_S 3 /** EFUSE_DIS_USB_DOWNLOAD_MODE_ERR : RO; bitpos: [4]; default: 0; * If DIS_USB_DOWNLOAD_MODE is 1, then it indicates a programming error. */ @@ -1831,34 +1810,13 @@ extern "C" { #define EFUSE_UART_PRINT_CONTROL_ERR_M (EFUSE_UART_PRINT_CONTROL_ERR_V << EFUSE_UART_PRINT_CONTROL_ERR_S) #define EFUSE_UART_PRINT_CONTROL_ERR_V 0x00000003U #define EFUSE_UART_PRINT_CONTROL_ERR_S 6 -/** EFUSE_PIN_POWER_SELECTION_ERR : RO; bitpos: [8]; default: 0; - * If PIN_POWER_SELECTION is 1, then it indicates a programming error. +/** EFUSE_RPT4_RESERVED7_ERR : RO; bitpos: [12:8]; default: 0; + * Reserved. */ -#define EFUSE_PIN_POWER_SELECTION_ERR (BIT(8)) -#define EFUSE_PIN_POWER_SELECTION_ERR_M (EFUSE_PIN_POWER_SELECTION_ERR_V << EFUSE_PIN_POWER_SELECTION_ERR_S) -#define EFUSE_PIN_POWER_SELECTION_ERR_V 0x00000001U -#define EFUSE_PIN_POWER_SELECTION_ERR_S 8 -/** EFUSE_FLASH_TYPE_ERR : RO; bitpos: [9]; default: 0; - * If FLASH_TYPE is 1, then it indicates a programming error. - */ -#define EFUSE_FLASH_TYPE_ERR (BIT(9)) -#define EFUSE_FLASH_TYPE_ERR_M (EFUSE_FLASH_TYPE_ERR_V << EFUSE_FLASH_TYPE_ERR_S) -#define EFUSE_FLASH_TYPE_ERR_V 0x00000001U -#define EFUSE_FLASH_TYPE_ERR_S 9 -/** EFUSE_FLASH_PAGE_SIZE_ERR : RO; bitpos: [11:10]; default: 0; - * If any bits in FLASH_PAGE_SIZE is 1, then it indicates a programming error. - */ -#define EFUSE_FLASH_PAGE_SIZE_ERR 0x00000003U -#define EFUSE_FLASH_PAGE_SIZE_ERR_M (EFUSE_FLASH_PAGE_SIZE_ERR_V << EFUSE_FLASH_PAGE_SIZE_ERR_S) -#define EFUSE_FLASH_PAGE_SIZE_ERR_V 0x00000003U -#define EFUSE_FLASH_PAGE_SIZE_ERR_S 10 -/** EFUSE_FLASH_ECC_EN_ERR : RO; bitpos: [12]; default: 0; - * If FLASH_ECC_EN_ERR is 1, then it indicates a programming error. - */ -#define EFUSE_FLASH_ECC_EN_ERR (BIT(12)) -#define EFUSE_FLASH_ECC_EN_ERR_M (EFUSE_FLASH_ECC_EN_ERR_V << EFUSE_FLASH_ECC_EN_ERR_S) -#define EFUSE_FLASH_ECC_EN_ERR_V 0x00000001U -#define EFUSE_FLASH_ECC_EN_ERR_S 12 +#define EFUSE_RPT4_RESERVED7_ERR 0x0000001FU +#define EFUSE_RPT4_RESERVED7_ERR_M (EFUSE_RPT4_RESERVED7_ERR_V << EFUSE_RPT4_RESERVED7_ERR_S) +#define EFUSE_RPT4_RESERVED7_ERR_V 0x0000001FU +#define EFUSE_RPT4_RESERVED7_ERR_S 8 /** EFUSE_FORCE_SEND_RESUME_ERR : RO; bitpos: [13]; default: 0; * If FORCE_SEND_RESUME is 1, then it indicates a programming error. */ diff --git a/components/soc/esp32h2/include/rev2/soc/efuse_struct.h b/components/soc/esp32h2/include/rev2/soc/efuse_struct.h index c9cac7f8a1..6a41ccd4eb 100644 --- a/components/soc/esp32h2/include/rev2/soc/efuse_struct.h +++ b/components/soc/esp32h2/include/rev2/soc/efuse_struct.h @@ -178,10 +178,10 @@ typedef union { * The value of RD_DIS. */ uint32_t rd_dis:7; - /** dis_rtc_ram_boot : RO; bitpos: [7]; default: 0; - * The value of DIS_RTC_RAM_BOOT. + /** rpt4_reserved5 : RO; bitpos: [7]; default: 0; + * Reserved. */ - uint32_t dis_rtc_ram_boot:1; + uint32_t rpt4_reserved5:1; /** dis_icache : RO; bitpos: [8]; default: 0; * The value of DIS_ICACHE. */ @@ -202,10 +202,10 @@ typedef union { * The value of DIS_FORCE_DOWNLOAD. */ uint32_t dis_force_download:1; - /** dis_usb : RO; bitpos: [13]; default: 0; - * The value of DIS_USB. + /** rpt4_reserved6 : RO; bitpos: [13]; default: 0; + * Reserved. */ - uint32_t dis_usb:1; + uint32_t rpt4_reserved6:1; /** dis_twai : RO; bitpos: [14]; default: 0; * The value of DIS_TWAI. */ @@ -361,10 +361,10 @@ typedef union { * The value of UART_PRINT_CHANNEL. */ uint32_t uart_print_channel:1; - /** flash_ecc_mode : RO; bitpos: [3]; default: 0; - * The value of FLASH_ECC_MODE. + /** rpt4_reserved8 : RO; bitpos: [3]; default: 0; + * Reserved. */ - uint32_t flash_ecc_mode:1; + uint32_t rpt4_reserved8:1; /** dis_usb_download_mode : RO; bitpos: [4]; default: 0; * The value of DIS_USB_DOWNLOAD_MODE. */ @@ -377,22 +377,10 @@ typedef union { * The value of UART_PRINT_CONTROL. */ uint32_t uart_print_control:2; - /** pin_power_selection : RO; bitpos: [8]; default: 0; - * The value of PIN_POWER_SELECTION. + /** rpt4_reserved7 : RO; bitpos: [12:8]; default: 0; + * Reserved. */ - uint32_t pin_power_selection:1; - /** flash_type : RO; bitpos: [9]; default: 0; - * The value of FLASH_TYPE. - */ - uint32_t flash_type:1; - /** flash_page_size : RO; bitpos: [11:10]; default: 0; - * The value of FLASH_PAGE_SIZE. - */ - uint32_t flash_page_size:2; - /** flash_ecc_en : RO; bitpos: [12]; default: 0; - * The value of FLASH_ECC_EN. - */ - uint32_t flash_ecc_en:1; + uint32_t rpt4_reserved7:5; /** force_send_resume : RO; bitpos: [13]; default: 0; * The value of FORCE_SEND_RESUME. */ @@ -1453,10 +1441,10 @@ typedef union { * If any bit in RD_DIS is 1, then it indicates a programming error. */ uint32_t rd_dis_err:7; - /** dis_rtc_ram_boot_err : RO; bitpos: [7]; default: 0; - * If DIS_RTC_RAM_BOOT is 1, then it indicates a programming error. + /** rpt4_reserved5_err : RO; bitpos: [7]; default: 0; + * Reserved. */ - uint32_t dis_rtc_ram_boot_err:1; + uint32_t rpt4_reserved5_err:1; /** dis_icache_err : RO; bitpos: [8]; default: 0; * If DIS_ICACHE is 1, then it indicates a programming error. */ @@ -1477,10 +1465,10 @@ typedef union { * If DIS_FORCE_DOWNLOAD is 1, then it indicates a programming error. */ uint32_t dis_force_download_err:1; - /** dis_usb_err : RO; bitpos: [13]; default: 0; - * If DIS_USB is 1, then it indicates a programming error. + /** rpt4_reserved6_err : RO; bitpos: [13]; default: 0; + * Reserved. */ - uint32_t dis_usb_err:1; + uint32_t rpt4_reserved6_err:1; /** dis_twai_err : RO; bitpos: [14]; default: 0; * If DIS_TWAI is 1, then it indicates a programming error. */ @@ -1636,10 +1624,10 @@ typedef union { * If UART_PRINT_CHANNEL is 1, then it indicates a programming error. */ uint32_t uart_print_channel_err:1; - /** flash_ecc_mode_err : RO; bitpos: [3]; default: 0; - * If FLASH_ECC_MODE is 1, then it indicates a programming error. + /** rpt4_reserved8_err : RO; bitpos: [3]; default: 0; + * Reserved. */ - uint32_t flash_ecc_mode_err:1; + uint32_t rpt4_reserved8_err:1; /** dis_usb_download_mode_err : RO; bitpos: [4]; default: 0; * If DIS_USB_DOWNLOAD_MODE is 1, then it indicates a programming error. */ @@ -1652,22 +1640,10 @@ typedef union { * If any bit in UART_PRINT_CONTROL is 1, then it indicates a programming error. */ uint32_t uart_print_control_err:2; - /** pin_power_selection_err : RO; bitpos: [8]; default: 0; - * If PIN_POWER_SELECTION is 1, then it indicates a programming error. + /** rpt4_reserved7 : RO; bitpos: [12:8]; default: 0; + * Reserved. */ - uint32_t pin_power_selection_err:1; - /** flash_type_err : RO; bitpos: [9]; default: 0; - * If FLASH_TYPE is 1, then it indicates a programming error. - */ - uint32_t flash_type_err:1; - /** flash_page_size_err : RO; bitpos: [11:10]; default: 0; - * If any bits in FLASH_PAGE_SIZE is 1, then it indicates a programming error. - */ - uint32_t flash_page_size_err:2; - /** flash_ecc_en_err : RO; bitpos: [12]; default: 0; - * If FLASH_ECC_EN_ERR is 1, then it indicates a programming error. - */ - uint32_t flash_ecc_en_err:1; + uint32_t rpt4_reserved7:5; /** force_send_resume_err : RO; bitpos: [13]; default: 0; * If FORCE_SEND_RESUME is 1, then it indicates a programming error. */