remove(c5beta3): remove c5 beta3 doxy files

2024-10-05 20:47:46 -04:00 · 2024-06-11 15:31:33 +08:00 · 2024-06-11 15:31:33 +08:00 · c731b099ee
commit c731b099ee
parent 21f870ecd5
89 changed files with 153 additions and 309 deletions
--- a/24
+++ b/24
@ -118,28 +118,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
        default "y" if IDF_TARGET="esp32c5"
        select FREERTOS_UNICORE
        select IDF_TARGET_ARCH_RISCV
-
-    # TODO: IDF-9197
-    choice IDF_TARGET_ESP32C5_VERSION
-        prompt "ESP32-C5 version"
-        depends on IDF_TARGET_ESP32C5
-        default IDF_TARGET_ESP32C5_MP_VERSION
-        help
-            ESP32-C5 will support two versions for a period.
-            This option is for internal use only.
-            Select the one that matches your chip model.
-
-        config IDF_TARGET_ESP32C5_BETA3_VERSION
-            bool
-            prompt "ESP32-C5 beta3"
-            select ESPTOOLPY_NO_STUB
-
-        config IDF_TARGET_ESP32C5_MP_VERSION
-            bool
-            prompt "ESP32-C5 MP"
-            select ESPTOOLPY_NO_STUB
        select IDF_ENV_FPGA
-    endchoice

    config IDF_TARGET_ESP32P4
        bool
@ -173,8 +152,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
        default 0x000D if IDF_TARGET_ESP32C6
        default 0x0010 if IDF_TARGET_ESP32H2
        default 0x0012 if IDF_TARGET_ESP32P4
-        default 0x0011 if IDF_TARGET_ESP32C5 && IDF_TARGET_ESP32C5_BETA3_VERSION  # TODO: IDF-9197
-        default 0x0017 if IDF_TARGET_ESP32C5 && IDF_TARGET_ESP32C5_MP_VERSION     # TODO: IDF-9197
+        default 0x0017 if IDF_TARGET_ESP32C5
        default 0x0014 if IDF_TARGET_ESP32C61
        default 0xFFFF

--- a/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/README.md
+++ b/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/driver/test_apps/legacy_mcpwm_driver/README.md
+++ b/components/driver/test_apps/legacy_mcpwm_driver/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
--- a/components/driver/test_apps/legacy_pcnt_driver/README.md
+++ b/components/driver/test_apps/legacy_pcnt_driver/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/driver/test_apps/legacy_rmt_driver/README.md
+++ b/components/driver/test_apps/legacy_rmt_driver/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/driver/test_apps/legacy_timer_driver/README.md
+++ b/components/driver/test_apps/legacy_timer_driver/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/efuse/test_apps/README.md
+++ b/components/efuse/test_apps/README.md
@ -1,3 +1,3 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | Linux |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | ----- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | Linux |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | ----- |

--- a/components/esp_driver_gptimer/test_apps/gptimer/README.md
+++ b/components/esp_driver_gptimer/test_apps/gptimer/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_i2s/test_apps/i2s/README.md
+++ b/components/esp_driver_i2s/test_apps/i2s/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_i2s/test_apps/i2s_multi_dev/README.md
+++ b/components/esp_driver_i2s/test_apps/i2s_multi_dev/README.md
@ -1,3 +1,3 @@
-| Supported Targets | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- |

--- a/components/esp_driver_ledc/test_apps/ledc/README.md
+++ b/components/esp_driver_ledc/test_apps/ledc/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_mcpwm/test_apps/mcpwm/README.md
+++ b/components/esp_driver_mcpwm/test_apps/mcpwm/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_pcnt/test_apps/pulse_cnt/README.md
+++ b/components/esp_driver_pcnt/test_apps/pulse_cnt/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_rmt/test_apps/rmt/README.md
+++ b/components/esp_driver_rmt/test_apps/rmt/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_sdspi/test_apps/sdspi/README.md
+++ b/components/esp_driver_sdspi/test_apps/sdspi/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_spi/test_apps/master/README.md
+++ b/components/esp_driver_spi/test_apps/master/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_spi/test_apps/param/README.md
+++ b/components/esp_driver_spi/test_apps/param/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_spi/test_apps/slave/README.md
+++ b/components/esp_driver_spi/test_apps/slave/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_spi/test_apps/slave_hd/README.md
+++ b/components/esp_driver_spi/test_apps/slave_hd/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_uart/test_apps/rs485/README.md
+++ b/components/esp_driver_uart/test_apps/rs485/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_driver_uart/test_apps/uart/README.md
+++ b/components/esp_driver_uart/test_apps/uart/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_hw_support/port/esp32c5/Kconfig.rtc
+++ b/components/esp_hw_support/port/esp32c5/Kconfig.rtc
@ -5,7 +5,6 @@ choice RTC_CLK_SRC
        Choose which clock is used as RTC clock source.

    config RTC_CLK_SRC_INT_RC
