From 0a252a985d6a5bb1e5fc3a93b19613e2c648b71a Mon Sep 17 00:00:00 2001 From: Sudeep Mohanty Date: Thu, 20 Aug 2026 14:01:19 +0200 Subject: [PATCH] fix(esp_hw_support): Exclude MSPI alignment helper from bootloader esp_mspi_align.c resolves PSRAM encryption state through esp_psram, a dependency esp_hw_support declares only outside the no-OS builds. Nothing in the bootloader calls the helper, so drop the source there rather than keep one whose dependency cannot be satisfied. ESP-TEE still builds it, as its mbedtls port calls into it. --- components/esp_hw_support/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/esp_hw_support/CMakeLists.txt b/components/esp_hw_support/CMakeLists.txt index fb96b522ace..9d1ee3c04d4 100644 --- a/components/esp_hw_support/CMakeLists.txt +++ b/components/esp_hw_support/CMakeLists.txt @@ -53,8 +53,10 @@ set(priv_requires efuse # only esp_hw_support/adc_share_hw_ctrl. esp_hal_ana_conv # sleep process requires backup/restore some ADC, TSENS registers ) -set(srcs "cpu.c" "port/${IDF_TARGET}/esp_cpu_intr.c" "esp_memory_utils.c" "port/${IDF_TARGET}/cpu_region_protect.c" - "mspi/esp_mspi_align/esp_mspi_align.c") +set(srcs "cpu.c" "port/${IDF_TARGET}/esp_cpu_intr.c" "esp_memory_utils.c" "port/${IDF_TARGET}/cpu_region_protect.c") +if(NOT BOOTLOADER_BUILD) + list(APPEND srcs "mspi/esp_mspi_align/esp_mspi_align.c") +endif() if(NOT non_os_build) list(APPEND srcs "esp_clk.c" "clk_ctrl_os.c"