Skip to content

Commit f27f49d

Browse files
michalek-norlubos
authored andcommitted
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]>
1 parent 98c1885 commit f27f49d

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

lib/hw_unique_key/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ config HW_UNIQUE_KEY_LOAD
1818
depends on HAS_HW_NRF_CC310
1919
depends on NRF_CC3XX_PLATFORM
2020
select FPROTECT
21-
imply NRFX_NVMC
21+
imply NRFX_NVMC if !SOC_SERIES_NRF54LX
2222
help
2323
Use this on devices with no KMU. Enable this in the immutable
2424
bootloader to load the HUK from the allocated flash area
@@ -46,7 +46,7 @@ config HW_UNIQUE_KEY
4646
select PSA_WANT_ALG_GCM if CRACEN_HW_PRESENT
4747
select PSA_NEED_CRACEN_KMU_DRIVER if CRACEN_HW_PRESENT
4848
select FPROTECT if HAS_HW_NRF_ACL
49-
imply NRFX_NVMC if HAS_HW_NRF_ACL
49+
imply NRFX_NVMC if !SOC_SERIES_NRF54LX
5050
default y if BUILD_WITH_TFM
5151
help
5252
This option will load the Hardware Unique Key (HUK) in the KDR

samples/bootloader/prj.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ CONFIG_BL_SHA256_EXT_API_ENABLED=y
2222
CONFIG_BL_SECP256R1_EXT_API_ENABLED=y
2323
CONFIG_BL_VALIDATE_FW_EXT_API_ENABLED=y
2424
CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=y
25-
CONFIG_NRFX_NVMC=y
2625
CONFIG_MAIN_STACK_SIZE=2048
2726
CONFIG_TIMEOUT_64BIT=n
2827

samples/bootloader/prj_minimal.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=y
1313
CONFIG_FPROTECT=y
1414
CONFIG_FW_INFO=y
1515
CONFIG_IS_SECURE_BOOTLOADER=y
16-
CONFIG_NRFX_NVMC=y
1716
CONFIG_SECURE_BOOT_CRYPTO=y
1817
CONFIG_SECURE_BOOT_STORAGE=y
1918
CONFIG_SECURE_BOOT_VALIDATION=y

subsys/bootloader/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ menuconfig IS_SECURE_BOOTLOADER
198198
select SECURE_BOOT_VALIDATION
199199
select SECURE_BOOT_STORAGE
200200
select SW_VECTOR_RELAY if SOC_SERIES_NRF51X
201-
imply NRFX_NVMC
201+
imply NRFX_NVMC if !SOC_SERIES_NRF54LX
202202
help
203203
This option is set by the first stage bootloader app to include all
204204
files and set all the options required.

subsys/fw_info/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
menuconfig FW_INFO
88
bool
99
prompt "Firmware Metadata"
10-
imply NRFX_NVMC
10+
imply NRFX_NVMC if !SOC_SERIES_NRF54LX
1111

1212
if (FW_INFO)
1313

0 commit comments

Comments
 (0)