-        depends on IDF_TARGET_ESP32C5_MP_VERSION
        bool "Internal 136kHz RC oscillator"
    config RTC_CLK_SRC_EXT_CRYS
        bool "External 32 kHz crystal"
--- a/components/esp_hw_support/port/esp32c5/Kconfig.xtal
+++ b/components/esp_hw_support/port/esp32c5/Kconfig.xtal
@ -1,6 +1,5 @@
 choice XTAL_FREQ
    prompt "Main XTAL frequency"
-    default XTAL_FREQ_48 if IDF_TARGET_ESP32C5_BETA3_VERSION
    default XTAL_FREQ_AUTO
    help
        This option selects the operating frequency of the XTAL (crystal) clock used to drive the ESP target.
@ -11,14 +10,7 @@ choice XTAL_FREQ
        the crystal frequency, and record to PCR_CLK_XTAL_FREQ register field.

    config XTAL_FREQ_AUTO
-        depends on IDF_TARGET_ESP32C5_MP_VERSION
        bool "Autodetect"
-    config XTAL_FREQ_40
-        depends on IDF_TARGET_ESP32C5_BETA3_VERSION
-        bool "40 MHz"
-    config XTAL_FREQ_48
-        depends on IDF_TARGET_ESP32C5_BETA3_VERSION
-        bool "48 MHz"
 endchoice

 # soc_xtal_freq_t enum in soc/clk_tree_defs.h lists the XTAL frequencies can be supported
@ -26,5 +18,3 @@ endchoice
 config XTAL_FREQ
    int
    default 0  if XTAL_FREQ_AUTO
-    default 40 if XTAL_FREQ_40
-    default 48 if XTAL_FREQ_48
--- a/components/esp_hw_support/port/esp32c5/include/soc/rtc.h
+++ b/components/esp_hw_support/port/esp32c5/include/soc/rtc.h
@ -185,17 +185,6 @@ void rtc_clk_init(rtc_clk_config_t cfg);
 */
 soc_xtal_freq_t rtc_clk_xtal_freq_get(void);

-#if CONFIG_IDF_TARGET_ESP32C5_BETA3_VERSION
-/**
- * @brief Update XTAL frequency
- *
- * Updates the XTAL value stored in RTC_XTAL_FREQ_REG. Usually this value is ignored
- * after startup.
- *
- * @param xtal_freq New frequency value
- */
-void rtc_clk_xtal_freq_update(soc_xtal_freq_t xtal_freq);
-#endif

 /**
 * @brief Enable or disable 32 kHz XTAL oscillator
--- a/components/esp_hw_support/port/esp32c5/rtc_clk.c
+++ b/components/esp_hw_support/port/esp32c5/rtc_clk.c
@ -362,21 +362,11 @@ void rtc_clk_cpu_freq_to_pll_and_pll_lock_release(int cpu_freq_mhz)

 soc_xtal_freq_t rtc_clk_xtal_freq_get(void)
 {
-    uint32_t xtal_freq_mhz = clk_ll_xtal_load_freq_mhz();
-    if (xtal_freq_mhz == 0) {
-        ESP_HW_LOGW(TAG, "invalid RTC_XTAL_FREQ_REG value, assume 48MHz");
-        return SOC_XTAL_FREQ_48M;
-    }
+    uint32_t xtal_freq_mhz = clk_ll_xtal_get_freq_mhz();
+    assert(xtal_freq_mhz == SOC_XTAL_FREQ_48M || xtal_freq_mhz == SOC_XTAL_FREQ_40M);
    return (soc_xtal_freq_t)xtal_freq_mhz;
 }

-#if CONFIG_IDF_TARGET_ESP32C5_BETA3_VERSION
-void rtc_clk_xtal_freq_update(soc_xtal_freq_t xtal_freq)
-{
-    clk_ll_xtal_store_freq_mhz(xtal_freq);
-}
-#endif
-
 static uint32_t rtc_clk_ahb_freq_get(void)
 {
    soc_cpu_clk_src_t source = clk_ll_cpu_get_src();
--- a/components/esp_hw_support/port/esp32c5/rtc_clk_init.c
+++ b/components/esp_hw_support/port/esp32c5/rtc_clk_init.c
@ -84,13 +84,7 @@ void rtc_clk_init(rtc_clk_config_t cfg)

    clk_ll_rc_fast_tick_conf(); // TODO: IDF-8642 Unnecessary or not?

-#if CONFIG_IDF_TARGET_ESP32C5_BETA3_VERSION
-    soc_xtal_freq_t xtal_freq = cfg.xtal_freq;
-    esp_rom_output_tx_wait_idle(0);
-    rtc_clk_xtal_freq_update(xtal_freq);
-#else
    // XTAL freq determined by efuse, and can be directly informed from register field PCR_CLK_XTAL_FREQ
-#endif

    /* Set CPU frequency */
    rtc_clk_cpu_freq_get_config(&old_config);
--- a/components/esp_hw_support/port/esp32c5/systimer.c
+++ b/components/esp_hw_support/port/esp32c5/systimer.c
@ -8,37 +8,6 @@
 #include "esp_private/systimer.h"
 #include "hal/clk_tree_ll.h"

