Skip to content

Commit f7398c5

Browse files
Merge branch 'bugfix/esp32_c6_rev0_ecdsa_build' into 'master'
fix: Secure boot (ECDSA) build failure for C6 rev0 target Closes IDFGH-15184 See merge request espressif/esp-idf!38810
2 parents 4ea1fac + 6c0d5de commit f7398c5

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

components/bootloader_support/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ if(CONFIG_APP_BUILD_TYPE_APP_2NDBOOT)
6565
endif()
6666

6767
list(APPEND srcs "src/bootloader_sha.c")
68+
if(CONFIG_ESP_ROM_REV0_HAS_NO_ECDSA_INTERFACE)
69+
list(APPEND srcs "src/${IDF_TARGET}/bootloader_ecdsa.c")
70+
endif()
6871

6972
if(BOOTLOADER_BUILD OR CONFIG_APP_BUILD_TYPE_RAM)
7073
set(include_dirs "include" "bootloader_flash/include"
@@ -82,10 +85,6 @@ if(BOOTLOADER_BUILD OR CONFIG_APP_BUILD_TYPE_RAM)
8285
list(APPEND srcs "src/bootloader_utility_tee.c")
8386
endif()
8487
list(APPEND priv_requires hal)
85-
if(CONFIG_ESP_ROM_REV0_HAS_NO_ECDSA_INTERFACE)
86-
list(APPEND srcs
87-
"src/${IDF_TARGET}/bootloader_ecdsa.c")
88-
endif()
8988
else()
9089
set(include_dirs "include" "bootloader_flash/include")
9190
set(priv_include_dirs "private_include")

examples/system/efuse/sdkconfig.ci.virt_secure_boot_v2.esp32c6

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="test/partitions_efuse_emul.csv"
88

99
CONFIG_SECURE_BOOT=y
1010
CONFIG_SECURE_BOOT_V2_ENABLED=y
11-
CONFIG_SECURE_BOOT_SIGNING_KEY="test/secure_boot_signing_key.pem"
11+
CONFIG_SECURE_BOOT_V2_ECDSA_ENABLED=y
12+
CONFIG_SECURE_BOOT_SIGNING_KEY="test/secure_boot_signing_key_ecdsa_nistp256.pem"
1213
CONFIG_SECURE_INSECURE_ALLOW_DL_MODE=y
1314

1415
# IMPORTANT: ONLY VIRTUAL eFuse MODE!

0 commit comments

Comments
 (0)