Merge branch 'bugfix/fix_efuse_err_address_backport4.2' into 'release/v4.2'

fix efuse err address in block0 (backport v4.2)

See merge request espressif/esp-idf!14813

components/soc/soc/esp32s2/include/soc/efuse_reg.h

@@ -1908,7 +1908,7 @@ extern "C" {
 #define EFUSE_DIS_DOWNLOAD_MODE_ERR_V  0x1
 #define EFUSE_DIS_DOWNLOAD_MODE_ERR_S  0
 
-#define EFUSE_RD_REPEAT_ERR4_REG          (DR_REG_EFUSE_BASE + 0x190)
+#define EFUSE_RD_REPEAT_ERR4_REG          (DR_REG_EFUSE_BASE + 0x18C)
 /* EFUSE_RPT1_RESERVED0_ERR : RO ;bitpos:[31:24] ;default: 8'h0 ; */
 /*description: Reserved.*/
 #define EFUSE_RPT1_RESERVED0_ERR  0x000000FF

components/soc/soc/esp32s2/include/soc/efuse_struct.h

@@ -357,7 +357,6 @@ typedef volatile struct efuse_dev_s {
         };
         uint32_t val;
     } rd_repeat_err3;
-    uint32_t reserved_18c;
     union {
         struct {
             uint32_t rd_chip_version_err:24;
@@ -365,6 +364,18 @@ typedef volatile struct efuse_dev_s {
         };
         uint32_t val;
     } rd_repeat_err4;
+    uint32_t reserved_190;
+    uint32_t reserved_194;
+    uint32_t reserved_198;
+    uint32_t reserved_19c;
+    uint32_t reserved_1a0;
+    uint32_t reserved_1a4;
+    uint32_t reserved_1a8;
+    uint32_t reserved_1ac;
+    uint32_t reserved_1b0;
+    uint32_t reserved_1b4;
+    uint32_t reserved_1b8;
+    uint32_t reserved_1bc;
     union {
         struct {
             uint32_t rd_mac_spi_8m_err_num: 3;
@@ -500,17 +511,6 @@ typedef volatile struct efuse_dev_s {
         };
         uint32_t val;
     } wr_tim_conf1;
-    uint32_t reserved_1cc;
-    uint32_t reserved_1d0;
-    uint32_t reserved_1d4;
-    uint32_t reserved_1d8;
-    uint32_t reserved_1dc;
-    uint32_t reserved_1e0;
-    uint32_t reserved_1e4;
-    uint32_t reserved_1e8;
-    uint32_t reserved_1ec;
-    uint32_t reserved_1f0;
-    uint32_t reserved_1f4;
     uint32_t reserved_1f8;
     uint32_t date;                                              /**/
 } efuse_dev_t;