-#if CONFIG_IDF_TARGET_ESP32C5_BETA3_VERSION
-#if CONFIG_XTAL_FREQ_40
-/**
- * @brief systimer's clock source is fixed to XTAL (40MHz), and has a fixed fractional divider (2.5).
- *        So the resolution of the systimer is 40MHz/2.5 = 16MHz.
- */
-
-uint64_t systimer_ticks_to_us(uint64_t ticks)
-{
-    return ticks / 16;
-}
-
-uint64_t systimer_us_to_ticks(uint64_t us)
-{
-    return us * 16;
-}
-#elif CONFIG_XTAL_FREQ_48
-uint64_t systimer_ticks_to_us(uint64_t ticks)
-{
-    return ticks * 5 / 96;
-}
-
-uint64_t systimer_us_to_ticks(uint64_t us)
-{
-    return us * 96 / 5;
-}
-#else
-#error "Unsupported XTAL frequency by systimer"
-#endif // CONFIG_XTAL_FREQ_xx
-
-#else // !CONFIG_IDF_TARGET_ESP32C5_BETA3_VERSION
 /**
 * @brief systimer's clock source is fixed to XTAL, the fixed fractional divider is changed according to
 * EFUSE_XTAL_48M_SEL. No matter 48MHz or 40MHz XTAL, the resolution of the systimer is always 16MHz.
@ -53,4 +22,3 @@ uint64_t systimer_us_to_ticks(uint64_t us)
 {
    return us * 16;
 }
-#endif
--- a/components/esp_lcd/test_apps/spi_lcd/README.md
+++ b/components/esp_lcd/test_apps/spi_lcd/README.md
@ -1,4 +1,4 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 This test app is used to test LCDs with SPI interface.
--- a/components/esp_rom/esp32c5/Kconfig.soc_caps.in
+++ b/components/esp_rom/esp32c5/Kconfig.soc_caps.in
@ -83,6 +83,14 @@ config ESP_ROM_SUPPORT_DEEP_SLEEP_WAKEUP_STUB
    bool
    default y

+config ESP_ROM_USB_OTG_NUM
+    int
+    default -1
+
 config ESP_ROM_HAS_OUTPUT_PUTC_FUNC
    bool
    default y
+
+config ESP_ROM_CLIC_INT_THRESH_PATCH
+    bool
+    default y
--- a/components/esp_rom/esp32c5/esp_rom_caps.h
+++ b/components/esp_rom/esp32c5/esp_rom_caps.h
@ -26,5 +26,6 @@
 #define ESP_ROM_RAM_APP_NEEDS_MMU_INIT      (1) // ROM doesn't init cache MMU when it's a RAM APP, needs MMU hal to init
 #define ESP_ROM_HAS_VERSION                 (1) // ROM has version/eco information
 #define ESP_ROM_SUPPORT_DEEP_SLEEP_WAKEUP_STUB  (1) // ROM supports the HP core to jump to the RTC memory to execute stub code after waking up from deepsleep.
+#define ESP_ROM_USB_OTG_NUM                 (-1) // No USB_OTG CDC in the ROM, set -1 for Kconfig usage.
 #define ESP_ROM_HAS_OUTPUT_PUTC_FUNC        (1) // ROM has esp_rom_output_putc (or ets_write_char_uart)
 #define ESP_ROM_CLIC_INT_THRESH_PATCH       (1) // ROM version of esprv_intc_int_set_threshold incorrectly assumes lowest MINTTHRESH is 0x1F, should be 0xF
--- a/components/esp_rom/test_apps/.build-test-rules.yml
+++ b/components/esp_rom/test_apps/.build-test-rules.yml
@ -9,6 +9,7 @@ components/esp_rom/test_apps/rom_impl_components:
    # For ROM impl build tests, disable them if none of the tested features are supported in the ROM
    - if: CONFIG_NAME == "rom_impl_components" and ((ESP_ROM_HAS_HAL_WDT != 1  and ESP_ROM_HAS_HAL_SYSTIMER != 1) and (ESP_ROM_HAS_HEAP_TLSF != 1 and ESP_ROM_HAS_SPI_FLASH != 1))
    - if: CONFIG_NAME == "no_rom_impl_components" and ((ESP_ROM_HAS_HAL_WDT != 1 and ESP_ROM_HAS_HAL_SYSTIMER != 1) and (ESP_ROM_HAS_HEAP_TLSF != 1 and ESP_ROM_HAS_SPI_FLASH != 1))
+    - if: SOC_WDT_SUPPORTED != 1

 components/esp_rom/test_apps/rom_tests:
  disable_test:
--- a/components/esp_rom/test_apps/rom_impl_components/README.md
+++ b/components/esp_rom/test_apps/rom_impl_components/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/components/esp_system/Kconfig
+++ b/components/esp_system/Kconfig
@ -360,7 +360,6 @@ menu "ESP System Settings"
        prompt "UART console baud rate" if ESP_CONSOLE_UART_CUSTOM
        depends on ESP_CONSOLE_UART
        default 74880 if (IDF_TARGET_ESP32C2 && XTAL_FREQ_26)
-        default 138240 if (IDF_TARGET_ESP32C5_BETA3_VERSION && XTAL_FREQ_48)
        default 115200
        range 1200 4000000 if !PM_ENABLE
        range 1200 1000000 if PM_ENABLE
--- a/components/hal/esp32c5/clk_tree_hal.c
+++ b/components/hal/esp32c5/clk_tree_hal.c
@ -12,10 +12,6 @@
 #include "hal/log.h"
 #include "sdkconfig.h"

-#if CONFIG_IDF_TARGET_ESP32C5_BETA3_VERSION
-static const char *CLK_HAL_TAG = "clk_hal";
-#endif
-
 uint32_t clk_hal_soc_root_get_freq_mhz(soc_cpu_clk_src_t cpu_clk_src)
 {
    switch (cpu_clk_src) {
@ -73,18 +69,9 @@ uint32_t clk_hal_lp_slow_get_freq_hz(void)

 uint32_t clk_hal_xtal_get_freq_mhz(void)
 {
-#if CONFIG_IDF_TARGET_ESP32C5_BETA3_VERSION
-    uint32_t freq = clk_ll_xtal_load_freq_mhz();
-    if (freq == 0) {
-        HAL_LOGW(CLK_HAL_TAG, "invalid RTC_XTAL_FREQ_REG value, assume 48MHz");
-        return (uint32_t)SOC_XTAL_FREQ_48M;
-    }
-    return freq;
-#elif CONFIG_IDF_TARGET_ESP32C5_MP_VERSION
    uint32_t freq = clk_ll_xtal_get_freq_mhz();
    HAL_ASSERT(freq == SOC_XTAL_FREQ_48M || freq == SOC_XTAL_FREQ_40M);
    return freq;
-#endif
 }

 void clk_hal_clock_output_setup(soc_clkout_sig_id_t clk_sig, clock_out_channel_t channel_id)
--- a/components/hal/esp32c5/include/hal/clk_tree_ll.h
+++ b/components/hal/esp32c5/include/hal/clk_tree_ll.h
@ -265,7 +265,6 @@ static inline __attribute__((always_inline)) bool clk_ll_rc32k_digi_is_enabled(v
    return LP_CLKRST.clk_to_hp.icg_hp_osc32k;
 }

-#if !CONFIG_IDF_TARGET_ESP32C5_BETA3_VERSION
 /**
 * @brief Get XTAL_CLK frequency
 *
@ -277,7 +276,6 @@ static inline __attribute__((always_inline)) uint32_t clk_ll_xtal_get_freq_mhz(v
 {
    return PCR.sysclk_conf.clk_xtal_freq;
 }
-#endif

 /**
 * @brief Get PLL_CLK frequency
--- a/components/hal/include/hal/modem_clock_hal.h
+++ b/components/hal/include/hal/modem_clock_hal.h
@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@ -19,6 +19,13 @@
 extern "C" {
 #endif

+#if !CONFIG_IDF_TARGET_ESP32C5
+typedef struct {
+    modem_syscon_dev_t *syscon_dev;
+    modem_lpcon_dev_t  *lpcon_dev;
+} modem_clock_hal_context_t;
+#endif
+
 #if !CONFIG_IDF_TARGET_ESP32H2 //TODO: PM-92
 void modem_clock_hal_set_clock_domain_icg_bitmap(modem_clock_hal_context_t *hal, modem_clock_domain_t domain, uint32_t bitmap);
 uint32_t modem_clock_hal_get_clock_domain_icg_bitmap(modem_clock_hal_context_t *hal, modem_clock_domain_t domain);
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@ -299,6 +299,11 @@ INPUT = \
    $(PROJECT_PATH)/components/protocomm/include/crypto/srp6a/esp_srp.h \
    $(PROJECT_PATH)/components/pthread/include/esp_pthread.h \
    $(PROJECT_PATH)/components/sdmmc/include/sdmmc_cmd.h \
+	$(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
+    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/clk_tree_defs.h \
+    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/gpio_num.h \
+    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
+    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
    $(PROJECT_PATH)/components/spi_flash/include/esp_flash_spi_init.h \
    $(PROJECT_PATH)/components/spi_flash/include/esp_flash.h \
    $(PROJECT_PATH)/components/spi_flash/include/spi_flash_mmap.h \
--- a/docs/doxygen/Doxyfile_esp32
+++ b/docs/doxygen/Doxyfile_esp32
@ -1,13 +1,8 @@
 INPUT += \
         $(PROJECT_PATH)/components/driver/touch_sensor/$(IDF_TARGET)/include/driver/touch_sensor.h \
         $(PROJECT_PATH)/components/esp_psram/include/esp32/himem.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/dac_channel.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/clk_tree_defs.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/gpio_num.h \
         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/rtc_io_channel.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/touch_sensor_channel.h \
         $(PROJECT_PATH)/components/ulp/ulp_fsm/include/$(IDF_TARGET)/ulp.h \
         $(PROJECT_PATH)/components/bt/include/$(IDF_TARGET)/include/esp_bt.h \
--- a/docs/doxygen/Doxyfile_esp32c2
+++ b/docs/doxygen/Doxyfile_esp32c2
@ -2,8 +2,3 @@ INPUT += \
    $(PROJECT_PATH)/components/bt/include/esp32c2/include/esp_bt.h \
    $(PROJECT_PATH)/components/esp_phy/include/esp_phy_init.h \
    $(PROJECT_PATH)/components/esp_phy/include/esp_phy_cert_test.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/clk_tree_defs.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/gpio_num.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
--- a/docs/doxygen/Doxyfile_esp32c3
+++ b/docs/doxygen/Doxyfile_esp32c3
@ -2,8 +2,3 @@ INPUT += \
    $(PROJECT_PATH)/components/bt/include/esp32c3/include/esp_bt.h \
    $(PROJECT_PATH)/components/esp_phy/include/esp_phy_init.h \
    $(PROJECT_PATH)/components/esp_phy/include/esp_phy_cert_test.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/clk_tree_defs.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/gpio_num.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
--- a/docs/doxygen/Doxyfile_esp32c5
+++ b/docs/doxygen/Doxyfile_esp32c5
@ -1,9 +1,4 @@
-# TODO: IDF-9197 Use beta3 in doc temprory
 INPUT += \
-        $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/mp/include/soc/soc_caps.h \
-        $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/mp/include/soc/clk_tree_defs.h \
-        $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/mp/include/soc/gpio_num.h \
-        $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/mp/include/soc/uart_channel.h \
        $(PROJECT_PATH)/components/ulp/lp_core/include/lp_core_i2c.h \
        $(PROJECT_PATH)/components/ulp/lp_core/include/lp_core_uart.h \
        $(PROJECT_PATH)/components/ulp/lp_core/include/ulp_lp_core.h \
--- a/docs/doxygen/Doxyfile_esp32c6
+++ b/docs/doxygen/Doxyfile_esp32c6
@ -14,8 +14,3 @@ INPUT += \
    $(PROJECT_PATH)/components/ulp/ulp_common/include/ulp_common.h \
    $(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_he_types.h \
    $(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_he.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/clk_tree_defs.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/gpio_num.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
--- a/docs/doxygen/Doxyfile_esp32c61
+++ b/docs/doxygen/Doxyfile_esp32c61
@ -1,7 +1,3 @@
 INPUT += \
    $(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_he_types.h \
    $(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_he.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/clk_tree_defs.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/gpio_num.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
--- a/docs/doxygen/Doxyfile_esp32h2
+++ b/docs/doxygen/Doxyfile_esp32h2
@ -3,8 +3,3 @@ INPUT += \
    $(PROJECT_PATH)/components/esp_phy/include/esp_phy_init.h \
    $(PROJECT_PATH)/components/esp_phy/include/esp_phy_cert_test.h \
    $(PROJECT_PATH)/components/esp_coex/include/esp_coex_i154.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/clk_tree_defs.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/gpio_num.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
--- a/docs/doxygen/Doxyfile_esp32p4
+++ b/docs/doxygen/Doxyfile_esp32p4
@ -33,10 +33,5 @@ INPUT += \
    $(PROJECT_PATH)/components/esp_driver_jpeg/include/driver/jpeg_encode.h \
    $(PROJECT_PATH)/components/esp_driver_ppa/include/driver/ppa.h \
    $(PROJECT_PATH)/components/esp_lcd/dsi/include/esp_lcd_mipi_dsi.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/clk_tree_defs.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/gpio_num.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
    $(PROJECT_PATH)/components/sdmmc/include/sd_pwr_ctrl.h \
    $(PROJECT_PATH)/components/sdmmc/include/sd_pwr_ctrl_by_on_chip_ldo.h \
--- a/docs/doxygen/Doxyfile_esp32s2
+++ b/docs/doxygen/Doxyfile_esp32s2
@ -1,12 +1,7 @@
 INPUT += \
         $(PROJECT_PATH)/components/driver/touch_sensor/$(IDF_TARGET)/include/driver/touch_sensor.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/dac_channel.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/clk_tree_defs.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/gpio_num.h \
         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/rtc_io_channel.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/touch_sensor_channel.h \
         $(PROJECT_PATH)/components/ulp/ulp_fsm/include/$(IDF_TARGET)/ulp.h \
         $(PROJECT_PATH)/components/touch_element/include/touch_element/touch_button.h \
--- a/docs/doxygen/Doxyfile_esp32s3
+++ b/docs/doxygen/Doxyfile_esp32s3
@ -1,12 +1,7 @@
 INPUT += \
         $(PROJECT_PATH)/components/driver/touch_sensor/$(IDF_TARGET)/include/driver/touch_sensor.h \
         $(PROJECT_PATH)/components/esp_lcd/rgb/include/esp_lcd_panel_rgb.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/clk_tree_defs.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/gpio_num.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/touch_sensor_channel.h \
-         $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_channel.h \
         $(PROJECT_PATH)/components/ulp/ulp_fsm/include/$(IDF_TARGET)/ulp.h \
         $(PROJECT_PATH)/components/touch_element/include/touch_element/touch_button.h \
         $(PROJECT_PATH)/components/touch_element/include/touch_element/touch_element.h \
--- a/docs/en/api-guides/linker-script-generation.rst
+++ b/docs/en/api-guides/linker-script-generation.rst
@ -629,10 +629,4 @@ Then the corresponding excerpt from the generated linker script will be as follo

    Rule generated from the default scheme entry ``iram -> iram0_text``. Since the default scheme specifies an ``iram -> iram0_text`` entry, it too is placed wherever ``iram0_text`` is referenced by a marker. Since it is a rule generated from the default scheme, it comes first among all other rules collected under the same target name.

-.. only:: not esp32c5
-
    The linker script template currently used is :component_file:`esp_system/ld/{IDF_TARGET_PATH_NAME}/sections.ld.in`; the generated output script ``sections.ld`` is put under its build directory.
-
-.. only:: esp32c5
-
-    The linker script template currently used is :component_file:`esp_system/ld/esp32c5/beta3/sections.ld.in`; the generated output script ``sections.ld`` is put under its build directory.
--- a/docs/zh_CN/api-guides/linker-script-generation.rst
+++ b/docs/zh_CN/api-guides/linker-script-generation.rst
@ -629,10 +629,4 @@

    这是根据默认协议条目 ``iram -> iram0_text`` 生成的规则。默认协议指定了 ``iram -> iram0_text`` 条目，因此生成的规则同样也放在被 ``iram0_text`` 标记的地方。由于该规则是根据默认协议生成的，因此在同一目标下收集的所有规则下排在第一位。

-.. only:: not esp32c5
-
    目前使用的链接器脚本模板是 :component_file:`esp_system/ld/{IDF_TARGET_PATH_NAME}/sections.ld.in`，生成的脚本存放在构建目录下。
-
-.. only:: esp32c5
-
-    目前使用的链接器脚本模板是 :component_file:`esp_system/ld/esp32c5/beta3/sections.ld.in`，生成的脚本存放在构建目录下。
--- a/examples/custom_bootloader/bootloader_override/bootloader_components/main/CMakeLists.txt
+++ b/examples/custom_bootloader/bootloader_override/bootloader_components/main/CMakeLists.txt
@ -3,14 +3,7 @@ idf_component_register(SRCS "bootloader_start.c"

 idf_build_get_property(target IDF_TARGET)

-# TODO: [ESP32C5] IDF-9197 remove this when beta3 is removed
-if(CONFIG_IDF_TARGET_ESP32C5_MP_VERSION)
-    set(target_folder "esp32c5/mp")
-elseif(CONFIG_IDF_TARGET_ESP32C5_BETA3_VERSION)
-    set(target_folder "esp32c5/beta3")
-else()
-    set(target_folder "${target}")
-endif()
+set(target_folder "${target}")

 # Use the linker script files from the actual bootloader
 set(scripts "${IDF_PATH}/components/bootloader/subproject/main/ld/${target_folder}/bootloader.ld"
--- a/examples/get-started/blink/README.md
+++ b/examples/get-started/blink/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # Blink Example

--- a/examples/peripherals/i2s/i2s_basic/i2s_pdm/README.md
+++ b/examples/peripherals/i2s/i2s_basic/i2s_pdm/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |

 # I2S Basic PDM Mode Example

--- a/examples/peripherals/i2s/i2s_basic/i2s_std/README.md
+++ b/examples/peripherals/i2s/i2s_basic/i2s_std/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # I2S Basic Standard Mode Example

--- a/examples/peripherals/i2s/i2s_basic/i2s_tdm/README.md
+++ b/examples/peripherals/i2s/i2s_basic/i2s_tdm/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # I2S Basic TDM Mode Example

--- a/examples/peripherals/lcd/spi_lcd_touch/README.md
+++ b/examples/peripherals/lcd/spi_lcd_touch/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # SPI LCD and Touch Panel Example

--- a/examples/peripherals/lcd/tjpgd/README.md
+++ b/examples/peripherals/lcd/tjpgd/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 ## LCD tjpgd example

--- a/examples/peripherals/ledc/ledc_basic/README.md
+++ b/examples/peripherals/ledc/ledc_basic/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # _LEDC Basic Example_

--- a/examples/peripherals/ledc/ledc_fade/README.md
+++ b/examples/peripherals/ledc/ledc_fade/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # _LEDC Fade Example_

--- a/examples/peripherals/ledc/ledc_gamma_curve_fade/README.md
+++ b/examples/peripherals/ledc/ledc_gamma_curve_fade/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C6 | ESP32-H2 | ESP32-P4 |
-| ----------------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 |
+| ----------------- | -------- | -------- | -------- | -------- |

 # _LEDC Gamma Curve Fade Example_

--- a/examples/peripherals/mcpwm/mcpwm_bdc_speed_control/README.md
+++ b/examples/peripherals/mcpwm/mcpwm_bdc_speed_control/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 # MCPWM Brushed DC Motor Example

 (See the README.md file in the upper level 'examples' directory for more information about examples.)
@ -90,6 +90,6 @@ To help tune the PID parameters (i.e. `Kp`, `Ki` and `Kd` in the example), this
 ## Troubleshooting

 * Make sure your ESP board and H-bridge module have been connected to the same GND panel.
-* The PID parameter set in ths example might not work well in all kinds of motors, because it's not adaptive. You need to fine tune the parameters again by yourself.
+* The PID parameter set in this example might not work well in all kinds of motors, because it's not adaptive. You need to fine tune the parameters again by yourself.

 For any technical queries, please open an [issue](https://github.com/espressif/esp-idf/issues) on GitHub. We will get back to you soon.
--- a/examples/peripherals/mcpwm/mcpwm_bldc_hall_control/README.md
+++ b/examples/peripherals/mcpwm/mcpwm_bldc_hall_control/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |

 # MCPWM BLDC Motor Control with HALL Sensor Example

--- a/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/README.md
+++ b/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |

 # HC-SR04 Example based on MCPWM Capture

--- a/examples/peripherals/mcpwm/mcpwm_foc_svpwm_open_loop/README.md
+++ b/examples/peripherals/mcpwm/mcpwm_foc_svpwm_open_loop/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |

 # MCPWM FOC SVPWM Generation Open Loop Example

--- a/examples/peripherals/mcpwm/mcpwm_servo_control/README.md
+++ b/examples/peripherals/mcpwm/mcpwm_servo_control/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
 # MCPWM RC Servo Control Example

 (See the README.md file in the upper level 'examples' directory for more information about examples.)
--- a/examples/peripherals/mcpwm/mcpwm_sync/README.md
+++ b/examples/peripherals/mcpwm/mcpwm_sync/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |

 # MCPWM Sync Example

--- a/examples/peripherals/pcnt/rotary_encoder/README.md
+++ b/examples/peripherals/pcnt/rotary_encoder/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |

 # Rotary Encoder Example

@ -7,7 +7,7 @@

 The PCNT peripheral is designed to count the number of rising and/or falling edges of an input signal. Each PCNT unit has two channels, which makes it possible to extract more information from two input signals than only one signal.

-This example shows how to make use of the HW features to decode the differential signals generated from a common rotary encoder -- [EC11](https://tech.alpsalpine.com/e/products/category/encorder/sub/01/series/ec11e/).
+This example shows how to make use of the HW features to decode the differential signals generated from a common rotary encoder -- [EC11](https://tech.alpsalpine.com/e/products/category/encoder/sub/01/series/ec11e/).

 The signals a rotary encoder produces (and what can be handled by this example) are based on a 2-bit gray code available on 2 digital data signal lines. The typical encoders use 3 output pins: 2 for the signals and one for the common signal usually GND.

--- a/examples/peripherals/rmt/dshot_esc/README.md
+++ b/examples/peripherals/rmt/dshot_esc/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 # RMT Infinite Loop Transmit Example -- Dshot ESC (Electronic Speed Controller)

 (See the README.md file in the upper level 'examples' directory for more information about examples.)
--- a/examples/peripherals/rmt/ir_nec_transceiver/README.md
+++ b/examples/peripherals/rmt/ir_nec_transceiver/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 # IR NEC Encoding and Decoding Example

 (See the README.md file in the upper level 'examples' directory for more information about examples.)
--- a/examples/peripherals/rmt/led_strip/README.md
+++ b/examples/peripherals/rmt/led_strip/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 # RMT Transmit Example -- LED Strip

 (See the README.md file in the upper level 'examples' directory for more information about examples.)
--- a/examples/peripherals/rmt/led_strip_simple_encoder/README.md
+++ b/examples/peripherals/rmt/led_strip_simple_encoder/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 # RMT Transmit Example -- LED Strip

 (See the README.md file in the upper level 'examples' directory for more information about examples.)
--- a/examples/peripherals/rmt/musical_buzzer/README.md
+++ b/examples/peripherals/rmt/musical_buzzer/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # RMT Transmit Loop Count Example -- Musical Buzzer

--- a/examples/peripherals/rmt/onewire/README.md
+++ b/examples/peripherals/rmt/onewire/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # Advanced RMT Transmit & Receive Example -- Simulate 1-Wire Bus

--- a/examples/peripherals/rmt/stepper_motor/README.md
+++ b/examples/peripherals/rmt/stepper_motor/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- |

 # RMT Based Stepper Motor Smooth Controller

--- a/examples/peripherals/spi_master/hd_eeprom/README.md
+++ b/examples/peripherals/spi_master/hd_eeprom/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 ## SPI master half duplex EEPROM example

--- a/examples/peripherals/spi_master/lcd/README.md
+++ b/examples/peripherals/spi_master/lcd/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # SPI Host Driver Example

--- a/examples/peripherals/spi_slave/README.md
+++ b/examples/peripherals/spi_slave/README.md
@ -1,9 +1,9 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 ## SPI slave example

-These two projects illustrate the SPI Slave driver. They're supposed to be flashed into two separate Espressif chips connected to eachother using the SPI pins defined in app_main.c. Once connected and flashed, they will use the spi master and spi slave driver to communicate with eachother. The example also includes a handshaking line to allow the master to only poll the  slave when it is actually ready to parse a transaction.
+These two projects illustrate the SPI Slave driver. They're supposed to be flashed into two separate Espressif chips connected to each other using the SPI pins defined in app_main.c. Once connected and flashed, they will use the spi master and spi slave driver to communicate with each other. The example also includes a handshaking line to allow the master to only poll the  slave when it is actually ready to parse a transaction.

 ### Connection
 For different chip and host used, the connections may be different. Here show a example diagram of hardware connection, you can freely change the GPIO settings by editing defines in the top of `main/app_main.c` in the master/slave source code. and change the hardware relatively.
--- a/examples/peripherals/spi_slave_hd/append_mode/master/README.md
+++ b/examples/peripherals/spi_slave_hd/append_mode/master/README.md
@ -1,4 +1,4 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 See README.md in the parent directory
--- a/examples/peripherals/spi_slave_hd/append_mode/slave/README.md
+++ b/examples/peripherals/spi_slave_hd/append_mode/slave/README.md
@ -1,4 +1,4 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 See README.md in the parent directory
--- a/examples/peripherals/spi_slave_hd/segment_mode/seg_master/README.md
+++ b/examples/peripherals/spi_slave_hd/segment_mode/seg_master/README.md
@ -1,4 +1,4 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 See README.md in the parent directory
--- a/examples/peripherals/spi_slave_hd/segment_mode/seg_slave/README.md
+++ b/examples/peripherals/spi_slave_hd/segment_mode/seg_slave/README.md
@ -1,2 +1,2 @@
-| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
--- a/examples/peripherals/timer_group/gptimer/README.md
+++ b/examples/peripherals/timer_group/gptimer/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # Example: General Purpose Timer

--- a/examples/peripherals/timer_group/legacy_driver/README.md
+++ b/examples/peripherals/timer_group/legacy_driver/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # Example: General Purpose Timer

--- a/examples/protocols/mqtt/ssl_ds/README.md
+++ b/examples/protocols/mqtt/ssl_ds/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # ESP-MQTT SSL Mutual Authentication with Digital Signature
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
@ -24,7 +24,7 @@ Please select the supported target with the following command:
 ```
 idf.py set-target /* target */
 ```
-More detials can be found at [Selecting the target](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/build-system.html#selecting-the-target).
+More details can be found at [Selecting the target](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/build-system.html#selecting-the-target).

 #### 2) Generate your client key and certificate

@ -62,7 +62,7 @@ RSA private key is nothing but the client private key ( RSA ) generated in Step

 > Note: More details about the `esp-secure-cert-tool` utility can be found [here](https://github.com/espressif/esp_secure_cert_mgr/tree/main/tools).

-#### 4) Connection cofiguration
+#### 4) Connection configuration
 * Open the project configuration menu (`idf.py menuconfig`)
 * Configure Wi-Fi or Ethernet under "Example Connection Configuration" menu. See "Establishing Wi-Fi or Ethernet Connection" section in [examples/protocols/README.md](../../README.md) for more details.

--- a/examples/security/hmac_soft_jtag/README.md
+++ b/examples/security/hmac_soft_jtag/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # JTAG Re-enable Example

--- a/examples/security/nvs_encryption_hmac/README.md
+++ b/examples/security/nvs_encryption_hmac/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # NVS Encryption with HMAC-based encryption key protection scheme

--- a/examples/storage/sd_card/sdspi/README.md
+++ b/examples/storage/sd_card/sdspi/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # SD Card example (SDSPI)

--- a/examples/system/sysview_tracing/README.md
+++ b/examples/system/sysview_tracing/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 # Example: Application Level Tracing - SystemView Tracing (sysview_tracing)

 This test code shows how to perform system-wide behavioral analysis of the program using [SEGGER SystemView tool](https://www.segger.com/products/development-tools/systemview/).
--- a/examples/system/sysview_tracing_heap_log/README.md
+++ b/examples/system/sysview_tracing_heap_log/README.md
@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |

 # SystemView Heap and Log Tracing Example

--- a/examples/wifi/iperf/sdkconfig.defaults.esp32c5
+++ b/examples/wifi/iperf/sdkconfig.defaults.esp32c5
@ -40,5 +40,3 @@ CONFIG_LWIP_EXTRA_IRAM_OPTIMIZATION=y

 CONFIG_LWIP_TCPIP_CORE_LOCKING=y
 CONFIG_LWIP_TCPIP_CORE_LOCKING_INPUT=y
-
-CONFIG_IDF_TARGET_ESP32C5_BETA3_VERSION=y