-
Notifications
You must be signed in to change notification settings - Fork 1.4k
manifest: sdk-zephyr: [fromlist] poweroff: nordic: streamline RAM retention strategy #19140
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
Closed
NordicBuilder
wants to merge
3
commits into
nrfconnect:main
from
NordicBuilder:auto-manifest-sdk-zephyr-2313
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
tests/benchmarks/current_consumption/system_off/boards/nrf52840dk_nrf52840.overlay
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| / { | ||
| sram0@2003f000 { | ||
| compatible = "zephyr,memory-region", "mmio-sram"; | ||
| reg = <0x2003f000 DT_SIZE_K(4)>; | ||
| zephyr,memory-region = "RetainedMem"; | ||
| status = "okay"; | ||
|
|
||
| retainedmem0: retainedmem { | ||
| compatible = "zephyr,retained-ram"; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| aliases { | ||
| retainedmemdevice = &retainedmem0; | ||
| }; | ||
| }; | ||
|
|
||
| &sram0 { | ||
| /* Shrink SRAM size to avoid overlap with retained memory region */ | ||
| reg = <0x20000000 DT_SIZE_K(252)>; | ||
| }; |
22 changes: 22 additions & 0 deletions
22
tests/benchmarks/current_consumption/system_off/boards/nrf52dk_nrf52832.overlay
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| / { | ||
| sram0@20007000 { | ||
| compatible = "zephyr,memory-region", "mmio-sram"; | ||
| reg = <0x20007000 DT_SIZE_K(4)>; | ||
| zephyr,memory-region = "RetainedMem"; | ||
| status = "okay"; | ||
|
|
||
| retainedmem0: retainedmem { | ||
| compatible = "zephyr,retained-ram"; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| aliases { | ||
| retainedmemdevice = &retainedmem0; | ||
| }; | ||
| }; | ||
|
|
||
| &sram0 { | ||
| /* Shrink SRAM size to avoid overlap with retained memory region */ | ||
| reg = <0x20000000 DT_SIZE_K(28)>; | ||
| }; |
25 changes: 25 additions & 0 deletions
25
tests/benchmarks/current_consumption/system_off/boards/nrf54l15dk_nrf54l05_cpuapp.overlay
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| / { | ||
| cpuapp_sram@20017000 { | ||
| compatible = "zephyr,memory-region", "mmio-sram"; | ||
| reg = <0x20017000 DT_SIZE_K(4)>; | ||
| zephyr,memory-region = "RetainedMem"; | ||
| status = "okay"; | ||
|
|
||
| retainedmem0: retainedmem { | ||
| compatible = "zephyr,retained-ram"; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| aliases { | ||
| retainedmemdevice = &retainedmem0; | ||
| }; | ||
| }; | ||
|
|
||
| &cpuapp_sram { | ||
| /* Shrink SRAM size to avoid overlap with retained memory region: | ||
| * 96 - 4 = 92KB = 0x17000 | ||
| */ | ||
| reg = <0x20000000 0x17000>; | ||
| ranges = <0x0 0x20000000 0x17000>; | ||
| }; |
25 changes: 25 additions & 0 deletions
25
tests/benchmarks/current_consumption/system_off/boards/nrf54l15dk_nrf54l10_cpuapp.overlay
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| / { | ||
| cpuapp_sram@2002f000 { | ||
| compatible = "zephyr,memory-region", "mmio-sram"; | ||
| reg = <0x2002f000 DT_SIZE_K(4)>; | ||
| zephyr,memory-region = "RetainedMem"; | ||
| status = "okay"; | ||
|
|
||
| retainedmem0: retainedmem { | ||
| compatible = "zephyr,retained-ram"; | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
|
|
||
| aliases { | ||
| retainedmemdevice = &retainedmem0; | ||
| }; | ||
| }; | ||
|
|
||
| &cpuapp_sram { | ||
| /* Shrink SRAM size to avoid overlap with retained memory region: | ||
| * 192 - 4 = 188KB = 0x2f000 | ||
| */ | ||
| reg = <0x20000000 0x2f000>; | ||
| ranges = <0x0 0x20000000 0x2f000>; | ||
| }; |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nrf5340dk was removed from the platform_allow list. Is this intentional?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes.
nrf_retained"mode" ofsystem_offsample is now deprecated.retained_memZephyr driver shall be used instead. Unfortunately, due to bug in nrfx,retained_memdriver is not compatible with nrf5340 and nrf9160. Because of this fact I have removed nrf5340dk from retention variant of this test. It will be restored in NCS 3.0, when bug in nrfx is resolved