Cherry pick moving SRAM configuration to DTS#4035
Merged
Merged
Conversation
|
The following west manifest projects have changed revision in this Pull Request:
✅ All manifest checks OK Note: This message is automatically posted and updated by the Manifest GitHub Action. |
nordicjm
force-pushed
the
sramreworkfromlist
branch
from
1c93864 to
0fd3017
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
May 1, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4035 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
nordicjm
force-pushed
the
sramreworkfromlist
branch
from
0fd3017 to
9f5ad60
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
May 1, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4035 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
nordicjm
force-pushed
the
sramreworkfromlist
branch
from
9f5ad60 to
06cf79e
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
May 5, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4035 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
nordicjm
pushed a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
May 6, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4035 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
nordicjm
force-pushed
the
sramreworkfromlist
branch
2 times, most recently
from
768a04e to
6cf5135
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
May 8, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4035 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
May 8, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4035 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
shanthanordic
approved these changes
May 8, 2026
shanthanordic
left a comment
shanthanordic
left a comment
There was a problem hiding this comment.
approved for scope. @nordicjm remember to udpate the migration guide
lucasvdp
approved these changes
May 8, 2026
| #define I2S_TX_NODE DT_NODELABEL(i2s_tx) | ||
| #endif | ||
|
|
||
| #define RAM_SIZE (DT_CHOSEN_SRAM_ADDR / 1024) |
Contributor
There was a problem hiding this comment.
#define SRAM_SIZE (DT_CHOSEN_SRAM_ADDR / 1024)?
Adds the missing chosen node to specify the board's SRAM Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 8176356)
…efaults Some boards were setting variables that were never referenced, others were setting a default for a Kconfig that was already the default, this removes these Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit f8b81e9)
This reverts commit 6995eb0. Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
…nitions" This reverts commit 9991882. Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Since commit 0026a5610ac ("arm64: mm: use identity mapping for device
MMIO"), device_map() creates identity mappings (VA = PA) instead of
allocating virtual addresses from a contiguous pool. Each device at a
distinct 2MB-aligned physical address now requires its own L3 page
table, increasing the total number of translation tables needed.
Bump the USERSPACE && TEST default from 24 to 28 to accommodate the
additional tables required by identity-mapped device MMIO.
Signed-off-by: Carlo Caione <ccaione@baylibre.com>
(cherry picked from commit acc5365)
…ration Adds a Kconfig which will be used to determine where the source of truth will be for RAM configuration for a board target, to allow moving to a pure DTS approach Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 29b11f9)
Adds macros to get the chosen SRAM node's address and size Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit ab07759)
Allows using the chosen SRAM node for RAM configuration without using Kconfig values Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 96d1142)
Allows using the chosen SRAM node for RAM configuration without using Kconfig values Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 1c65d60)
Allows using the chosen SRAM node for RAM configuration without using Kconfig values Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit c17b867)
Allows using the chosen SRAM node for RAM configuration without using Kconfig values Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit a036c6a)
Allows using the chosen SRAM node for RAM configuration without using Kconfig values Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit ceb26f6)
Allows using the chosen SRAM node for RAM configuration without using Kconfig values Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 1d935da)
Allows using the chosen SRAM node for RAM configuration without using Kconfig values Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 831e1ea)
Allows using the chosen SRAM node for RAM configuration without using Kconfig values Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 387b904)
Allows using the chosen SRAM node for RAM configuration without using Kconfig values Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 46cde68)
Allows using the chosen SRAM node for RAM configuration without using Kconfig values Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit b06f9b0)
…pport Adds support for using the chosen SRAM node for getting the RAM start address instead of having to rely on Kconfigs Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit aada3b2)
Updates old Kconfig usage with C macros (which come from dts) Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 02cfde1)
Deprecates these Kconfigs and emits a deprecated warning when either of them are changed from their defaults (on a different symbol, due to Kconfig limitations) Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 4476a81)
…config change Adds details about this switching to Kconfig Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit e4af38d)
Partition Manager (PM) is a component of the nRF Connect SDK (NCS) which uses yaml files to resolve flash partition placement with a holistic view of the entire device, including each firmware image present on the flash device, and various subsystems, such as settings and NFFS. When this NCS extension is used, various source files which would use partition information from devicetree in "vanilla" zephyr instead use defines generated by PM instead. This commit removes support for HEX_FILES_TO_MERGE, as it conflicts with PM. The settings subsystem pm.yml defines a partition 'settings_storage'. The nffs subsystem pm.yml defines 'nffs_storage'. Leverage label translation to avoid patching partition names. Refer to the NCS documentation page for this feature for more details. This is a long-running out of tree patch which has been worked on by several people. The following sign-offs are in alphabetical order by first name. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no> Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no> Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no> Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no> Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no> Signed-off-by: Ole Sæther <ole.saether@nordicsemi.no> Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no> Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no> Signed-off-by: Thomas Stenersen <thomas.stenersen@nordicsemi.no> Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no> Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no> Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no> Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no> Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no> Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit a8cb6e2)
Update conditions for soc_secure_mem_read to support Non-Secure builds without Partition Manager. noup as Partition Manager is a NCS construct. Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit b71134c)
nordicjm
force-pushed
the
sramreworkfromlist
branch
from
6cf5135 to
bf381f3
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
May 11, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4035 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
May 11, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4035 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
nordicjm
pushed a commit
to nrfconnect/sdk-nrf
that referenced
this pull request
May 11, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4035 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Moves non-PM SRAM configuration to DTS instead of Kconfig