Skip to content

Set sram0 to represent the physical RAM in nRF5340 and nRF9160 DKs #24637

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

Merged
merged 5 commits into from
May 10, 2020
Merged

Set sram0 to represent the physical RAM in nRF5340 and nRF9160 DKs #24637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7323e1
boards: arm: nrf5340pdk: define sram0_image for image(s) RAM
ioannisg Apr 23, 2020
c6948e4
boards: arm: nrf5340pdk: clean up sram0_shared definition
ioannisg Apr 23, 2020
1c3380f
boards: arm: nRF9160: avoid resizing sram0 for nRF9160_dk
hakonfam Apr 21, 2020
536635c
boards: arm: nrf9160_dk: clean up sram0_ns and sram0_bsd definitions
ioannisg Apr 23, 2020
3ffec9a
boards: arm: nrf: add non-secure SRAM memory information in DTS
ioannisg May 5, 2020
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
4 changes: 2 additions & 2 deletions boards/arm/nrf5340pdk_nrf5340/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ config BOARD
# If the secure firmware is to be combined with a non-secure image
# (TRUSTED_EXECUTION_SECURE=y), the secure FW image SRAM shall always
# be restricted to the secure image SRAM partition (sram-secure-partition).
# Otherwise (if TRUSTED_EXECUTION_SECURE is not set) the whole sram0 may be
# used by the image.
# Otherwise (if TRUSTED_EXECUTION_SECURE is not set) the whole zephyr,sram
Copy link
Member Author

@ioannisg ioannisg Apr 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now the sentence is more "generic" (as long as we're using zephyr,sram for image ram, which we do in all ARM platforms AFAIK)

# may be used by the image.
#
# For the non-secure version of the board, the firmware image SRAM is
# always restricted to the allocated non-secure SRAM partition.
Expand Down
3 changes: 2 additions & 1 deletion boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@

/ {
chosen {
zephyr,sram = &sram0;
zephyr,sram = &sram0_image;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
zephyr,sram-secure-partition = &sram0_s;
zephyr,sram-non-secure-partition = &sram0_ns;
Copy link
Contributor

@pabigot pabigot May 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's some (inconsistent) precedent for documenting standard chosen properties in doc/guides/dts/legacy-macros.rst. The surrounded text suggests that it should be complete, so these should be added to it, replacing or augmenting the existing zephyr,sram entry.

@mbolivar-nordic if this section of that module remains relevant after we remove support for legacy macros perhaps it should move elsewhere before release?

Copy link
Contributor

@mbolivar-nordic mbolivar-nordic May 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mbolivar-nordic if this section of that module remains relevant after we remove support for legacy macros perhaps it should move elsewhere before release?

That's a good idea. I have added the following to my TODO list for v2.3 DT docs:

  • centralize documentation of chosen zephyr nodes to a non-legacy file, provide a reference to them from the intro

If you're OK with letting me take care of that after freeze, I will do so.

Copy link
Member Author

@ioannisg ioannisg May 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pabigot ^^
(I am ok, let me know if there's anything in need to do here)

Copy link
Member Author

@ioannisg ioannisg May 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pabigot ^^

Copy link
Contributor

@pabigot pabigot May 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with @mbolivar-nordic doing this later.

Copy link
Member Author

@ioannisg ioannisg May 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @pabigot

};
};
20 changes: 11 additions & 9 deletions boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_common.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,21 +164,23 @@
};
};

&sram0 {
/ {

partitions {
compatible = "fixed-partitions";
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;

sram0_image: image@20000000 {
/* Zephyr image(s) memory */
};

/* SRAM allocated to the Secure image */
sram0_s: memory@20000000 {
label = "secure_sram_partition";
sram0_s: image_s@20000000 {
/* Secure image memory */
};

/* SRAM allocated to the Non-Secure image */
sram0_ns: memory@20010000 {
label = "non_secure_sram_partition";
sram0_ns: image_ns@20010000 {
/* Non-Secure image memory */
};
};
};
Expand Down
2 changes: 1 addition & 1 deletion boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_cpuapp_partition_conf.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
* - Upper 64 kB SRAM allocated as Shared memory (sram0_shared)
* (see nrf5340pdk_nrf5340_shared_sram_planning_conf.dts)
*/
&sram0 {
&sram0_image {
reg = <0x20000000 DT_SIZE_K(448)>;
};

Expand Down
16 changes: 10 additions & 6 deletions boards/arm/nrf5340pdk_nrf5340/nrf5340pdk_nrf5340_shared_sram_planning_conf.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* This file is included by both nRF5340 CPUAPP (Application MCU)
* and nRF5340 CPUNET (Network MCU).
* - 64 kB SRAM allocated as Shared memory (sram0_shared)
* - Region defined after the secure SRAM partition of CPUAPP
* - Region defined after the image SRAM of Application MCU
Copy link
Member Author

@ioannisg ioannisg May 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually a documentation fix

*/

/ {
Expand All @@ -17,10 +17,14 @@
zephyr,ipc_shm = &sram0_shared;
};

/* SRAM allocated to shared memory */
sram0_shared: memory@20070000 {
device_type = "memory";
compatible = "mmio-sram";
reg = <0x20070000 DT_SIZE_K(64)>;
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;

sram0_shared: memory@20070000 {
/* SRAM allocated to shared memory */
reg = <0x20070000 0x10000>;
};
};
};
4 changes: 3 additions & 1 deletion boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@

/ {
chosen {
zephyr,sram = &sram0;
zephyr,sram = &sram0_s;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
zephyr,sram-secure-partition = &sram0_s;
zephyr,sram-non-secure-partition = &sram0_ns;
};
};
23 changes: 16 additions & 7 deletions boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_common.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,23 @@
};

/ {
/* SRAM allocated and used by the BSD library */
sram0_bsd: memory@20010000 {
compatible = "mmio-sram";
};

/* SRAM allocated to the Non-Secure image */
sram0_ns: memory@20020000 {
compatible = "mmio-sram";
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;

sram0_s: image_s@20000000 {
/* Secure image memory */
};

sram0_bsd: image_bsd@20010000 {
/* BSD (shared) memory */
};

sram0_ns: image_ns@20020000 {
/* Non-Secure image memory */
};
};
};

Expand Down
6 changes: 3 additions & 3 deletions boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_partition_conf.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@

/* Default SRAM planning when building for nRF9160 with
* ARM TrustZone-M support
* - Lowest 64 kB SRAM allocated to Secure image (sram0).
* - Lowest 64 kB SRAM allocated to Secure image (sram0_s).
* - 64 kB SRAM reserved for and used by the BSD socket
* library.
* library (sram0_bsd).
* - Upper 128 kB allocated to Non-Secure image (sram0_ns).
*/

&sram0 {
&sram0_s {
reg = <0x20000000 DT_SIZE_K(64)>;
};

Expand Down