From c39476d6993cb26fb7e5609282837221f977abc4 Mon Sep 17 00:00:00 2001
From: morris <maoshengrong@espressif.com>
Date: Wed, 2 Dec 2020 11:43:13 +0800
Subject: [PATCH] esp_rom: added esp_rom_install_uart_printf

---
 components/esp_rom/esp32/esp_rom_caps.h          | 7 ++++---
 components/esp_rom/esp32/ld/esp32.rom.api.ld     | 1 +
 components/esp_rom/esp32c3/esp_rom_caps.h        | 7 ++++---
 components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld | 3 +--
 components/esp_rom/esp32s2/esp_rom_caps.h        | 3 ++-
 components/esp_rom/esp32s2/ld/esp32s2.rom.api.ld | 1 +
 components/esp_rom/esp32s3/esp_rom_caps.h        | 8 +++++---
 components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld | 1 +
 components/esp_rom/include/esp_rom_sys.h         | 5 +++++
 components/esp_system/port/cpu_start.c           | 2 +-
 10 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/components/esp_rom/esp32/esp_rom_caps.h b/components/esp_rom/esp32/esp_rom_caps.h
index f6fd1edd09..6188ef52a7 100644
--- a/components/esp_rom/esp32/esp_rom_caps.h
+++ b/components/esp_rom/esp32/esp_rom_caps.h
@@ -14,6 +14,7 @@
 
 #pragma once
 
-#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_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
diff --git a/components/esp_rom/esp32/ld/esp32.rom.api.ld b/components/esp_rom/esp32/ld/esp32.rom.api.ld
index f3904f81d7..cf0b143fa2 100644
--- a/components/esp_rom/esp32/ld/esp32.rom.api.ld
+++ b/components/esp_rom/esp32/ld/esp32.rom.api.ld
@@ -36,3 +36,4 @@ PROVIDE ( esp_rom_md5_final  = 0x4005db1c );
 
 PROVIDE ( esp_rom_printf   = ets_printf );
 PROVIDE ( esp_rom_delay_us = ets_delay_us );
+PROVIDE ( esp_rom_install_uart_printf = ets_install_uart_printf );
diff --git a/components/esp_rom/esp32c3/esp_rom_caps.h b/components/esp_rom/esp32c3/esp_rom_caps.h
index f6fd1edd09..bae770da81 100644
--- a/components/esp_rom/esp32c3/esp_rom_caps.h
+++ b/components/esp_rom/esp32c3/esp_rom_caps.h
@@ -14,6 +14,7 @@
 
 #pragma once
 
-#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_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_UART_CLK_IS_XTAL (1) // UART clock source is selected to XTAL in ROM
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld
index 3ebd5380b2..263da9b726 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld
@@ -24,8 +24,6 @@ PROVIDE ( esp_rom_uart_tx_one_char    = uart_tx_one_char );
 PROVIDE ( esp_rom_uart_tx_wait_idle   = uart_tx_wait_idle );
 PROVIDE ( esp_rom_uart_rx_one_char    = uart_rx_one_char );
 PROVIDE ( esp_rom_uart_rx_string      = UartRxString );
-PROVIDE ( esp_rom_uart_set_as_console = uart_tx_switch );
-PROVIDE ( esp_rom_uart_putc           = ets_write_char_uart );
 
 PROVIDE ( esp_rom_md5_init   = MD5Init );
 PROVIDE ( esp_rom_md5_update = MD5Update );
@@ -33,3 +31,4 @@ PROVIDE ( esp_rom_md5_final  = MD5Final );
 
 PROVIDE ( esp_rom_printf   = ets_printf );
 PROVIDE ( esp_rom_delay_us = ets_delay_us );
+PROVIDE ( esp_rom_install_uart_printf = ets_install_uart_printf );
diff --git a/components/esp_rom/esp32s2/esp_rom_caps.h b/components/esp_rom/esp32s2/esp_rom_caps.h
index e699f431d1..0f63dfb542 100644
--- a/components/esp_rom/esp32s2/esp_rom_caps.h
+++ b/components/esp_rom/esp32s2/esp_rom_caps.h
@@ -14,4 +14,5 @@
 
 #pragma once
 
-#define ESP_ROM_HAS_CRC_LE      (1) // ROM CRC library supports Little Endian
+#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
diff --git a/components/esp_rom/esp32s2/ld/esp32s2.rom.api.ld b/components/esp_rom/esp32s2/ld/esp32s2.rom.api.ld
index c96a54feff..63ad6e6d6f 100644
--- a/components/esp_rom/esp32s2/ld/esp32s2.rom.api.ld
+++ b/components/esp_rom/esp32s2/ld/esp32s2.rom.api.ld
@@ -35,3 +35,4 @@ PROVIDE ( esp_rom_md5_final  = 0x4000530c );
 
 PROVIDE ( esp_rom_printf   = ets_printf );
 PROVIDE ( esp_rom_delay_us = ets_delay_us );
+PROVIDE ( esp_rom_install_uart_printf = ets_install_uart_printf );
diff --git a/components/esp_rom/esp32s3/esp_rom_caps.h b/components/esp_rom/esp32s3/esp_rom_caps.h
index f6fd1edd09..aee488a025 100644
--- a/components/esp_rom/esp32s3/esp_rom_caps.h
+++ b/components/esp_rom/esp32s3/esp_rom_caps.h
@@ -14,6 +14,8 @@
 
 #pragma once
 
-#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_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
diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld
index 592faa8fe9..91dfe43914 100644
--- a/components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld
+++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld
@@ -38,3 +38,4 @@ PROVIDE ( esp_rom_md5_final  = 0x40037740 );
 
 PROVIDE ( esp_rom_printf   = ets_printf );
 PROVIDE ( esp_rom_delay_us = ets_delay_us );
+PROVIDE ( esp_rom_install_uart_printf = ets_install_uart_printf );
diff --git a/components/esp_rom/include/esp_rom_sys.h b/components/esp_rom/include/esp_rom_sys.h
index ef85d35abf..130c307014 100644
--- a/components/esp_rom/include/esp_rom_sys.h
+++ b/components/esp_rom/include/esp_rom_sys.h
@@ -51,6 +51,11 @@ void esp_rom_install_channel_putc(int channel, void (*putc)(char c));
  */
 void esp_rom_disable_logging(void);
 
+/**
+  * @brief Install UART1 as the default console channel, equivalent to `esp_rom_install_channel_putc(1, esp_rom_uart_putc)`
+  */
+void esp_rom_install_uart_printf(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/esp_system/port/cpu_start.c b/components/esp_system/port/cpu_start.c
index bbdc7e0f0c..99a43309b1 100644
--- a/components/esp_system/port/cpu_start.c
+++ b/components/esp_system/port/cpu_start.c
@@ -141,7 +141,7 @@ void IRAM_ATTR call_start_cpu1(void)
     esp_rom_install_channel_putc(1, NULL);
     esp_rom_install_channel_putc(2, NULL);
 #else // CONFIG_ESP_CONSOLE_UART_NONE
-    ets_install_uart_printf();
+    esp_rom_install_uart_printf();
     esp_rom_uart_set_as_console(CONFIG_ESP_CONSOLE_UART_NUM);
 #endif