Merge branch 'fix/fix_not_necessary_public_require_from_esp_system_to_btld_support_v5.3' into 'release/v5.3'

esp_system: fixed not necessary public require to bootloader_support (v5.3)

See merge request espressif/esp-idf!31453

components/esp_psram/CMakeLists.txt

@@ -8,6 +8,7 @@ set(includes "include")
 
 set(priv_requires heap spi_flash esp_mm)
 if(${target} STREQUAL "esp32")
+    list(APPEND priv_requires bootloader_support)
     # [refactor-todo]: requires "driver" for `spicommon_periph_claim`
     list(APPEND priv_requires driver)
 endif()

components/esp_system/CMakeLists.txt

@@ -67,8 +67,7 @@ else()
                                     # [refactor-todo] requirements due to init code,
                                     # should be removable once using component init functions
                                     # link-time registration is used.
-                                    esp_pm
-                        REQUIRES    bootloader_support
+                                    bootloader_support esp_pm
                         LDFRAGMENTS "linker.lf" "app.lf")
     add_subdirectory(port)
 

components/esp_system/port/image_process.c

@@ -44,6 +44,24 @@
 
 #define MMU_FLASH_MASK    (~(CONFIG_MMU_PAGE_SIZE - 1))
 
+/**
+ * @brief Image process driver
+ */
+struct image_process_driver_s {
+
+    /**
+     * @brief Process segments
+     *
+     * @param[in] data  image meta data
+     *
+     * @return
+     *        - ESP_OK
+     *        - ESP_ERR_INVALID_ARG:   invalid argument
+     *        - ESP_ERR_INVALID_STATE: invalid state
+     */
+    esp_err_t (*process_segments)(esp_image_metadata_t *data);
+};
+
 const static char *TAG = "image_process";
 
 static uint32_t s_current_read_mapping = UINT32_MAX;

components/esp_system/port/include/private/esp_private/image_process.h

@@ -10,7 +10,6 @@
 #include <stddef.h>
 #include <string.h>
 #include "esp_err.h"
-#include "esp_image_format.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -21,24 +20,6 @@ extern "C" {
  */
 typedef struct image_process_driver_s image_process_driver_t;
 
-/**
- * @brief Image process driver
- */
-struct image_process_driver_s {
-
-    /**
-     * @brief Process segments
-     *
-     * @param[in] data  image meta data
-     *
-     * @return
-     *        - ESP_OK
-     *        - ESP_ERR_INVALID_ARG:   invalid argument
-     *        - ESP_ERR_INVALID_STATE: invalid state
-     */
-    esp_err_t (*process_segments)(esp_image_metadata_t *data);
-};
-
 /**
  * @brief Image process flow
  * @note This API first reads the image header, then process the segments from the image header.

components/soc/esp32p4/include/soc/Kconfig.soc_caps.in

@@ -1263,10 +1263,6 @@ config SOC_SPI_MEM_SUPPORT_CHECK_SUS
     bool
     default y
 
-config SOC_SPI_MEM_SUPPORT_WRAP
-    bool
-    default y
-
 config SOC_SPI_MEM_SUPPORT_TIMING_TUNING
     bool
     default y

components/soc/esp32p4/include/soc/soc_caps.h

@@ -505,7 +505,7 @@
 #define SOC_SPI_MEM_SUPPORT_IDLE_INTR                     (1)
 #define SOC_SPI_MEM_SUPPORT_SW_SUSPEND                    (1)
 #define SOC_SPI_MEM_SUPPORT_CHECK_SUS                     (1)
-#define SOC_SPI_MEM_SUPPORT_WRAP                          (1)
+// #define SOC_SPI_MEM_SUPPORT_WRAP                          (1)  //TODO: IDFCI-2073
 #define SOC_SPI_MEM_SUPPORT_TIMING_TUNING                 (1)
 #define SOC_MEMSPI_TIMING_TUNING_BY_DQS                   (1)