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

Jump to bottom

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

Merged
merged 1 commit into from
Mar 19, 2024
Merged

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

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
6 changes: 2 additions & 4 deletions ncs/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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."
Expand Down
98 changes: 0 additions & 98 deletions ncs/nordic_top_with_secdom_hierarchical_envelope.yaml.jinja2
View file
Open in desktop

This file was deleted.

173 changes: 0 additions & 173 deletions ncs/root_hierarchical_envelope.yaml.jinja2
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions ncs/secdom_update_envelope.yaml.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
Loading