Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "fix: Class ID checks for INSTLD_MFST components" #164

Merged
merged 1 commit into from
Jan 9, 2025
Merged

Revert "fix: Class ID checks for INSTLD_MFST components" #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions examples/input_files/envelope_2_hierarchical.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,23 @@ SUIT_Envelope_Tagged:
namespace: nordicsemi.com
name: nRF54H20_sample_app
suit-shared-sequence:
- suit-directive-set-component-index: [1, 2]
- suit-directive-set-component-index: 1
- suit-directive-override-parameters:
suit-parameter-vendor-identifier:
RFC4122_UUID: nordicsemi.com
suit-parameter-class-identifier:
RFC4122_UUID:
namespace: nordicsemi.com
name: nRF54H20_sample_rad
- suit-directive-set-component-index: 2
- suit-directive-override-parameters:
suit-parameter-vendor-identifier:
RFC4122_UUID: nordicsemi.com
suit-parameter-class-identifier:
RFC4122_UUID:
namespace: nordicsemi.com
name: nRF54H20_sample_root
name: nRF54H20_sample_app
- suit-directive-set-component-index: [1, 2]
- suit-condition-vendor-identifier:
- suit-send-record-success
- suit-send-record-failure
Expand Down
12 changes: 10 additions & 2 deletions ncs/nordic_top_envelope.yaml.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,20 @@ SUIT_Envelope_Tagged:
namespace: nordicsemi.com
name: nRF54H20_sys
suit-shared-sequence:
- suit-directive-set-component-index: [1,2]
- suit-directive-set-component-index: 1
- suit-directive-override-parameters:
suit-parameter-class-identifier:
RFC4122_UUID:
namespace: nordicsemi.com
name: nRF54H20_nordic_top
name: nRF54H20_sec
- suit-directive-set-component-index: 2
- suit-directive-override-parameters:
suit-parameter-class-identifier:
RFC4122_UUID:
namespace: nordicsemi.com
name: nRF54H20_sys
- suit-directive-set-component-index: [1,2]
- suit-directive-override-parameters:
suit-parameter-vendor-identifier:
RFC4122_UUID: nordicsemi.com
- suit-condition-vendor-identifier:
Expand Down
33 changes: 29 additions & 4 deletions ncs/root_with_nordic_top_envelope.yaml.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,39 @@ SUIT_Envelope_Tagged:
{%- endif %}

suit-shared-sequence:
- suit-directive-set-component-index: [{{ component_list|join(',') }}]
{%- if rad is defined %}
- suit-directive-set-component-index: {{ rad_component_index }}
- suit-directive-override-parameters:
suit-parameter-vendor-identifier:
RFC4122_UUID: {{ mpi_rad_vendor_name }}
suit-parameter-class-identifier:
RFC4122_UUID:
namespace: {{ mpi_rad_vendor_name }}
name: {{ mpi_rad_class_name }}
{%- endif %}
{%- if app is defined %}
- suit-directive-set-component-index: {{ app_component_index }}
- suit-directive-override-parameters:
suit-parameter-vendor-identifier:
RFC4122_UUID: {{ mpi_app_vendor_name }}
suit-parameter-class-identifier:
RFC4122_UUID:
namespace: {{ mpi_app_vendor_name }}
name: {{ mpi_app_class_name }}
{%- endif %}

{%- if top is defined %}
- suit-directive-set-component-index: {{ top_component_index }}
- suit-directive-override-parameters:
suit-parameter-vendor-identifier:
RFC4122_UUID: {{ mpi_root_vendor_name }}
RFC4122_UUID: nordicsemi.com
suit-parameter-class-identifier:
RFC4122_UUID:
namespace: {{ mpi_root_vendor_name }}
name: {{ mpi_root_class_name }}
namespace: nordicsemi.com
name: nRF54H20_nordic_top
{%- endif %}

- suit-directive-set-component-index: [{{ component_list|join(',') }}]
- suit-condition-vendor-identifier:
- suit-send-record-success
- suit-send-record-failure
Expand Down
Loading