espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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

See merge request espressif/esp-idf!31453
This commit is contained in:
Jiang Jiang Jian
2024-06-13 17:41:59 +08:00
parent 02b60f59db cb8670e2bc
commit a70355be55
6 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_psram/CMakeLists.txt
View File

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

3
components/esp_system/CMakeLists.txt
View File

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

18
components/esp_system/port/image_process.c
View File

@@ -44,6 +44,24 @@
#define MMU_FLASH_MASK (~(CONFIG_MMU_PAGE_SIZE - 1)) #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"; const static char *TAG = "image_process";
static uint32_t s_current_read_mapping = UINT32_MAX; static uint32_t s_current_read_mapping = UINT32_MAX;

19
components/esp_system/port/include/private/esp_private/image_process.h
View File

@@ -10,7 +10,6 @@
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include "esp_err.h" #include "esp_err.h"
#include "esp_image_format.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -21,24 +20,6 @@ extern "C" {
*/ */
typedef struct image_process_driver_s image_process_driver_t; 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 * @brief Image process flow
* @note This API first reads the image header, then process the segments from the image header. * @note This API first reads the image header, then process the segments from the image header.

4
components/soc/esp32p4/include/soc/Kconfig.soc_caps.in
View File

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

2
components/soc/esp32p4/include/soc/soc_caps.h
View File

@@ -505,7 +505,7 @@
#define SOC_SPI_MEM_SUPPORT_IDLE_INTR (1) #define SOC_SPI_MEM_SUPPORT_IDLE_INTR (1)
#define SOC_SPI_MEM_SUPPORT_SW_SUSPEND (1) #define SOC_SPI_MEM_SUPPORT_SW_SUSPEND (1)
#define SOC_SPI_MEM_SUPPORT_CHECK_SUS (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_SPI_MEM_SUPPORT_TIMING_TUNING (1)
#define SOC_MEMSPI_TIMING_TUNING_BY_DQS (1) #define SOC_MEMSPI_TIMING_TUNING_BY_DQS (1)