Skip to content

Commit b777188

Browse files
committed
suit: Remove legacy implementation
Remove pieces, that were required for Eng A board support, as well as old DTS definitions. Ref: NCSDK-30398 Signed-off-by: Tomasz Chyrowicz <[email protected]>
1 parent 3b73572 commit b777188

File tree

6 files changed

+4
-37
lines changed

6 files changed

+4
-37
lines changed

subsys/mgmt/suitfu/src/suitfu_mgmt_suit.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,44 +55,23 @@ static const struct mgmt_handler suit_mgmt_handlers[] = {
5555
#endif
5656
};
5757

58-
#ifdef CONFIG_MGMT_SUITFU_GRP_OS
59-
static const struct mgmt_handler suit_mgmt_os_handlers[] = {
60-
[OS_MGMT_ID_BOOTLOADER_INFO] = {.mh_read = suitfu_mgmt_suit_bootloader_info_read,
61-
.mh_write = NULL},
62-
};
63-
#endif
64-
6558
static struct mgmt_group suit_mgmt_group = {
6659
.mg_handlers = (struct mgmt_handler *)suit_mgmt_handlers,
6760
.mg_handlers_count = ARRAY_SIZE(suit_mgmt_handlers),
6861
.mg_group_id = CONFIG_MGMT_GROUP_ID_SUIT,
6962
};
7063

71-
#ifdef CONFIG_MGMT_SUITFU_GRP_OS
72-
static struct mgmt_group suit_mgmt_os_group = {
73-
.mg_handlers = (struct mgmt_handler *)suit_mgmt_os_handlers,
74-
.mg_handlers_count = ARRAY_SIZE(suit_mgmt_os_handlers),
75-
.mg_group_id = MGMT_GROUP_ID_OS,
76-
};
77-
#endif
78-
7964
void suit_mgmt_register_group(void)
8065
{
8166
#ifdef CONFIG_MGMT_SUITFU_GRP_SUIT_IMAGE_FETCH
8267
suitfu_mgmt_suit_image_fetch_init();
8368
#endif
8469
mgmt_register_group(&suit_mgmt_group);
85-
#ifdef CONFIG_MGMT_SUITFU_GRP_OS
86-
mgmt_register_group(&suit_mgmt_os_group);
87-
#endif
8870
}
8971

9072
void suit_mgmt_unregister_group(void)
9173
{
9274
mgmt_unregister_group(&suit_mgmt_group);
93-
#ifdef CONFIG_MGMT_SUITFU_GRP_OS
94-
mgmt_unregister_group(&suit_mgmt_os_group);
95-
#endif
9675
}
9776

9877
#ifdef CONFIG_MGMT_SUITFU_AUTO_REGISTER_HANDLERS

subsys/suit/memory_layout/src/suit_memory_layout.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
#elif (DT_NODE_EXISTS(DT_NODELABEL(flash0))) /* nrf52 or flash simulator */
1818
#define INTERNAL_NVM_START DT_REG_ADDR(DT_NODELABEL(flash0))
1919
#define INTERNAL_NVM_SIZE DT_REG_SIZE(DT_NODELABEL(flash0))
20-
#elif (DT_NODE_EXISTS(DT_NODELABEL(rram0))) /* nrf54l15 */
21-
#define INTERNAL_NVM_START DT_REG_ADDR(DT_NODELABEL(rram0))
22-
#define INTERNAL_NVM_SIZE DT_REG_SIZE(DT_NODELABEL(rram0))
2320
#else
2421
#error "No recognizable internal nvm nodes found."
2522
#endif

subsys/suit/storage/Kconfig

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,13 @@ config SUIT_STORAGE_N_ENVELOPES
5151
- SecDom: firmware + recovery
5252
- SysCtlr: firmware
5353
- Radio: recovery
54-
* Radio: firmware (A)
55-
* Radio: firmware (B)
54+
- Radio: firmware (A)
55+
- Radio: firmware (B)
5656
- ROOT
5757
- Application: recovery
5858
- Application: firmware (A)
5959
- Application: firmware (B)
60-
* Application: user data
61-
62-
Manifests marked with (*) are not available in legacy SUIT storage format.
60+
- Application: user data
6361

6462
For debug and test platforms (POSIX, nRF52840) the following envelopes may be defined:
6563
- ROOT

subsys/suit/storage/include/suit_storage_internal.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@
3030
extern "C" {
3131
#endif
3232

33-
#define SUIT_STORAGE_NVM_NODE \
34-
COND_CODE_1(DT_NODE_EXISTS(DT_NODELABEL(secdom_nvs)), (DT_NODELABEL(secdom_nvs)), \
35-
(DT_CHOSEN(zephyr_flash)))
33+
#define SUIT_STORAGE_NVM_NODE DT_CHOSEN(zephyr_flash)
3634
#define SUIT_STORAGE_WRITE_SIZE DT_PROP(SUIT_STORAGE_NVM_NODE, write_block_size)
3735
#define SUIT_STORAGE_EB_SIZE DT_PROP(SUIT_STORAGE_NVM_NODE, erase_block_size)
3836
#define SUIT_STORAGE_ACCESS_BLOCK_SIZE \

subsys/suit/storage/src/suit_storage_update.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <zephyr/drivers/flash.h>
99
#include <zephyr/logging/log.h>
1010

11-
#define UPDATE_MAGIC_VALUE_AVAILABLE_RAW 0x5555AAAA
1211
#define UPDATE_MAGIC_VALUE_AVAILABLE_CBOR 0x55AA55AA
1312
#define UPDATE_MAGIC_VALUE_EMPTY 0xFFFFFFFF
1413

subsys/suit/utils/src/suit_plat_mem_util.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ uintptr_t suit_plat_mem_nvm_offset_get(uint8_t *ptr)
7575

7676
#if (DT_NODE_EXISTS(DT_NODELABEL(mram1x)))
7777
address = (((address) & 0xEFFFFFFFUL) - (DT_REG_ADDR(DT_NODELABEL(mram1x)) & 0xEFFFFFFFUL));
78-
#elif (DT_NODE_EXISTS(DT_NODELABEL(mram10)))
79-
address = (((address) & 0xEFFFFFFFUL) - (DT_REG_ADDR(DT_NODELABEL(mram10)) & 0xEFFFFFFFUL));
8078
#endif
8179

8280
return address;
@@ -88,8 +86,6 @@ uint8_t *suit_plat_mem_nvm_ptr_get(uintptr_t offset)
8886

8987
#if (DT_NODE_EXISTS(DT_NODELABEL(mram1x)))
9088
address = (((offset) & 0xEFFFFFFFUL) + (DT_REG_ADDR(DT_NODELABEL(mram1x)) & 0xEFFFFFFFUL));
91-
#elif (DT_NODE_EXISTS(DT_NODELABEL(mram10)))
92-
address = (((offset) & 0xEFFFFFFFUL) + (DT_REG_ADDR(DT_NODELABEL(mram10)) & 0xEFFFFFFFUL));
9389
#else
9490
address = offset;
9591
#endif

0 commit comments

Comments
 (0)