feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feature/make_read_otadata_api_public' into 'master'

Browse Source 
feat: Made read_otadata() API public

Closes IDFGH-10345

See merge request espressif/esp-idf!24560
This commit is contained in:
Mahavir Jain
2023-07-06 22:23:16 +08:00
parent a6e2ea141a 941eb4e61e
commit ca6d4a571e
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/bootloader_support/include/bootloader_common.h
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2018-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -24,6 +24,19 @@ typedef enum {
ESP_IMAGE_APPLICATION ESP_IMAGE_APPLICATION
} esp_image_type; } esp_image_type;
/**
* @brief Read ota_info partition and fill array from two otadata structures.
*
* @param[in] ota_info It is a pointer to the OTA data partition.
* The "otadata" partition (Type = "data" and SubType = "ota")
* is defined in the CSV partition table.
* @param[out] two_otadata Pointer to array of OTA selection structure.
* @return - ESP_OK: On success
* - ESP_ERR_NOT_FOUND: Partition table does not have otadata partition
* - ESP_FAIL: On failure
*/
esp_err_t bootloader_common_read_otadata(const esp_partition_pos_t *ota_info, esp_ota_select_entry_t *two_otadata);
/** /**
* @brief Calculate crc for the OTA data select. * @brief Calculate crc for the OTA data select.
* *

5
components/bootloader_support/src/bootloader_utility.c
View File

@@ -100,8 +100,7 @@ static void set_cache_and_start_app(uint32_t drom_addr,
uint32_t irom_size, uint32_t irom_size,
uint32_t entry_addr); uint32_t entry_addr);
// Read ota_info partition and fill array from two otadata structures. esp_err_t bootloader_common_read_otadata(const esp_partition_pos_t *ota_info, esp_ota_select_entry_t *two_otadata)
static esp_err_t read_otadata(const esp_partition_pos_t *ota_info, esp_ota_select_entry_t *two_otadata)
{ {
const esp_ota_select_entry_t *ota_select_map; const esp_ota_select_entry_t *ota_select_map;
if (ota_info->offset == 0) { if (ota_info->offset == 0) {
@@ -361,7 +360,7 @@ int bootloader_utility_get_selected_boot_partition(const bootloader_state_t *bs)
return FACTORY_INDEX; return FACTORY_INDEX;
} }
if (read_otadata(&bs->ota_info, otadata) != ESP_OK) { if (bootloader_common_read_otadata(&bs->ota_info, otadata) != ESP_OK) {
return INVALID_INDEX; return INVALID_INDEX;
} }
ota_has_initial_contents = false; ota_has_initial_contents = false;