mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 03:00:34 +03:00
Merge branch 'feature/ledc_etm_support_v6.0' into 'release/v6.0'
feat(ledc): add ETM support for LEDC peripheral (v6.0) See merge request espressif/esp-idf!43401
This commit is contained in:
@@ -797,7 +797,6 @@ NOINLINE_ATTR static void system_early_init(const soc_reset_reason_t *rst_reas)
|
||||
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM);
|
||||
|
||||
_uart_ll_set_baudrate(UART_LL_GET_HW(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM), CONFIG_ESP_CONSOLE_UART_BAUDRATE, clock_hz);
|
||||
#endif
|
||||
int console_uart_tx_pin = U0TXD_GPIO_NUM;
|
||||
int console_uart_rx_pin = U0RXD_GPIO_NUM;
|
||||
#if CONFIG_ESP_CONSOLE_UART_CUSTOM
|
||||
@@ -805,7 +804,8 @@ NOINLINE_ATTR static void system_early_init(const soc_reset_reason_t *rst_reas)
|
||||
console_uart_rx_pin = (CONFIG_ESP_CONSOLE_UART_RX_GPIO >= 0) ? CONFIG_ESP_CONSOLE_UART_RX_GPIO : U0RXD_GPIO_NUM;
|
||||
#endif
|
||||
ESP_EARLY_LOGI(TAG, "GPIO %d and %d are used as console UART I/O pins", console_uart_rx_pin, console_uart_tx_pin);
|
||||
#endif
|
||||
#endif // CONFIG_ESP_CONSOLE_UART
|
||||
#endif // !CONFIG_IDF_ENV_FPGA
|
||||
|
||||
#if SOC_DEEP_SLEEP_SUPPORTED
|
||||
// Need to unhold the IOs that were hold right before entering deep sleep, which are used as wakeup pins
|
||||
|
||||
Reference in New Issue
Block a user