fix (ncs): add missing nordic-top manifest for lilium soc1 revision

Ref: NCSDK-26600 Signed-off-by: Robert Stypa <[email protected]>
nrfconnect · Mar 19, 2024 · ba57c5a · ba57c5a
1 parent 22e8964
commit ba57c5a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 275 deletions.
diff --git a/ncs/Kconfig b/ncs/Kconfig
@@ -25,8 +25,7 @@ config SUIT_ENVELOPE_SEQUENCE_NUM
 
 config SUIT_ENVELOPE_DEFAULT_TEMPLATE
     string "Path to the default envelope template (deprecated)"
-    default "${ZEPHYR_SUIT_GENERATOR_MODULE_DIR}/ncs/root_hierarchical_envelope.yaml.jinja2" if SOC_NRF54H20_CPUAPP && HW_REVISION_SOC1
-    default "${ZEPHYR_SUIT_GENERATOR_MODULE_DIR}/ncs/root_with_nordic_top_envelope.yaml.jinja2" if SOC_NRF54H20_CPUAPP && !HW_REVISION_SOC1
+    default "${ZEPHYR_SUIT_GENERATOR_MODULE_DIR}/ncs/root_with_nordic_top_envelope.yaml.jinja2" if SOC_NRF54H20_CPUAPP
     default SUIT_ENVELOPE_SYSCTRL_TEMPLATE if SOC_NRF54H20_CPUSYS
     default SUIT_ENVELOPE_SECDOM_TEMPLATE if SOC_NRF54H20_CPUSEC
     help
@@ -114,7 +113,6 @@ config SUIT_PREPARE_SECDOM_UPDATE
 
 config SUIT_ENVELOPE_SECDOM_TEMPLATE
   string "Location of template file for preparing secdom yaml envelope"
-  depends on !HW_REVISION_SOC1
   help
       Jinja2 template file used to generate yaml file for secure domain update.
   default "${ZEPHYR_SUIT_GENERATOR_MODULE_DIR}/ncs/secdom_update_envelope.yaml.jinja2"
@@ -175,7 +173,7 @@ config SUIT_ENVELOPE_TOP_TEMPLATE
       contain an input nordic-top envelope template file.
       You can use either absolute or relative path.
       In case relative path is used, the build system uses PROJECT_BINARY_DIR directory.
-  default "${ZEPHYR_SUIT_GENERATOR_MODULE_DIR}/ncs/nordic_top_envelope.yaml.jinja2" if SOC_NRF54H20_CPUAPP && !HW_REVISION_SOC1
+  default "${ZEPHYR_SUIT_GENERATOR_MODULE_DIR}/ncs/nordic_top_envelope.yaml.jinja2" if SOC_NRF54H20_CPUAPP
 
 config SUIT_ENVELOPE_ROOT_TARGET
     string "Map root target to custom target to overwite output aftifacts names."

diff --git a/ncs/nordic_top_with_secdom_hierarchical_envelope.yaml.jinja2 b/ncs/nordic_top_with_secdom_hierarchical_envelope.yaml.jinja2
diff --git a/ncs/root_hierarchical_envelope.yaml.jinja2 b/ncs/root_hierarchical_envelope.yaml.jinja2
diff --git a/ncs/secdom_update_envelope.yaml.jinja2 b/ncs/secdom_update_envelope.yaml.jinja2
@@ -36,6 +36,9 @@ SUIT_Envelope_Tagged:
         - suit-send-record-failure
         - suit-send-sysinfo-success
         - suit-send-sysinfo-failure
+{%- if 'CONFIG_HW_REVISION_SOC1' in app['config'] %}
+    suit-install: []
+{%- else %}
     suit-install:
     - suit-directive-set-component-index: 1
     - suit-directive-override-parameters:
@@ -47,6 +50,7 @@ SUIT_Envelope_Tagged:
         suit-parameter-source-component: 1
     - suit-directive-copy:
       - suit-send-record-failure
+{%- endif %}
     suit-manifest-component-id:
     - INSTLD_MFST
     - RFC4122_UUID: