ソースを参照

efuse: Updates description of uart_print_control efuse

KonstantinKondrashov 5 年 前
コミット
43ebb8ea61

+ 3 - 3
components/efuse/esp32c3/esp_efuse_table.c

@@ -17,7 +17,7 @@
 #include <assert.h>
 #include "esp_efuse_table.h"
 
-// md5_digest_table 69693bb96832f42833460571ebc1f865
+// md5_digest_table f9a84eb22f94a7bc083b4c6817a33a59
 // 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.
@@ -312,7 +312,7 @@ static const esp_efuse_desc_t ENABLE_SECURITY_DOWNLOAD[] = {
 };
 
 static const esp_efuse_desc_t UART_PRINT_CONTROL[] = {
-    {EFUSE_BLK0, 134, 2}, 	 // b00:force print. b01:control by GPIO46 - low level print. b10:control by GPIO46 - high level print. b11:force disable print.,
+    {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[] = {
@@ -849,7 +849,7 @@ const esp_efuse_desc_t* ESP_EFUSE_ENABLE_SECURITY_DOWNLOAD[] = {
 };
 
 const esp_efuse_desc_t* ESP_EFUSE_UART_PRINT_CONTROL[] = {
-    &UART_PRINT_CONTROL[0],    		// b00:force print. b01:control by GPIO46 - low level print. b10:control by GPIO46 - high level print. b11:force disable print.
+    &UART_PRINT_CONTROL[0],    		// b00:force print. b01:control by GPIO8 - low level print. b10:control by GPIO8 - high level print. b11:force disable print.
     NULL
 };
 

+ 1 - 1
components/efuse/esp32c3/esp_efuse_table.csv

@@ -95,7 +95,7 @@
         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 GPIO46 - low level print. b10:control by GPIO46 - high level print. b11:force disable print.
+        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

+ 1 - 1
components/efuse/esp32c3/include/esp_efuse_table.h

@@ -17,7 +17,7 @@ extern "C" {
 #endif
 
 
-// md5_digest_table 69693bb96832f42833460571ebc1f865
+// md5_digest_table f9a84eb22f94a7bc083b4c6817a33a59
 // 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.

+ 2 - 2
components/esp_rom/include/esp32c3/rom/efuse.h

@@ -229,8 +229,8 @@ bool ets_efuse_legacy_spi_boot_mode_disabled(void);
   *
   * @return
   * - 0 for uart force print.
-  * - 1 for uart print when GPIO46 is low when digital reset.
-  *   2 for uart print when GPIO46 is high when digital reset.
+  * - 1 for uart print when GPIO8 is low when digital reset.
+  *   2 for uart print when GPIO8 is high when digital reset.
   *   3 for uart force slient
   */
 uint32_t ets_efuse_get_uart_print_control(void);

+ 1 - 1
components/esptool_py/esptool

@@ -1 +1 @@
-Subproject commit fc1780090683a3bd7d336d3250826f85362964b4
+Subproject commit 0ba556f042bd428e62e96891601b1940bc1c0972

+ 1 - 1
components/soc/esp32c3/include/soc/efuse_reg.h

@@ -308,7 +308,7 @@ extern "C" {
 #define EFUSE_PIN_POWER_SELECTION_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 GPIO46 is low at reset. 10: Enabled when GPIO46 is high at reset. 11:disabled.*/
+ Enabled when GPIO8 is low at reset. 10: Enabled when GPIO8 is high at reset. 11:disabled.*/
 #define EFUSE_UART_PRINT_CONTROL  0x00000003
 #define EFUSE_UART_PRINT_CONTROL_M  ((EFUSE_UART_PRINT_CONTROL_V)<<(EFUSE_UART_PRINT_CONTROL_S))
 #define EFUSE_UART_PRINT_CONTROL_V  0x3

+ 1 - 1
components/soc/esp32c3/include/soc/efuse_struct.h

@@ -79,7 +79,7 @@ typedef volatile struct {
             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 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 GPIO46 is low at reset. 10: Enabled when GPIO46 is high at reset. 11:disabled.*/
+            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.*/