[Telink] use corect key

s07641069 · Sep 19, 2024 · 6458df6 · 6458df6
1 parent 3f25f6b
commit 6458df6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt
@@ -195,7 +195,7 @@ if (CONFIG_BOOTLOADER_MCUBOOT)
     if (CONFIG_SOC_SERIES_RISCV_TELINK_W91)
         add_custom_target(sign_image ALL
             COMMAND
-            west sign -t imgtool -d ${PROJECT_BINARY_DIR}/.. -- --key ${PROJECT_BINARY_DIR}/mcuboot_key.pem # root-rsa-2048.pem
+            west sign -t imgtool -d ${PROJECT_BINARY_DIR}/.. -- --key ${ZEPHYR_BASE}/../${CONFIG_MCUBOOT_SIGNATURE_KEY_FILE}
         )
         add_dependencies(sign_image merge_n22)
         add_dependencies(merge_mcuboot sign_image)

diff --git a/config/telink/chip-module/Kconfig b/config/telink/chip-module/Kconfig
@@ -46,7 +46,7 @@ config BOOTLOADER_MCUBOOT
 	select IMG_MANAGER
 	select STREAM_FLASH
 	select STREAM_FLASH_ERASE
-	select TELINK_W91_MATTER_OTA_LAYOUT if BOARD_TLSR9118BDK40D
+	select TELINK_W91_N22_MATTER_OTA_LAYOUT if BOARD_TLSR9118BDK40D
 
 config CHIP_OTA_REQUESTOR_BUFFER_SIZE
 	int "OTA Requestor image buffer size"

diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
@@ -192,6 +192,10 @@ config DYNAMIC_INTERRUPTS
 config CHIP_OTA_REQUESTOR
     default y
 
+config MCUBOOT_SIGNATURE_KEY_FILE
+	default "bootloader/mcuboot/root-ec-p256.pem" if BOARD_TLSR9118BDK40D
+	depends on BOOTLOADER_MCUBOOT
+
 # In current config/zephyr/Kconfig
 # next deprecated values are selected
 # warning: Deprecated symbol CPLUSPLUS is enabled.