Bladeren bron

esp_rom: remove ESP_ROM_SUPPORT_MULTIPLE_UART

jiangguangming 3 jaren geleden
bovenliggende
commit
8774db59f0

+ 1 - 4
components/bootloader_support/src/bootloader_console.c

@@ -60,10 +60,7 @@ void bootloader_console_init(void)
     // Some constants to make the following code less upper-case
     const int uart_tx_gpio = CONFIG_ESP_CONSOLE_UART_TX_GPIO;
     const int uart_rx_gpio = CONFIG_ESP_CONSOLE_UART_RX_GPIO;
-    // Switch to the new UART (this just changes UART number used for esp_rom_printf in ROM code).
-#if ESP_ROM_SUPPORT_MULTIPLE_UART
-    esp_rom_uart_set_as_console(uart_num);
-#endif
+
     // If console is attached to UART1 or if non-default pins are used,
     // need to reconfigure pins using GPIO matrix
     if (uart_num != 0 ||

+ 0 - 4
components/esp_rom/esp32/Kconfig.soc_caps.in

@@ -15,10 +15,6 @@ config ESP_ROM_HAS_JPEG_DECODE
     bool
     default y
 
-config ESP_ROM_SUPPORT_MULTIPLE_UART
-    bool
-    default y
-
 config ESP_ROM_NEEDS_SWSETUP_WORKAROUND
     bool
     default y

+ 0 - 1
components/esp_rom/esp32/esp_rom_caps.h

@@ -9,5 +9,4 @@
 #define ESP_ROM_HAS_CRC_LE              (1) // ROM CRC library supports Little Endian
 #define ESP_ROM_HAS_CRC_BE              (1) // ROM CRC library supports Big Endian
 #define ESP_ROM_HAS_JPEG_DECODE         (1) // ROM has JPEG decode library
-#define ESP_ROM_SUPPORT_MULTIPLE_UART   (1) // ROM has multiple UARTs available for logging
 #define ESP_ROM_NEEDS_SWSETUP_WORKAROUND    (1) // ROM uses 32-bit time_t. A workaround is required to prevent printf functions from crashing

+ 0 - 4
components/esp_rom/esp32s2/Kconfig.soc_caps.in

@@ -7,10 +7,6 @@ config ESP_ROM_HAS_CRC_LE
     bool
     default y
 
-config ESP_ROM_SUPPORT_MULTIPLE_UART
-    bool
-    default y
-
 config ESP_ROM_NEEDS_SWSETUP_WORKAROUND
     bool
     default y

+ 0 - 1
components/esp_rom/esp32s2/esp_rom_caps.h

@@ -7,5 +7,4 @@
 #pragma once
 
 #define ESP_ROM_HAS_CRC_LE            (1) // ROM CRC library supports Little Endian
-#define ESP_ROM_SUPPORT_MULTIPLE_UART (1) // ROM has multiple UARTs available for logging
 #define ESP_ROM_NEEDS_SWSETUP_WORKAROUND    (1) // ROM uses 32-bit time_t. A workaround is required to prevent printf functions from crashing

+ 0 - 4
components/esp_rom/esp32s3/Kconfig.soc_caps.in

@@ -15,10 +15,6 @@ config ESP_ROM_HAS_JPEG_DECODE
     bool
     default y
 
-config ESP_ROM_SUPPORT_MULTIPLE_UART
-    bool
-    default y
-
 config ESP_ROM_UART_CLK_IS_XTAL
     bool
     default y

+ 0 - 1
components/esp_rom/esp32s3/esp_rom_caps.h

@@ -9,7 +9,6 @@
 #define ESP_ROM_HAS_CRC_LE                  (1) // ROM CRC library supports Little Endian
 #define ESP_ROM_HAS_CRC_BE                  (1) // ROM CRC library supports Big Endian
 #define ESP_ROM_HAS_JPEG_DECODE             (1) // ROM has JPEG decode library
-#define ESP_ROM_SUPPORT_MULTIPLE_UART       (1) // ROM has multiple UARTs available for logging
 #define ESP_ROM_UART_CLK_IS_XTAL            (1) // UART clock source is selected to XTAL in ROM
 #define ESP_ROM_HAS_RETARGETABLE_LOCKING    (1) // ROM was built with retargetable locking
 #define ESP_ROM_USB_SERIAL_DEVICE_NUM       (4) // The serial port ID (UART, USB, ...) of USB_SERIAL_JTAG in the ROM.