Release/v5.4

components/app_trace/port/port_uart.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -288,10 +288,9 @@ static esp_err_t esp_apptrace_uart_up_buffer_put(esp_apptrace_uart_data_t *hw_da
 
 static void esp_apptrace_uart_down_buffer_config(esp_apptrace_uart_data_t *hw_data, uint8_t *buf, uint32_t size)
 {
-    hw_data->down_buffer = (uint8_t *)malloc(size);
-    if (hw_data->down_buffer == NULL){
-        assert(false && "Failed to allocate apptrace uart down buffer!");
-    }
+    assert(buf != NULL && "Down buffer cannot be NULL");
+
+    hw_data->down_buffer = buf;
     hw_data->down_buffer_size = size;
 }
 

components/bootloader_support/src/bootloader_console.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -10,7 +10,6 @@
 #include "soc/uart_periph.h"
 #include "soc/uart_channel.h"
 #include "soc/io_mux_reg.h"
-#include "soc/gpio_periph.h"
 #include "soc/gpio_sig_map.h"
 #include "soc/rtc.h"
 #include "hal/gpio_ll.h"
@@ -26,9 +25,21 @@
 #include "esp_rom_sys.h"
 #include "esp_rom_caps.h"
 
+static void __attribute__((unused)) release_default_console_io(void)
+{
+    // Default console is UART0 with TX and RX on their IOMUX pins
+    gpio_ll_output_disable(&GPIO, UART_NUM_0_TXD_DIRECT_GPIO_NUM);
+    gpio_ll_func_sel(&GPIO, U0TXD_GPIO_NUM, PIN_FUNC_GPIO); // Set TX pin to GPIO function to truly disable output
+    esp_rom_gpio_connect_in_signal(GPIO_MATRIX_CONST_ONE_INPUT, UART_PERIPH_SIGNAL(UART_NUM_0, SOC_UART_RX_PIN_IDX), 0);
+}
+
 #ifdef CONFIG_ESP_CONSOLE_NONE
 void bootloader_console_init(void)
 {
+    // Wait for UART FIFO to be empty.
+    esp_rom_output_tx_wait_idle(0);
+    release_default_console_io();
+
     esp_rom_install_channel_putc(1, NULL);
     esp_rom_install_channel_putc(2, NULL);
 }
@@ -59,9 +70,7 @@ void bootloader_console_init(void)
     if (uart_num != 0 ||
             uart_tx_gpio != UART_NUM_0_TXD_DIRECT_GPIO_NUM ||
             uart_rx_gpio != UART_NUM_0_RXD_DIRECT_GPIO_NUM) {
-        // Change default UART pins back to GPIOs
-        gpio_ll_func_sel(&GPIO, UART_NUM_0_RXD_DIRECT_GPIO_NUM, PIN_FUNC_GPIO);
-        gpio_ll_func_sel(&GPIO, UART_NUM_0_TXD_DIRECT_GPIO_NUM, PIN_FUNC_GPIO);
+        release_default_console_io();
         // Route GPIO signals to/from pins
         const uint32_t tx_idx = UART_PERIPH_SIGNAL(uart_num, SOC_UART_TX_PIN_IDX);
         const uint32_t rx_idx = UART_PERIPH_SIGNAL(uart_num, SOC_UART_RX_PIN_IDX);
@@ -101,6 +110,10 @@ static char s_usb_cdc_buf[ESP_ROM_CDC_ACM_WORK_BUF_MIN];
 
 void bootloader_console_init(void)
 {
+    // Wait for UART FIFO to be empty.
+    esp_rom_output_tx_wait_idle(0);
+    release_default_console_io();
+
 #ifdef CONFIG_IDF_TARGET_ESP32S2
     /* ESP32-S2 specific patch to set the correct serial number in the descriptor.
      * Later chips don't need this.
@@ -120,6 +133,10 @@ void bootloader_console_init(void)
 #ifdef CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
 void bootloader_console_init(void)
 {
+    // Wait for UART FIFO to be empty.
+    esp_rom_output_tx_wait_idle(0);
+    release_default_console_io();
+
     esp_rom_output_switch_buffer(ESP_ROM_USB_SERIAL_DEVICE_NUM);
 
     /* Switch console channel to avoid output on UART and allow  */

components/bt/CMakeLists.txt

@@ -616,19 +616,17 @@ if(CONFIG_BT_ENABLED)
                         "esp_ble_mesh/v1.1/btc/btc_ble_mesh_sar_model.c"
                         "esp_ble_mesh/v1.1/btc/btc_ble_mesh_srpl_model.c"
                         "esp_ble_mesh/lib/ext.c")
+
             if(CONFIG_BLE_MESH_SAR_ENHANCEMENT)
                 list(APPEND srcs "esp_ble_mesh/core/transport.enh.c")
             else()
                 list(APPEND srcs "esp_ble_mesh/core/transport.c")
             endif()
         else()
-            list(APPEND srcs
-                        "esp_ble_mesh/core/transport.c")
+            list(APPEND srcs "esp_ble_mesh/core/transport.c")
         endif()
     endif()
 
-
-
     if(CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT)
         list(APPEND srcs
                 "porting/npl/freertos/src/npl_os_freertos.c"
@@ -935,7 +933,7 @@ set(bt_priv_requires
 )
 
 if(CONFIG_BLE_COMPRESSED_LOG_ENABLE)
-    set(BT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+    set(CODE_BASE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
     # When log compression is enabled, selected logs are replaced
     # by auto-generated macros that emit pre-encoded data.
     # This eliminates the original format strings, reducing firmware size and

components/bt/common/ble_log/Kconfig.in

@@ -7,6 +7,8 @@ config BLE_LOG_ENABLED
 if BLE_LOG_ENABLED
     config BLE_LOG_TASK_STACK_SIZE
         int "Stack size for BLE Log Task"
+        default 1024 if IDF_TARGET_ARCH_RISCV
+        default 2048 if IDF_TARGET_ARCH_XTENSA
         default 1024
         help
             Stack size for BLE Log Task

components/bt/common/ble_log/ble_log_spi_out.c

@@ -41,7 +41,14 @@
 #define SPI_OUT_LOG_STR_BUF_SIZE                (100)
 #define SPI_OUT_MALLOC(size)                    heap_caps_malloc(size, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT)
 #define SPI_OUT_TASK_PRIORITY                   (ESP_TASK_PRIO_MAX - 1)
+
+#if CONFIG_IDF_TARGET_ARCH_RISCV
 #define SPI_OUT_TASK_STACK_SIZE                 (1024)
+#elif CONFIG_IDF_TARGET_ARCH_XTENSA
+#define SPI_OUT_TASK_STACK_SIZE                 (2048)
+#else
+static_assert(false, "BLE Log SPI Out: Unsupported target architecture");
+#endif /* CONFIG_IDF_TARGET_ARCH_RISCV */
 
 #if SPI_OUT_TS_SYNC_ENABLED
 #define SPI_OUT_TS_SYNC_TIMEOUT_MS              (1000)

components/bt/common/ble_log/extension/log_compression/CMakeLists.txt

@@ -1,6 +1,6 @@
-
 set(LOG_COMPRESSED_MODULE "")
 set(LOG_COMPRESSED_MODULE_CODE_PATH "")
+set(BT_ROOT_PATH $ENV{IDF_PATH}/components/bt)
 set(LOG_COMPRESSED_SRCS_DIR "${CMAKE_BINARY_DIR}/ble_log/.compressed_srcs")
 
 # default config value for ble mesh module
@@ -17,32 +17,62 @@ set(BLE_HOST_TAGS_PRESERVE "")
 
 if(CONFIG_BLE_MESH_COMPRESSED_LOG_ENABLE)
     list(APPEND LOG_COMPRESSED_MODULE "BLE_MESH")
-    if(NOT EXISTS "${CMAKE_BINARY_DIR}/ble_log/include/mesh_log_index.h")
-        file(WRITE "${CMAKE_BINARY_DIR}/ble_log/include/mesh_log_index.h" "")
-    endif()
-    list(APPEND LOG_COMPRESSED_MODULE_CODE_PATH "esp_ble_mesh")
 
     # update config file
     set(BLE_MESH_CODE_PATH "esp_ble_mesh")
     set(BLE_MESH_LOG_INDEX_HEADER "mesh_log_index.h")
+    set(BLE_MESH_LOG_SCRIPT_PATH
+        "${CMAKE_CURRENT_LIST_DIR}/scripts/module_scripts/ble_mesh/make_mesh_log_macro.py")
     # update BLE_MESH_TAGS and BLE_MESH_TAGS_PRESERVE
     include(${CMAKE_CURRENT_LIST_DIR}/cmake/ble_mesh_log_tags.cmake)
-
+    if(NOT EXISTS "${CMAKE_BINARY_DIR}/ble_log/include/${BLE_MESH_LOG_INDEX_HEADER}")
+        file(WRITE "${CMAKE_BINARY_DIR}/ble_log/include/${BLE_MESH_LOG_INDEX_HEADER}" "")
+    endif()
+    list(APPEND LOG_COMPRESSED_MODULE_CODE_PATH ${BLE_MESH_CODE_PATH})
 endif()
+
 if(CONFIG_BLE_HOST_COMPRESSED_LOG_ENABLE AND CONFIG_BT_BLUEDROID_ENABLED)
     list(APPEND LOG_COMPRESSED_MODULE "BLE_HOST")
-    list(APPEND LOG_COMPRESSED_MODULE_CODE_PATH "host/bluedroid/stack")
-    if(NOT EXISTS "${CMAKE_BINARY_DIR}/ble_log/include/host_log_index.h")
-        file(WRITE "${CMAKE_BINARY_DIR}/ble_log/include/host_log_index.h" "")
-    endif()
 
+    # update config file
     set(HOST_CODE_PATH "host/bluedroid/stack")
     set(HOST_LOG_INDEX_HEADER "host_log_index.h")
+    set(BLE_HOST_LOG_SCRIPT_PATH
+        "${CMAKE_CURRENT_LIST_DIR}/scripts/module_scripts/bluedroid/make_bluedroid_log_macro.py")
+
     include(${CMAKE_CURRENT_LIST_DIR}/cmake/ble_host_bluedroid_tags.cmake)
+    if(NOT EXISTS "${CMAKE_BINARY_DIR}/ble_log/include/${HOST_LOG_INDEX_HEADER}")
+        file(WRITE "${CMAKE_BINARY_DIR}/ble_log/include/${HOST_LOG_INDEX_HEADER}" "")
+    endif()
+    list(APPEND LOG_COMPRESSED_MODULE_CODE_PATH ${HOST_CODE_PATH})
+endif()
+
+if(BLE_COMPRESSED_LIB_LOG_BUILD)
+    if(NOT (BLE_COMPRESSED_LIB_NAME AND BLE_COMPRESSED_LIB_CODE_DIR AND BLE_COMPRESSED_LIB_LOG_TAGS))
+        message(FATAL_ERROR "Invalid settings")
+    else()
+        message("Building compressed log for ${BLE_COMPRESSED_LIB_NAME}")
+    endif()
+    list(APPEND LOG_COMPRESSED_MODULE ${BLE_COMPRESSED_LIB_NAME})
+    if(NOT EXISTS "${CMAKE_BINARY_DIR}/ble_log/include/${BLE_COMPRESSED_LIB_LOG_INDEX_HEADER}")
+        file(WRITE "${CMAKE_BINARY_DIR}/ble_log/include/${BLE_COMPRESSED_LIB_LOG_INDEX_HEADER}" "")
+    endif()
+    list(APPEND LOG_COMPRESSED_MODULE_CODE_PATH ${BLE_COMPRESSED_LIB_CODE_DIR})
+
+    string(REPLACE ";" "," BLE_COMPRESSED_LIB_CODE_DIR "${BLE_COMPRESSED_LIB_CODE_DIR}")
+    string(REPLACE ";" "," BLE_COMPRESSED_LIB_LOG_TAGS "${BLE_COMPRESSED_LIB_LOG_TAGS}")
+    string(REPLACE ";" "," BLE_COMPRESSED_LIB_LOG_TAGS_PRESERVE "${BLE_COMPRESSED_LIB_LOG_TAGS_PRESERVE}")
+else()
+    set(BLE_COMPRESSED_LIB_NAME "placeholder")
 endif()
+
+
 if(LOG_COMPRESSED_MODULE)
-    list(APPEND srcs "common/ble_log/extension/log_compression/ble_log_compression.c")
-    list(APPEND include_dirs "${CMAKE_BINARY_DIR}/ble_log/include")
+    # When building the library, ble_log_compression.c and its dependencies are not needed
+    if(NOT BLE_COMPRESSED_LIB_LOG_BUILD)
+        list(APPEND srcs "common/ble_log/extension/log_compression/ble_log_compression.c")
+        list(APPEND include_dirs "${CMAKE_BINARY_DIR}/ble_log/include")
+    endif()
     if(NOT CMAKE_VERSION VERSION_LESS 3.15.0)
         set(Python3_FIND_STRATEGY LOCATION)
         find_package(Python3 COMPONENTS Interpreter)
@@ -111,19 +141,39 @@ if(LOG_COMPRESSED_MODULE)
                 "host/nimble/nimble/nimble/host/store/config/src")
         endif()
 
-        add_custom_target(ble_log_compression ALL
-            COMMAND ${BLE_PYTHON_EXECUTABLE} ${PYTHON_SCRIPT}
-                compress
-                --compressed_srcs_path "${LOG_COMPRESSED_SRCS_DIR}"
-                --build_path "${CMAKE_BINARY_DIR}"
-                --module "'${LOG_COMPRESSED_MODULE}'"
-                --bt_path "${BT_ROOT_PATH}"
-                --srcs "'${compressed_srcs}'"
-            DEPENDS ${compressed_srcs_with_abs_path} ${PYTHON_SCRIPT}
-            COMMENT "Log compression is being performed, please wait..."
-            WORKING_DIRECTORY ${BT_ROOT_PATH}
-            USES_TERMINAL
-        )
+        if(BLE_COMPRESSED_LIB_LOG_BUILD)
+            execute_process(COMMAND ${BLE_PYTHON_EXECUTABLE} ${PYTHON_SCRIPT}
+                                compress
+                                --compressed_srcs_path "${LOG_COMPRESSED_SRCS_DIR}"
+                                --build_path "${CMAKE_BINARY_DIR}"
+                                --module "${LOG_COMPRESSED_MODULE}"
+                                --code_base_path "${CODE_BASE_PATH}"
+                                --srcs "${compressed_srcs}"
+                                RESULT_VARIABLE result
+                                OUTPUT_VARIABLE   out
+                                ERROR_VARIABLE    err)
+            if(NOT ${result} EQUAL 0)
+                message(WARNING "${err}")
+                message(WARNING "Exit this log compression due to failure of compression")
+                set(LOG_COMPRESS_INCLUDE_DIRS ${include_dirs} PARENT_SCOPE)
+                set(LOG_COMPRESSION_TARGET "" PARENT_SCOPE)
+                return()
+            endif()
+        else()
+            add_custom_target(ble_log_compression ALL
+                COMMAND ${BLE_PYTHON_EXECUTABLE} ${PYTHON_SCRIPT}
+                    compress
+                    --compressed_srcs_path "${LOG_COMPRESSED_SRCS_DIR}"
+                    --build_path "${CMAKE_BINARY_DIR}"
+                    --module "'${LOG_COMPRESSED_MODULE}'"
+                    --code_base_path "${CODE_BASE_PATH}"
+                    --srcs "'${compressed_srcs}'"
+                DEPENDS ${compressed_srcs_with_abs_path} ${PYTHON_SCRIPT}
+                COMMENT "Log compression is being performed, please wait..."
+                WORKING_DIRECTORY ${BT_ROOT_PATH}
+                USES_TERMINAL
+            )
+        endif()
 
         function(add_flags_if_in_list file file_list compile_flags)
             set(PROCESSED OFF PARENT_SCOPE)
@@ -190,7 +240,10 @@ if(LOG_COMPRESSED_MODULE)
         set(LOG_COMPRESSION_TARGET ble_log_compression PARENT_SCOPE)
         # set(LOG_COMPRESSION_TARGET "" PARENT_SCOPE)
         set(LOG_COMPRESS_SRCS "${compressed_srcs_with_abs_path};${uncompressed_srcs}" PARENT_SCOPE)
-        list(APPEND include_dirs "common/ble_log/extension/log_compression/include")
+        if(NOT BLE_COMPRESSED_LIB_LOG_BUILD)
+            list(APPEND include_dirs "common/ble_log/extension/log_compression/include")
+        endif()
+        list(APPEND include_dirs "${CMAKE_BINARY_DIR}/ble_log/include")
         set(LOG_COMPRESS_INCLUDE_DIRS ${include_dirs} PARENT_SCOPE)
     else()
         set(LOG_COMPRESSION_TARGET "" PARENT_SCOPE)