Skip to content

Commit d83e7ea

Browse files
committed
fix(esp_system): fixed not necessary public require to bootloader_support
1 parent 321f51d commit d83e7ea

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
lines changed

components/esp_psram/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ set(includes "include")
88

99
set(priv_requires heap spi_flash esp_mm)
1010
if(${target} STREQUAL "esp32")
11+
list(APPEND priv_requires bootloader_support)
1112
# [refactor-todo]: requires "driver" for `spicommon_periph_claim`
1213
list(APPEND priv_requires driver)
1314
endif()

components/esp_system/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ else()
6767
# [refactor-todo] requirements due to init code,
6868
# should be removable once using component init functions
6969
# link-time registration is used.
70-
esp_pm
71-
REQUIRES bootloader_support
70+
bootloader_support esp_pm
7271
LDFRAGMENTS "linker.lf" "app.lf")
7372
add_subdirectory(port)
7473

components/esp_system/port/image_process.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,24 @@
4444

4545
#define MMU_FLASH_MASK (~(CONFIG_MMU_PAGE_SIZE - 1))
4646

47+
/**
48+
* @brief Image process driver
49+
*/
50+
struct image_process_driver_s {
51+
52+
/**
53+
* @brief Process segments
54+
*
55+
* @param[in] data image meta data
56+
*
57+
* @return
58+
* - ESP_OK
59+
* - ESP_ERR_INVALID_ARG: invalid argument
60+
* - ESP_ERR_INVALID_STATE: invalid state
61+
*/
62+
esp_err_t (*process_segments)(esp_image_metadata_t *data);
63+
};
64+
4765
const static char *TAG = "image_process";
4866

4967
static uint32_t s_current_read_mapping = UINT32_MAX;

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <stddef.h>
1111
#include <string.h>
1212
#include "esp_err.h"
13-
#include "esp_image_format.h"
1413

1514
#ifdef __cplusplus
1615
extern "C" {
@@ -21,24 +20,6 @@ extern "C" {
2120
*/
2221
typedef struct image_process_driver_s image_process_driver_t;
2322

24-
/**
25-
* @brief Image process driver
26-
*/
27-
struct image_process_driver_s {
28-
29-
/**
30-
* @brief Process segments
31-
*
32-
* @param[in] data image meta data
33-
*
34-
* @return
35-
* - ESP_OK
36-
* - ESP_ERR_INVALID_ARG: invalid argument
37-
* - ESP_ERR_INVALID_STATE: invalid state
38-
*/
39-
esp_err_t (*process_segments)(esp_image_metadata_t *data);
40-
};
41-
4223
/**
4324
* @brief Image process flow
4425
* @note This API first reads the image header, then process the segments from the image header.

0 commit comments

Comments
 (0)