From 1852417f37fc741b2f246567833ebc312ac00260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=98ye=20Amundsen?= Date: Fri, 12 Nov 2021 08:21:31 +0000 Subject: [PATCH] [nrf fromtree] kconfig: add name to choice option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 21f0376faa3d14dea6a193723698fba70f8bef64 Facilitate extending the kconfig definition by adding names to all choices. Signed-off-by: Håkon Øye Amundsen --- boot/zephyr/Kconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/boot/zephyr/Kconfig b/boot/zephyr/Kconfig index c8dcaa8dc..dce4b05bc 100644 --- a/boot/zephyr/Kconfig +++ b/boot/zephyr/Kconfig @@ -97,7 +97,7 @@ config SINGLE_APPLICATION_SLOT uploading a new application overwrites the one that previously occupied the area. -choice +choice BOOT_SIGNATURE_TYPE prompt "Signature type" default BOOT_SIGNATURE_TYPE_ECDSA_P256 if HAS_HW_NRF_CC310 && !BOARD_THINGY91_NRF9160 && !BOARD_THINGY91_NRF52840 default BOOT_SIGNATURE_TYPE_RSA @@ -122,7 +122,7 @@ config BOOT_SIGNATURE_TYPE_ECDSA_P256 bool "Elliptic curve digital signatures with curve P-256" if BOOT_SIGNATURE_TYPE_ECDSA_P256 -choice +choice BOOT_ECDSA_IMPLEMENTATION prompt "Ecdsa implementation" default BOOT_NRF_EXTERNAL_CRYPTO if SECURE_BOOT default BOOT_ECDSA_CC310 if HAS_HW_NRF_CC310 @@ -152,7 +152,7 @@ config BOOT_SIGNATURE_TYPE_ED25519 bool "Edwards curve digital signatures using ed25519" if BOOT_SIGNATURE_TYPE_ED25519 -choice +choice BOOT_ED25519_IMPLEMENTATION prompt "Ecdsa implementation" default BOOT_ED25519_TINYCRYPT config BOOT_ED25519_TINYCRYPT @@ -228,7 +228,7 @@ config BOOT_VALIDATE_SLOT0 able to modify the flash image itself. if !SINGLE_APPLICATION_SLOT -choice +choice BOOT_IMAGE_UPGRADE_MODE prompt "Image upgrade modes" default BOOT_SWAP_USING_MOVE if SOC_FAMILY_NRF default BOOT_SWAP_USING_SCRATCH @@ -362,7 +362,7 @@ config BOOT_SHARE_DATA bool "Save application specific data in shared memory area" default n -choice +choice BOOT_FAULT_INJECTION_HARDENING_PROFILE prompt "Fault injection hardening profile" default BOOT_FIH_PROFILE_OFF @@ -519,7 +519,7 @@ menuconfig MCUBOOT_SERIAL if MCUBOOT_SERIAL -choice +choice BOOT_SERIAL_DEVICE prompt "Serial device" default BOOT_SERIAL_UART if !BOARD_NRF52840DONGLE_NRF52840 default BOOT_SERIAL_CDC_ACM if BOARD_NRF52840DONGLE_NRF52840 @@ -648,7 +648,7 @@ config UPDATEABLE_IMAGE_NUMBER help Enables support of multi image update. -choice +choice BOOT_DOWNGRADE_PREVENTION_CHOICE prompt "Downgrade prevention" optional