alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-24 19:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/remove_dis_rtc_ram_boot_efuse_bit_backport_v4.3' into 'release/v4.3'

Browse Source 
efuse: remove DIS_RTC_RAM_BOOT efuse bit (backport v4.3)

See merge request espressif/esp-idf!15233
This commit is contained in:
Jiang Jiang Jian
2021-10-26 03:59:46 +00:00
parent a3ff680dff fd5a63f31e
commit 54b25318cd
11 changed files with 45 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
components/soc/esp32c3/include/soc/efuse_reg.h
View File

@@ -141,12 +141,12 @@ extern "C" {
#define EFUSE_DIS_ICACHE_M (BIT(8))
#define EFUSE_DIS_ICACHE_V 0x1
#define EFUSE_DIS_ICACHE_S 8
/* EFUSE_DIS_RTC_RAM_BOOT : R/W ;bitpos:[7] ;default: 1'b0 ; */
/*description: Set this bit to disable boot from RTC RAM.*/
#define EFUSE_DIS_RTC_RAM_BOOT (BIT(7))
#define EFUSE_DIS_RTC_RAM_BOOT_M (BIT(7))
#define EFUSE_DIS_RTC_RAM_BOOT_V 0x1
#define EFUSE_DIS_RTC_RAM_BOOT_S 7
/* EFUSE_RPT4_RESERVED5 : R/W ;bitpos:[7] ;default: 1'b0 ; */
/*description: Reserved.*/
#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_RD_DIS : R/W ;bitpos:[6:0] ;default: 7'h0 ; */
/*description: Set this bit to disable reading from BlOCK4-10.*/
#define EFUSE_RD_DIS 0x0000007F
@@ -516,12 +516,12 @@ extern "C" {
#define EFUSE_DIS_ICACHE_M (BIT(8))
#define EFUSE_DIS_ICACHE_V 0x1
#define EFUSE_DIS_ICACHE_S 8
/* EFUSE_DIS_RTC_RAM_BOOT : RO ;bitpos:[7] ;default: 1'b0 ; */
/*description: The value of DIS_RTC_RAM_BOOT.*/
#define EFUSE_DIS_RTC_RAM_BOOT (BIT(7))
#define EFUSE_DIS_RTC_RAM_BOOT_M (BIT(7))
#define EFUSE_DIS_RTC_RAM_BOOT_V 0x1
#define EFUSE_DIS_RTC_RAM_BOOT_S 7
/* EFUSE_RPT4_RESERVED5 : RO ;bitpos:[7] ;default: 1'b0 ; */
/*description: Reserved.*/
#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_RD_DIS : RO ;bitpos:[6:0] ;default: 7'h0 ; */
/*description: The value of RD_DIS.*/
#define EFUSE_RD_DIS 0x0000007F
@@ -1486,12 +1486,12 @@ extern "C" {
#define EFUSE_DIS_ICACHE_ERR_M (BIT(8))
#define EFUSE_DIS_ICACHE_ERR_V 0x1
#define EFUSE_DIS_ICACHE_ERR_S 8
/* EFUSE_DIS_RTC_RAM_BOOT_ERR : RO ;bitpos:[7] ;default: 1'b0 ; */
/*description: If DIS_RTC_RAM_BOOT is 1 then it indicates a programming error.*/
#define EFUSE_DIS_RTC_RAM_BOOT_ERR (BIT(7))
#define EFUSE_DIS_RTC_RAM_BOOT_ERR_M (BIT(7))
#define EFUSE_DIS_RTC_RAM_BOOT_ERR_V 0x1
#define EFUSE_DIS_RTC_RAM_BOOT_ERR_S 7
/* EFUSE_RPT4_RESERVED5_ERR : RO ;bitpos:[7] ;default: 1'b0 ; */
/*description: Reserved..*/
#define EFUSE_RPT4_RESERVED5_ERR (BIT(7))
#define EFUSE_RPT4_RESERVED5_ERR_M (BIT(7))
#define EFUSE_RPT4_RESERVED5_ERR_V 0x1
#define EFUSE_RPT4_RESERVED5_ERR_S 7
/* EFUSE_RD_DIS_ERR : RO ;bitpos:[6:0] ;default: 7'h0 ; */
/*description: If any bit in RD_DIS is 1 then it indicates a programming error.*/
#define EFUSE_RD_DIS_ERR 0x0000007F

6
components/soc/esp32c3/include/soc/efuse_struct.h
View File

@@ -22,7 +22,7 @@ typedef volatile struct efuse_dev_s {
union {
struct {
uint32_t rd_dis: 7; /*Set this bit to disable reading from BlOCK4-10.*/
uint32_t dis_rtc_ram_boot: 1; /*Set this bit to disable boot from RTC RAM.*/
uint32_t rpt4_reserved5: 1; /*Reserved*/
uint32_t dis_icache: 1; /*Set this bit to disable Icache.*/
uint32_t dis_usb_jtag: 1; /*Set this bit to disable function of usb switch to jtag in module of usb device.*/
uint32_t dis_download_icache: 1; /*Set this bit to disable Icache in download mode (boot_mode[3:0] is 0 1 2 3 6 7).*/
@@ -106,7 +106,7 @@ typedef volatile struct efuse_dev_s {
union {
struct {
uint32_t rd_dis: 7; /*The value of RD_DIS.*/
uint32_t dis_rtc_ram_boot: 1; /*The value of DIS_RTC_RAM_BOOT.*/
uint32_t rpt4_reserved5: 1; /*Reserved*/
uint32_t dis_icache: 1; /*The value of DIS_ICACHE.*/
uint32_t dis_usb_jtag: 1; /*The value of DIS_USB_JTAG.*/
uint32_t dis_download_icache: 1; /*The value of DIS_DOWNLOAD_ICACHE.*/
@@ -274,7 +274,7 @@ typedef volatile struct efuse_dev_s {
union {
struct {
uint32_t rd_dis_err: 7; /*If any bit in RD_DIS is 1 then it indicates a programming error.*/
uint32_t dis_rtc_ram_boot_err: 1; /*If DIS_RTC_RAM_BOOT is 1 then it indicates a programming error.*/
uint32_t rpt4_reserved5_err: 1; /*Reserved.*/
uint32_t dis_icache_err: 1; /*If DIS_ICACHE is 1 then it indicates a programming error.*/
uint32_t dis_usb_jtag_err: 1; /*If DIS_USB_JTAG is 1 then it indicates a programming error.*/
uint32_t dis_download_icache: 1; /*If DIS_DOWNLOAD_ICACHE is 1 then it indicates a programming error.*/