Revert "fix: Class ID checks for INSTLD_MFST components"

This reverts commit ad6502a.
nrfconnect · Jan 9, 2025 · f09a77b · f09a77b
1 parent ad6502a
commit f09a77b
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 8 deletions.
diff --git a/examples/input_files/envelope_2_hierarchical.yaml b/examples/input_files/envelope_2_hierarchical.yaml
@@ -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

diff --git a/ncs/nordic_top_envelope.yaml.jinja2 b/ncs/nordic_top_envelope.yaml.jinja2
@@ -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:

diff --git a/ncs/root_with_nordic_top_envelope.yaml.jinja2 b/ncs/root_with_nordic_top_envelope.yaml.jinja2
@@ -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