diff --git a/components/esp_adc/Kconfig b/components/esp_adc/Kconfig
index 89f65f30c3..9c4ade3f9b 100644
--- a/components/esp_adc/Kconfig
+++ b/components/esp_adc/Kconfig
@@ -84,6 +84,4 @@ menu "ADC and ADC Calibration"
         help
             whether to enable the debug log message for ADC driver.
             Note that this option only controls the ADC driver log, will not affect other drivers.
-
-            note: This cannot be used in the ADC legacy driver.
 endmenu
diff --git a/components/esp_driver_cam/esp_cam_ctlr.c b/components/esp_driver_cam/esp_cam_ctlr.c
index eb9f78d329..c16113c4b1 100644
--- a/components/esp_driver_cam/esp_cam_ctlr.c
+++ b/components/esp_driver_cam/esp_cam_ctlr.c
@@ -69,7 +69,7 @@ esp_err_t esp_cam_ctlr_get_frame_buffer(esp_cam_ctlr_handle_t handle, uint32_t f
     ESP_RETURN_ON_FALSE(handle, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null handle");
     ESP_RETURN_ON_FALSE(handle->get_internal_buffer, ESP_ERR_NOT_SUPPORTED, TAG, "get buffer function not supported");
 
-    va_list args;
+    va_list args = {0};
     va_start(args, fb0);
     esp_err_t ret = handle->get_internal_buffer(handle, fb_num, fb0, args);
     va_end(args);
diff --git a/components/esp_driver_i2c/Kconfig b/components/esp_driver_i2c/Kconfig
index 7b7fc7d3d2..2dbf9a4186 100644
--- a/components/esp_driver_i2c/Kconfig
+++ b/components/esp_driver_i2c/Kconfig
@@ -16,8 +16,6 @@ menu "ESP-Driver:I2C Configurations"
             whether to enable the debug log message for I2C driver.
             Note that this option only controls the I2C driver log, will not affect other drivers.
 
-            note: This cannot be used in the I2C legacy driver.
-
     config I2C_MASTER_ISR_HANDLER_IN_IRAM
         bool "Place I2C master ISR handler into IRAM"
         default y
diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/CMakeLists.txt b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/CMakeLists.txt
index 95b3cd9e2f..0e9a56d166 100644
--- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/CMakeLists.txt
+++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/CMakeLists.txt
@@ -26,6 +26,6 @@ endif()
 # In order for the cases defined by `TEST_CASE` to be linked into the final elf,
 # the component can be registered as WHOLE_ARCHIVE
 idf_component_register(SRCS ${srcs}
-                       REQUIRES unity esp_driver_gpio esp_driver_gptimer
-                       REQUIRES esp_driver_uart test_utils efuse spi_flash esp_timer
+                       PRIV_REQUIRES unity esp_driver_gpio esp_driver_gptimer esp_driver_uart
+                                     test_utils efuse spi_flash esp_timer esp_hal_wdt
                        WHOLE_ARCHIVE)
diff --git a/components/hal/esp32/include/hal/uart_ll.h b/components/hal/esp32/include/hal/uart_ll.h
index 25b2284be3..b6b04ebb30 100644
--- a/components/hal/esp32/include/hal/uart_ll.h
+++ b/components/hal/esp32/include/hal/uart_ll.h
@@ -338,11 +338,12 @@ FORCE_INLINE_ATTR void uart_ll_read_rxfifo(uart_dev_t *hw, uint8_t *buf, uint32_
 {
     //Get the UART APB fifo addr. Read fifo, we use APB address
     uint32_t fifo_addr = (hw == &UART0) ? UART_FIFO_REG(0) : (hw == &UART1) ? UART_FIFO_REG(1) : UART_FIFO_REG(2);
-    for(uint32_t i = 0; i < rd_len; i++) {
+    for (uint32_t i = 0; i < rd_len; i++) {
         buf[i] = READ_PERI_REG(fifo_addr);
-#ifdef CONFIG_COMPILER_OPTIMIZATION_PERF
+        // workaround a hardware issue when CPU is @240MHz (especially when enable O2 optimization),
+        // always add a NOP instruction here to ensure the data is read correctly.
+        // UART FIFO read is not a performance critical part where 1 clock cycle matters.
         __asm__ __volatile__("nop");
-#endif
     }
 }
 
diff --git a/tools/ci/sg_rules/no_kconfig_in_hal_component.yml b/tools/ci/sg_rules/no_kconfig_in_hal_component.yml
index 19d8b20664..b505efbf43 100644
--- a/tools/ci/sg_rules/no_kconfig_in_hal_component.yml
+++ b/tools/ci/sg_rules/no_kconfig_in_hal_component.yml
@@ -15,7 +15,6 @@ ignores:
   # the following files should be refactored to remove Kconfig macros
   - "components/hal/twai_hal_v1.c"
   - "components/hal/esp32/include/hal/twai_ll.h"
-  - "components/hal/esp32/include/hal/uart_ll.h"
   - "components/hal/include/hal/twai_types_deprecated.h"
 rule:
   any: