From b0433601a5e59f4889fa82215f5a85906d95877a Mon Sep 17 00:00:00 2001 From: Mateusz Michalek Date: Wed, 7 Aug 2024 09:49:48 +0200 Subject: [PATCH] Kconfigs: adjust selection of NRFX_NVMC NRFX_NVMC is being selected conditionally as it is not the one and only memory backend anymore. Signed-off-by: Mateusz Michalek --- lib/hw_unique_key/Kconfig | 4 ++-- samples/bootloader/prj.conf | 1 - samples/bootloader/prj_minimal.conf | 1 - subsys/bootloader/Kconfig | 2 +- subsys/fw_info/Kconfig | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/hw_unique_key/Kconfig b/lib/hw_unique_key/Kconfig index b739b0094ba5..6b394572cd55 100644 --- a/lib/hw_unique_key/Kconfig +++ b/lib/hw_unique_key/Kconfig @@ -18,7 +18,7 @@ config HW_UNIQUE_KEY_LOAD depends on HAS_HW_NRF_CC310 depends on NRF_CC3XX_PLATFORM select FPROTECT - imply NRFX_NVMC + imply NRFX_NVMC if !SOC_SERIES_NRF54LX help Use this on devices with no KMU. Enable this in the immutable bootloader to load the HUK from the allocated flash area @@ -46,7 +46,7 @@ config HW_UNIQUE_KEY select PSA_WANT_ALG_GCM if CRACEN_HW_PRESENT select PSA_NEED_CRACEN_KMU_DRIVER if CRACEN_HW_PRESENT select FPROTECT if HAS_HW_NRF_ACL - imply NRFX_NVMC if HAS_HW_NRF_ACL + imply NRFX_NVMC if !SOC_SERIES_NRF54LX default y if BUILD_WITH_TFM help This option will load the Hardware Unique Key (HUK) in the KDR diff --git a/samples/bootloader/prj.conf b/samples/bootloader/prj.conf index dc6d126db27c..5ccb6b3f2089 100644 --- a/samples/bootloader/prj.conf +++ b/samples/bootloader/prj.conf @@ -22,7 +22,6 @@ CONFIG_BL_SHA256_EXT_API_ENABLED=y CONFIG_BL_SECP256R1_EXT_API_ENABLED=y CONFIG_BL_VALIDATE_FW_EXT_API_ENABLED=y CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=y -CONFIG_NRFX_NVMC=y CONFIG_MAIN_STACK_SIZE=2048 CONFIG_TIMEOUT_64BIT=n diff --git a/samples/bootloader/prj_minimal.conf b/samples/bootloader/prj_minimal.conf index 596a3e30390b..d730de7021e6 100644 --- a/samples/bootloader/prj_minimal.conf +++ b/samples/bootloader/prj_minimal.conf @@ -13,7 +13,6 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=y CONFIG_FPROTECT=y CONFIG_FW_INFO=y CONFIG_IS_SECURE_BOOTLOADER=y -CONFIG_NRFX_NVMC=y CONFIG_SECURE_BOOT_CRYPTO=y CONFIG_SECURE_BOOT_STORAGE=y CONFIG_SECURE_BOOT_VALIDATION=y diff --git a/subsys/bootloader/Kconfig b/subsys/bootloader/Kconfig index 97e33c10dc8e..bb88edc8618a 100644 --- a/subsys/bootloader/Kconfig +++ b/subsys/bootloader/Kconfig @@ -198,7 +198,7 @@ menuconfig IS_SECURE_BOOTLOADER select SECURE_BOOT_VALIDATION select SECURE_BOOT_STORAGE select SW_VECTOR_RELAY if SOC_SERIES_NRF51X - imply NRFX_NVMC + imply NRFX_NVMC if !SOC_SERIES_NRF54LX help This option is set by the first stage bootloader app to include all files and set all the options required. diff --git a/subsys/fw_info/Kconfig b/subsys/fw_info/Kconfig index 77094651daf0..8fe17b4fd746 100644 --- a/subsys/fw_info/Kconfig +++ b/subsys/fw_info/Kconfig @@ -7,7 +7,7 @@ menuconfig FW_INFO bool prompt "Firmware Metadata" - imply NRFX_NVMC + imply NRFX_NVMC if !SOC_SERIES_NRF54LX if (FW_INFO)