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.

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

support sdsc binary bundle 0.6.8 (SDFW 8.0.1 SCFW 3.0.0) #2153

Merged
merged 12 commits into from
Oct 30, 2024

Conversation

jonathannilsen
Copy link
Contributor

@jonathannilsen jonathannilsen commented Oct 23, 2024

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 23, 2024

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@jonathannilsen jonathannilsen marked this pull request as draft October 23, 2024 11:27
@jonathannilsen jonathannilsen force-pushed the sdsc-2.8.0-integration branch 3 times, most recently from e979314 to 5b91c4a Compare October 24, 2024 07:12
@hakonfam hakonfam force-pushed the sdsc-2.8.0-integration branch from 5b91c4a to 6b6c84c Compare October 24, 2024 11:25
@hakonfam hakonfam force-pushed the sdsc-2.8.0-integration branch from 6b6c84c to 456ac7f Compare October 28, 2024 08:42
@hakonfam hakonfam added this to the ncs-2.8.0 milestone Oct 28, 2024
@hakonfam hakonfam force-pushed the sdsc-2.8.0-integration branch from 456ac7f to 2daaa0d Compare October 28, 2024 10:42
@57300 57300 force-pushed the sdsc-2.8.0-integration branch from f1c66e9 to 779aaf9 Compare October 28, 2024 11:24
@jonathannilsen jonathannilsen marked this pull request as ready for review October 28, 2024 15:41
@jonathannilsen jonathannilsen changed the title Integrate SDSC rc1 bundle for 2.8.0 support sdsc binary bundle 0.6.8 (SDFW 8.0.1 SCFW 3.0.0) Oct 28, 2024
@hakonfam hakonfam force-pushed the sdsc-2.8.0-integration branch from 779aaf9 to 17fcd48 Compare October 29, 2024 05:34
@hakonfam hakonfam force-pushed the sdsc-2.8.0-integration branch from 17fcd48 to ade7c42 Compare October 29, 2024 10:18
lstnl and others added 7 commits October 29, 2024 14:10
dcache-alignement needs to be defined for ipc to have
consistent memory organization on both endpoints, when
shared memory is cacheable. nrf54h20 and nrf9280 are
using cacheable shared memory.
This is applied for ipc with icmsg backend.

Signed-off-by: Lukasz Stepnicki <[email protected]>
(cherry picked from commit 022122d)
… EngB

Just like on nRF54H20 EngC.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit 41f53b2)
…RF54H20 EngB

Just like on nRF54H20 EngC.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit 3f221f9)
…4H20 EngB

Just like on nRF54H20 EngC.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit 0379424)
…B VPRs

Just like on nRF54H20 EngC.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit bcf6a91)
Just like on nRF54H20 EngC.

Applied as noup due to conflicts.

Signed-off-by: Grzegorz Swiderski <[email protected]>
Apply it in a few more locations that were missed in
5a4655f.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit 96f08d5)
hakonfam and others added 5 commits October 29, 2024 14:10
Extended UICR will not be used as its configurations will be merged
with the UICR registers in NVR.

Memory maps changes are needed to align with pre compiled
firmware.

Signed-off-by: Håkon Amundsen <[email protected]>
Signed-off-by: Jonathan Nilsen <[email protected]>
(cherry picked from commit 26603ce)
Some upcoming changes require this version.

Signed-off-by: Carles Cufi <[email protected]>
(cherry picked from commit 45fbc31)
Upstream PR #: 79067

Add `idle` and `s2ram` power states for nRF54H20 cpuapp and cpurad.
Also the substate `idle_cache_disable` added.

Signed-off-by: Adam Kondraciuk <[email protected]>
(cherry picked from commit 19a2be222d94985e349766a1e1ba7264d6d2bc0a)
… v8.0.0

SDFW v8.0.0 introduces certain changes that require matching changes
in nrfutil device to ensure that west flash works properly on
nrf54h20dk and nrf9280pdk.

This commit adds a few temporary workarounds to ensure that west flash
works with an older nrfutil device version as well:

1. Don't erase UICR, as this tries to erase the extended UICR regions
   as well, and those regions no longer exist (resulting in an error).

2. Reset after erasing domains with west flash --erase. This is needed
   for the memory owned by the different domains to be freely
   accessible and able to be allocated to different domains.

2. Unless doing a west flash --erase, do a RESET_VIA_SECDOM reset before
   programming firmware. This ensures that all the cores are stopped
   before writing firmware. Removing the UICR erase step seemed to cause
   some instability when programming, which is suspected to be caused by
   the firmware running while programming.

Signed-off-by: Jonathan Nilsen <[email protected]>
@hakonfam hakonfam force-pushed the sdsc-2.8.0-integration branch from ade7c42 to 48129bf Compare October 29, 2024 13:10
@rlubos rlubos added the backport v3.7.99-ncs1-branch Relates to NCS v2.8-branch label Oct 30, 2024
@rlubos rlubos merged commit 08f1c5b into nrfconnect:main Oct 30, 2024
28 checks passed
@hakonfam hakonfam mentioned this pull request Oct 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport v3.7.99-ncs1-branch Relates to NCS v2.8-branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants