Skip to content

[nrf fromlist] platform: nordic_nrf: nrf7120: Fix RAM and NS storage … #256

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

Open
krish2718 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[nrf fromlist] platform: nordic_nrf: nrf7120: Fix RAM and NS storage … #256

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
13 changes: 11 additions & 2 deletions platform/ext/target/nordic_nrf/common/nrf7120/partition/flash_layout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@
* 0x0008_A000 Non-secure image primary (844 KB)
* 0x0015_D000 Non-secure storage, used when built with NRF_NS_STORAGE=ON,
* otherwise unused (32 KB)
*
* RAM layout on nRF7120 Application MCU (768 kB M33 SRAM):
*
* 0x2000_0000 Secure RAM (64 kB)
* 0x2001_0000 Non-secure RAM (704 kB, remainder of TOTAL_RAM_SIZE)
*
* Secure RAM is kept to 64 kB so the non-secure application (Wi-Fi stack)
* gets as much of the M33 SRAM map as TF-M can grant.
*/

/* This header file is included from linker scatter file as well, where only a
Expand All @@ -53,6 +61,7 @@
* with TF-M later FLPR volatile memory is not used by TF-M. */
#define SRAM_BASE_ADDRESS (0x20000000)
#define TOTAL_RAM_SIZE (0x000C0000) /* 768 kB, since other 256 kB are reserved for FLPR */
#define S_RAM_PARTITION_SIZE (0x10000) /* 64 kB secure RAM */

#define FLASH_S_PARTITION_SIZE (0x80000) /* S partition: 512 kB*/
#define FLASH_NS_PARTITION_SIZE (0xD3000) /* NS partition: 844 kB*/
Expand Down Expand Up @@ -101,8 +110,8 @@

/* Non-secure storage region */
#define NRF_FLASH_NS_STORAGE_AREA_SIZE (0x8000) /* 32 KB */
#define NRF_FLASH_NS_STORAGE_AREA_OFFSET (FLASH_TOTAL_SIZE - \
NRF_FLASH_NS_STORAGE_AREA_SIZE)
#define NRF_FLASH_NS_STORAGE_AREA_OFFSET (SECURE_STORAGE_PARTITIONS_END + \
FLASH_NS_PARTITION_SIZE)

/* Flash device name used by BL2
* Name is defined in flash driver file: Driver_Flash.c
Expand Down
2 changes: 1 addition & 1 deletion platform/ext/target/nordic_nrf/common/nrf7120/partition/region_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#define S_CODE_LIMIT (S_CODE_START + S_CODE_SIZE - 1)

#define S_DATA_START (S_RAM_ALIAS(0x0))
#define S_DATA_SIZE (TOTAL_RAM_SIZE / 2)
#define S_DATA_SIZE (S_RAM_PARTITION_SIZE)
#define S_DATA_LIMIT (S_DATA_START + S_DATA_SIZE - 1)

/* Copied from the CONFIG_TFM_S_CODE_VECTOR_TABLE_SIZE in sdk-nrf */
Expand Down