From ad9230fb3486480d69a2b475e4fdd49c988b25a9 Mon Sep 17 00:00:00 2001 From: Mahavir Jain Date: Thu, 11 Nov 2021 15:25:04 +0530 Subject: [PATCH] spi_flash: minor cleanup, use type/subtype from esp_partition.h --- components/spi_flash/partition.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/spi_flash/partition.c b/components/spi_flash/partition.c index 9ac13ebe9d..4b6e492c7f 100644 --- a/components/spi_flash/partition.c +++ b/components/spi_flash/partition.c @@ -221,9 +221,9 @@ static esp_err_t load_partitions(void) if (!esp_flash_encryption_enabled()) { /* If flash encryption is not turned on, no partitions should be treated as encrypted */ item->info.encrypted = false; - } else if (entry.type == PART_TYPE_APP - || (entry.type == PART_TYPE_DATA && entry.subtype == PART_SUBTYPE_DATA_OTA) - || (entry.type == PART_TYPE_DATA && entry.subtype == PART_SUBTYPE_DATA_NVS_KEYS)) { + } else if (entry.type == ESP_PARTITION_TYPE_APP + || (entry.type == ESP_PARTITION_TYPE_DATA && entry.subtype == ESP_PARTITION_SUBTYPE_DATA_OTA) + || (entry.type == ESP_PARTITION_TYPE_DATA && entry.subtype == ESP_PARTITION_SUBTYPE_DATA_NVS_KEYS)) { /* If encryption is turned on, all app partitions and OTA data are always encrypted */ item->info.encrypted = true;