From 77807bfe6e256bddfceffbadbd6d68c0436e076f Mon Sep 17 00:00:00 2001 From: armando Date: Wed, 3 Jun 2026 15:12:24 +0800 Subject: [PATCH] fix(esp_mspi): remove not used cmake variable --- components/esp_hal_mspi/CMakeLists.txt | 6 +++++- .../esp_hal_mspi/esp32c2/include/hal/spimem_flash_ll.h | 3 +++ .../esp_hal_mspi/esp32c3/include/hal/spimem_flash_ll.h | 3 +++ .../esp_hal_mspi/esp32c5/include/hal/spimem_flash_ll.h | 3 +++ .../esp_hal_mspi/esp32c6/include/hal/spimem_flash_ll.h | 3 +++ .../esp_hal_mspi/esp32c61/include/hal/spimem_flash_ll.h | 3 +++ .../esp_hal_mspi/esp32h2/include/hal/spimem_flash_ll.h | 3 +++ .../esp_hal_mspi/esp32h21/include/hal/spimem_flash_ll.h | 3 +++ .../esp_hal_mspi/esp32h4/include/hal/spimem_flash_ll.h | 2 ++ .../esp_hal_mspi/esp32p4/include/hal/spimem_flash_ll.h | 3 +++ .../esp_hal_mspi/esp32s2/include/hal/spimem_flash_ll.h | 3 +++ .../esp_hal_mspi/esp32s3/include/hal/spimem_flash_ll.h | 3 +++ .../esp_hal_mspi/esp32s31/include/hal/spimem_flash_ll.h | 2 ++ components/esp_mspi/CMakeLists.txt | 8 -------- 14 files changed, 39 insertions(+), 9 deletions(-) diff --git a/components/esp_hal_mspi/CMakeLists.txt b/components/esp_hal_mspi/CMakeLists.txt index 720149c7850..876c13fff71 100644 --- a/components/esp_hal_mspi/CMakeLists.txt +++ b/components/esp_hal_mspi/CMakeLists.txt @@ -2,10 +2,14 @@ idf_build_get_property(target IDF_TARGET) idf_build_get_property(esp_tee_build ESP_TEE_BUILD) set(srcs) -set(includes "include" "${target}/include") +set(includes "include") set(requires soc hal esp_hal_gpspi) set(priv_requires esp_hal_gpio) +if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${target}/include") + list(APPEND includes "${target}/include") +endif() + if(NOT "${target}" STREQUAL "linux") # TODO: IDF-15106 remove esp_hal_clock dependency list(APPEND requires "esp_hal_clock") diff --git a/components/esp_hal_mspi/esp32c2/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32c2/include/hal/spimem_flash_ll.h index bef94d283f2..2722b402c84 100644 --- a/components/esp_hal_mspi/esp32c2/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32c2/include/hal/spimem_flash_ll.h @@ -58,6 +58,7 @@ static inline void spimem_flash_ll_reset(spi_mem_dev_t *dev) * * @return true if last command is done, otherwise false. */ +__attribute__((always_inline)) static inline bool spimem_flash_ll_cmd_is_done(const spi_mem_dev_t *dev) { return (dev->cmd.val == 0); @@ -325,6 +326,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -335,6 +337,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_hal_mspi/esp32c3/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32c3/include/hal/spimem_flash_ll.h index 9cc8dbe338a..c3a5dbd0e40 100644 --- a/components/esp_hal_mspi/esp32c3/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32c3/include/hal/spimem_flash_ll.h @@ -58,6 +58,7 @@ static inline void spimem_flash_ll_reset(spi_mem_dev_t *dev) * * @return true if last command is done, otherwise false. */ +__attribute__((always_inline)) static inline bool spimem_flash_ll_cmd_is_done(const spi_mem_dev_t *dev) { return (dev->cmd.val == 0); @@ -325,6 +326,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -335,6 +337,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_hal_mspi/esp32c5/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32c5/include/hal/spimem_flash_ll.h index 79bc29b2b0b..be7e8c75dcd 100644 --- a/components/esp_hal_mspi/esp32c5/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32c5/include/hal/spimem_flash_ll.h @@ -62,6 +62,7 @@ static inline void spimem_flash_ll_reset(spi_mem_dev_t *dev) * * @return true if last command is done, otherwise false. */ +__attribute__((always_inline)) static inline bool spimem_flash_ll_cmd_is_done(const spi_mem_dev_t *dev) { return (dev->cmd.val == 0); @@ -361,6 +362,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -371,6 +373,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_hal_mspi/esp32c6/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32c6/include/hal/spimem_flash_ll.h index 1a6484ffef2..bf731a91000 100644 --- a/components/esp_hal_mspi/esp32c6/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32c6/include/hal/spimem_flash_ll.h @@ -59,6 +59,7 @@ static inline void spimem_flash_ll_reset(spi_mem_dev_t *dev) * * @return true if last command is done, otherwise false. */ +__attribute__((always_inline)) static inline bool spimem_flash_ll_cmd_is_done(const spi_mem_dev_t *dev) { return (dev->cmd.val == 0); @@ -326,6 +327,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -336,6 +338,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_hal_mspi/esp32c61/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32c61/include/hal/spimem_flash_ll.h index 5cefa4373ef..023f0002546 100644 --- a/components/esp_hal_mspi/esp32c61/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32c61/include/hal/spimem_flash_ll.h @@ -62,6 +62,7 @@ static inline void spimem_flash_ll_reset(spi_mem_dev_t *dev) * * @return true if last command is done, otherwise false. */ +__attribute__((always_inline)) static inline bool spimem_flash_ll_cmd_is_done(const spi_mem_dev_t *dev) { return (dev->cmd.val == 0); @@ -356,6 +357,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -366,6 +368,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_hal_mspi/esp32h2/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32h2/include/hal/spimem_flash_ll.h index 21b15cfd555..c6450c3167a 100644 --- a/components/esp_hal_mspi/esp32h2/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32h2/include/hal/spimem_flash_ll.h @@ -60,6 +60,7 @@ static inline void spimem_flash_ll_reset(spi_mem_dev_t *dev) * * @return true if last command is done, otherwise false. */ +__attribute__((always_inline)) static inline bool spimem_flash_ll_cmd_is_done(const spi_mem_dev_t *dev) { return (dev->cmd.val == 0); @@ -327,6 +328,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -337,6 +339,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_hal_mspi/esp32h21/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32h21/include/hal/spimem_flash_ll.h index f86f80b06c2..48d500c0995 100644 --- a/components/esp_hal_mspi/esp32h21/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32h21/include/hal/spimem_flash_ll.h @@ -60,6 +60,7 @@ static inline void spimem_flash_ll_reset(spi_mem_dev_t *dev) * * @return true if last command is done, otherwise false. */ +__attribute__((always_inline)) static inline bool spimem_flash_ll_cmd_is_done(const spi_mem_dev_t *dev) { return (dev->cmd.val == 0); @@ -355,6 +356,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -365,6 +367,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_hal_mspi/esp32h4/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32h4/include/hal/spimem_flash_ll.h index 6ca2520d3e5..3be320d2adf 100644 --- a/components/esp_hal_mspi/esp32h4/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32h4/include/hal/spimem_flash_ll.h @@ -356,6 +356,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -366,6 +367,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_hal_mspi/esp32p4/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32p4/include/hal/spimem_flash_ll.h index 7a477033289..e18147d1c58 100644 --- a/components/esp_hal_mspi/esp32p4/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32p4/include/hal/spimem_flash_ll.h @@ -65,6 +65,7 @@ static inline void spimem_flash_ll_reset(spi_mem_dev_t *dev) * * @return true if last command is done, otherwise false. */ +__attribute__((always_inline)) static inline bool spimem_flash_ll_cmd_is_done(const spi_mem_dev_t *dev) { return (dev->cmd.val == 0); @@ -367,6 +368,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -377,6 +379,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_hal_mspi/esp32s2/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32s2/include/hal/spimem_flash_ll.h index 219791eb1d3..8719bf8996b 100644 --- a/components/esp_hal_mspi/esp32s2/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32s2/include/hal/spimem_flash_ll.h @@ -55,6 +55,7 @@ static inline void spimem_flash_ll_reset(spi_mem_dev_t *dev) * * @return true if last command is done, otherwise false. */ +__attribute__((always_inline)) static inline bool spimem_flash_ll_cmd_is_done(const spi_mem_dev_t *dev) { return (dev->cmd.val == 0); @@ -262,6 +263,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -272,6 +274,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_hal_mspi/esp32s3/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32s3/include/hal/spimem_flash_ll.h index e499ef166dc..3ec52a6c351 100644 --- a/components/esp_hal_mspi/esp32s3/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32s3/include/hal/spimem_flash_ll.h @@ -59,6 +59,7 @@ static inline void spimem_flash_ll_reset(spi_mem_dev_t *dev) * * @return true if last command is done, otherwise false. */ +__attribute__((always_inline)) static inline bool spimem_flash_ll_cmd_is_done(const spi_mem_dev_t *dev) { return (dev->cmd.val == 0); @@ -329,6 +330,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -339,6 +341,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_hal_mspi/esp32s31/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32s31/include/hal/spimem_flash_ll.h index a159d4294ef..0cb046a67cf 100644 --- a/components/esp_hal_mspi/esp32s31/include/hal/spimem_flash_ll.h +++ b/components/esp_hal_mspi/esp32s31/include/hal/spimem_flash_ll.h @@ -366,6 +366,7 @@ static inline void spimem_flash_ll_set_write_protect(spi_mem_dev_t *dev, bool wp * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_dp = 1; @@ -376,6 +377,7 @@ static inline void spimem_flash_ll_enter_dpd(spi_mem_dev_t *dev) * * @param dev Beginning address of the peripheral registers. */ +__attribute__((always_inline)) static inline void spimem_flash_ll_exit_dpd(spi_mem_dev_t *dev) { dev->cmd.flash_res = 1; diff --git a/components/esp_mspi/CMakeLists.txt b/components/esp_mspi/CMakeLists.txt index 6686a3b4826..653759501ee 100644 --- a/components/esp_mspi/CMakeLists.txt +++ b/components/esp_mspi/CMakeLists.txt @@ -83,14 +83,6 @@ idf_component_register(SRCS "${srcs}" INCLUDE_DIRS ${include_dirs} LDFRAGMENTS ${ldfragments}) -# Avoid cache miss by unexpected inlineing when built by -Os -set_source_files_properties(${cache_srcs} PROPERTIES COMPILE_FLAGS "-fno-inline-functions") -if(CMAKE_C_COMPILER_ID MATCHES "GNU") - # These flags are GCC specific - set_property(SOURCE ${cache_srcs} APPEND_STRING PROPERTY COMPILE_FLAGS - " -fno-inline-small-functions -fno-inline-functions-called-once") -endif() - if(NOT non_os_build AND NOT CONFIG_APP_BUILD_TYPE_PURE_RAM_APP) if(CONFIG_SPIRAM) # esp_mspi_get_io() queries esp_psram_io_get_cs_io() for the PSRAM CS pin