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 <[email protected]>
nrfconnect · Nov 4, 2024 · b043360 · b043360
1 parent 67efc2c
commit b043360
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@
 menuconfig FW_INFO
 	bool
 	prompt "Firmware Metadata"
-	imply NRFX_NVMC
+	imply NRFX_NVMC if !SOC_SERIES_NRF54LX
 
 if (FW_INFO)