Ver Fonte

soc: Adds a soc_caps define for all chips to define the number of boot key digests

KonstantinKondrashov há 5 anos atrás
pai
commit
88c5fe49b8

+ 1 - 1
components/bootloader_support/src/esp32s2/secure_boot.c

@@ -260,7 +260,7 @@ static esp_err_t check_and_generate_secure_boot_keys(const esp_image_metadata_t
 
 esp_err_t esp_secure_boot_v2_permanently_enable(const esp_image_metadata_t *image_data)
 {
-    ESP_LOGI(TAG, "enabling secure boot v2 - ESP32-S2...");
+    ESP_LOGI(TAG, "enabling secure boot v2...");
 
     if (esp_secure_boot_enabled()) {
         ESP_LOGI(TAG, "secure boot v2 is already enabled, continuing..");

+ 1 - 1
components/bootloader_support/src/esp32s3/secure_boot.c

@@ -260,7 +260,7 @@ static esp_err_t check_and_generate_secure_boot_keys(const esp_image_metadata_t
 
 esp_err_t esp_secure_boot_v2_permanently_enable(const esp_image_metadata_t *image_data)
 {
-    ESP_LOGI(TAG, "enabling secure boot v2 - ESP32-S2...");
+    ESP_LOGI(TAG, "enabling secure boot v2...");
 
     if (esp_secure_boot_enabled()) {
         ESP_LOGI(TAG, "secure boot v2 is already enabled, continuing..");

+ 1 - 0
components/soc/esp32/include/soc/soc_caps.h

@@ -72,6 +72,7 @@
 #define SOC_ULP_SUPPORTED           1
 #define SOC_RTC_SLOW_MEM_SUPPORTED  1
 #define SOC_CCOMP_TIMER_SUPPORTED   1
+#define SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS 1
 
 /*-------------------------- ADC CAPS ----------------------------------------*/
 #define SOC_ADC_PERIPH_NUM              (2)

+ 1 - 0
components/soc/esp32s2/include/soc/soc_caps.h

@@ -48,6 +48,7 @@
 #define SOC_ULP_SUPPORTED               1
 #define SOC_RTC_SLOW_MEM_SUPPORTED      1
 #define SOC_CCOMP_TIMER_SUPPORTED       1
+#define SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS 3
 
 #define SOC_CACHE_SUPPORT_WRAP          1
 

+ 1 - 0
components/soc/esp32s3/include/soc/soc_caps.h

@@ -15,6 +15,7 @@
 #define SOC_ULP_SUPPORTED               1
 #define SOC_RTC_SLOW_MEM_SUPPORTED      1
 #define SOC_CCOMP_TIMER_SUPPORTED       1
+#define SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS 3
 
 
 /*-------------------------- ADC CAPS ----------------------------------------*/