Skip to content

Commit 7e36d74

Browse files
tomchynordicjm
authored andcommitted
tests: Fix SUIT storage tests on nRF54H
The test no longer is allowed to enable the SUIT_STORAGE symbol as the implementation is always selected by the corresponding SUPPORT_* symbols. Ref: NSDK-NONE Signed-off-by: Tomasz Chyrowicz <[email protected]>
1 parent 7ce60ae commit 7e36d74

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

tests/subsys/suit/storage_nrf54h20/CMakeLists.txt

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,28 @@ target_include_directories(app PRIVATE
1616
)
1717

1818
target_sources(app PRIVATE
19+
${SUIT_SUBSYS_DIR}/storage/src/suit_storage_encode.c
20+
${SUIT_SUBSYS_DIR}/storage/src/suit_storage_envelope.c
21+
${SUIT_SUBSYS_DIR}/storage/src/suit_storage_flags.c
22+
${SUIT_SUBSYS_DIR}/storage/src/suit_storage_mpi.c
1923
# Use nRF54H20-specific implementation.
2024
${SUIT_SUBSYS_DIR}/storage/src/suit_storage_nrf54h20.c
21-
)
25+
${SUIT_SUBSYS_DIR}/storage/src/suit_storage_nvv.c
26+
${SUIT_SUBSYS_DIR}/storage/src/suit_storage_report.c
27+
${SUIT_SUBSYS_DIR}/storage/src/suit_storage_update.c
28+
)
29+
30+
target_include_directories(app PRIVATE
31+
${SUIT_SUBSYS_DIR}/storage/include
32+
)
33+
34+
zephyr_compile_definitions(
35+
CONFIG_SUIT_STORAGE_N_UPDATE_REGIONS=7
36+
CONFIG_SUIT_STORAGE_N_ENVELOPES=10
37+
CONFIG_SUIT_STORAGE_ENVELOPE_SIZE=2048
38+
CONFIG_SUIT_STORAGE_CONFIG_SIZE=128
39+
)
2240

2341
# Link with the CMake target, that includes SUIT platform internal APIs header
2442
zephyr_library_link_libraries(suit_utils)
25-
zephyr_library_link_libraries(suit_storage_interface)
2643
zephyr_library_link_libraries(suit_update_magic_values)

tests/subsys/suit/storage_nrf54h20/prj.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ CONFIG_ZTEST=y
88

99
CONFIG_SUIT=y
1010
CONFIG_SUIT_UTILS=y
11-
CONFIG_SUIT_STORAGE=y
1211
CONFIG_SUIT_METADATA=y
1312
# nRF54H20 storage uses SHA-256 to protect MPI and NVVs:
1413
CONFIG_SUIT_CRYPTO=y

0 commit comments

Comments
 (0)