Merge branch 'bugfix/bootloader_warnings' into 'master'

bootloader:  minor fixes of warnings

See merge request espressif/esp-idf!18307
This commit is contained in:
Anton Maklakov
2022-05-31 13:36:01 +08:00
2 changed files with 5 additions and 1 deletions

View File

@@ -157,7 +157,11 @@ static void update_rtc_retain_mem_crc(void)
void bootloader_common_reset_rtc_retain_mem(void) void bootloader_common_reset_rtc_retain_mem(void)
{ {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#pragma GCC diagnostic ignored "-Warray-bounds"
memset(rtc_retain_mem, 0, sizeof(rtc_retain_mem_t)); memset(rtc_retain_mem, 0, sizeof(rtc_retain_mem_t));
#pragma GCC diagnostic pop
} }
uint16_t bootloader_common_get_rtc_retain_mem_reboot_counter(void) uint16_t bootloader_common_get_rtc_retain_mem_reboot_counter(void)

View File

@@ -478,7 +478,7 @@ void bootloader_utility_load_boot_image(const bootloader_state_t *bs, int start_
{ {
int index = start_index; int index = start_index;
esp_partition_pos_t part; esp_partition_pos_t part;
esp_image_metadata_t image_data; esp_image_metadata_t image_data = {0};
if (start_index == TEST_APP_INDEX) { if (start_index == TEST_APP_INDEX) {
if (check_anti_rollback(&bs->test) && try_load_partition(&bs->test, &image_data)) { if (check_anti_rollback(&bs->test) && try_load_partition(&bs->test, &image_data)) {