Skip to content

Commit f694e25

Browse files
committed
[zep fromlist] platform: nordic: Remove FLPR reserved memory from Nordic boards
Remove the FLPR reserved non-volatile and volatile memory for all Nordic boards since it is not yet supported with TF-M. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> Change-Id: I6bb513d52a55b9571e10392b567b9b77a686d79b
1 parent 04aa724 commit f694e25

File tree

4 files changed

+29
-45
lines changed

4 files changed

+29
-45
lines changed

platform/ext/target/nordic_nrf/common/nrf54l10/partition/flash_layout.h

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
#error "BL2 is not supported for this platform"
2222
#endif
2323

24-
/* Flash layout on NRF54L15 Application MCU without BL2:
24+
/* Flash layout on NRF54L10 Application MCU without BL2:
2525
*
2626
* 0x0000_0000 Secure image primary (384 KB)
2727
* 0x0006_0000 Protected Storage Area (16 KB)
2828
* 0x0006_4000 Internal Trusted Storage Area (16 KB)
2929
* 0x0006_8000 OTP / NV counters area (8 KB)
30-
* 0x0006_A000 Non-secure image primary (494 KB)
31-
* 0x000E_5800 Non-secure storage, used when built with NRF_NS_STORAGE=ON,
30+
* 0x0006_A000 Non-secure image primary (556 KB)
31+
* 0x000F_5000 Non-secure storage, used when built with NRF_NS_STORAGE=ON,
3232
* otherwise unused (32 KB)
3333
*/
3434

@@ -42,20 +42,16 @@
4242
/* Use Flash memory to store Code data */
4343
#define FLASH_BASE_ADDRESS (0x0)
4444

45-
/* nRF54L10 has 1012 kB of non volatile memory (RRAM) but the last 62kB are reserved
46-
* for FLPR MCU in Zephyr. For simplicity and for possible support for running FLPR along
47-
* with TF-M later FLPR non volatile memory is not used by TF-M. */
48-
#define FLASH_TOTAL_SIZE (0xED800) /* 950 kB since the last 62kB are reserved for FLPR */
45+
/* nRF54L10 has 1012 kB of non volatile memory (RRAM) */
46+
#define FLASH_TOTAL_SIZE (0xFD000)
4947
#define TOTAL_ROM_SIZE FLASH_TOTAL_SIZE
5048

51-
/* nRF54L10 has 192 kB of volatile memory (SRAM) but the last 48kB are reserved
52-
* for FLPR MCU in Zephyr. For simplicity and for possible support for running FLPR along
53-
* with TF-M later FLPR volatile memory is not used by TF-M. */
49+
/* nRF54L10 has 192 kB of volatile memory (SRAM) */
5450
#define SRAM_BASE_ADDRESS (0x20000000)
55-
#define TOTAL_RAM_SIZE (0x00024000) /* 144 kB since the last 48kB are reserved for FLPR */
51+
#define TOTAL_RAM_SIZE (0x00030000)
5652

5753
#define FLASH_S_PARTITION_SIZE (0x60000) /* S partition: 384 kB*/
58-
#define FLASH_NS_PARTITION_SIZE (0x7B800) /* NS partition: 494 kB*/
54+
#define FLASH_NS_PARTITION_SIZE (0x8B000) /* NS partition: 556 kB*/
5955

6056
#define S_ROM_ALIAS_BASE FLASH_BASE_ADDRESS
6157
#define NS_ROM_ALIAS_BASE FLASH_BASE_ADDRESS

platform/ext/target/nordic_nrf/common/nrf54l15/partition/flash_layout.h

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
* 0x0008_0000 Protected Storage Area (16 KB)
2828
* 0x0008_4000 Internal Trusted Storage Area (16 KB)
2929
* 0x0008_8000 OTP / NV counters area (8 KB)
30-
* 0x0008_A000 Non-secure image primary (844 KB)
31-
* 0x0015_D000 Non-secure storage, used when built with NRF_NS_STORAGE=ON,
30+
* 0x0008_A000 Non-secure image primary (940 KB)
31+
* 0x0017_5000 Non-secure storage (32 KB), used when built with NRF_NS_STORAGE=ON,
3232
* otherwise unused (32 KB)
3333
*/
3434

@@ -42,20 +42,16 @@
4242
/* Use Flash memory to store Code data */
4343
#define FLASH_BASE_ADDRESS (0x0)
4444

45-
/* nRF54L15 has 1524 kB of non volatile memory (RRAM) but the last 96kB are reserved
46-
* for FLPR MCU in Zephyr. For simplicity and for possible support for running FLPR along
47-
* with TF-M later FLPR non volatile memory is not used by TF-M. */
48-
#define FLASH_TOTAL_SIZE (0x165000) /* 1428 kB since the last 96kB are reserved for FLPR */
45+
/* nRF54L15 has 1524 kB of non volatile memory (RRAM) */
46+
#define FLASH_TOTAL_SIZE (0x17D000)
4947
#define TOTAL_ROM_SIZE FLASH_TOTAL_SIZE
5048

51-
/* nRF54L15 has 256 kB of volatile memory (SRAM) but the last 96kB are reserved
52-
* for FLPR MCU in Zephyr. For simplicity and for possible support for running FLPR along
53-
* with TF-M later FLPR volatile memory is not used by TF-M. */
49+
/* nRF54L15 has 256 kB of volatile memory (SRAM) */
5450
#define SRAM_BASE_ADDRESS (0x20000000)
55-
#define TOTAL_RAM_SIZE (0x00028000) /* 160 kB, since the last 96kB are reserved for FLPR */
51+
#define TOTAL_RAM_SIZE (0x00040000)
5652

5753
#define FLASH_S_PARTITION_SIZE (0x80000) /* S partition: 512 kB*/
58-
#define FLASH_NS_PARTITION_SIZE (0xD3000) /* NS partition: 844 kB*/
54+
#define FLASH_NS_PARTITION_SIZE (0xEB000) /* NS partition: 940 kB*/
5955

6056
#define S_ROM_ALIAS_BASE FLASH_BASE_ADDRESS
6157
#define NS_ROM_ALIAS_BASE FLASH_BASE_ADDRESS

platform/ext/target/nordic_nrf/common/nrf54lm20a/partition/flash_layout.h

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
* 0x0008_0000 Protected Storage Area (16 KB)
2828
* 0x0008_4000 Internal Trusted Storage Area (16 KB)
2929
* 0x0008_8000 OTP / NV counters area (8 KB)
30-
* 0x0008_A000 Non-secure image primary (1356 KB)
31-
* 0x001F_2000 Non-secure storage, used when built with NRF_NS_STORAGE=ON,
30+
* 0x0008_A000 Non-secure image primary (1452 KB)
31+
* 0x001F_5000 Non-secure storage, used when built with NRF_NS_STORAGE=ON,
3232
* otherwise unused (32 KB)
3333
*/
3434

@@ -42,20 +42,16 @@
4242
/* Use Flash memory to store Code data */
4343
#define FLASH_BASE_ADDRESS (0x0)
4444

45-
/* nRF54LM20A has 2036 kB of non volatile memory (RRAM) but the last 96kB are reserved
46-
* for FLPR MCU in Zephyr. For simplicity and for possible support for running FLPR along
47-
* with TF-M later FLPR non volatile memory is not used by TF-M. */
48-
#define FLASH_TOTAL_SIZE (0x1E5000) /* 1940 kB since the last 96kB are reserved for FLPR */
45+
/* nRF54LM20A has 2036 kB of non volatile memory (RRAM) */
46+
#define FLASH_TOTAL_SIZE (0x1FD000)
4947
#define TOTAL_ROM_SIZE FLASH_TOTAL_SIZE
5048

51-
/* nRF54LM20A has 512 kB of volatile memory (SRAM) but the last 96kB are reserved
52-
* for FLPR MCU in Zephyr. For simplicity and for possible support for running FLPR along
53-
* with TF-M later FLPR volatile memory is not used by TF-M. */
49+
/* nRF54LM20A has 512 kB of volatile memory (SRAM) */
5450
#define SRAM_BASE_ADDRESS (0x20000000)
55-
#define TOTAL_RAM_SIZE (0x00068000) /* 416 kB since the last 96kB are reserved for FLPR */
51+
#define TOTAL_RAM_SIZE (0x00080000)
5652

5753
#define FLASH_S_PARTITION_SIZE (0x80000) /* S partition: 512 kB*/
58-
#define FLASH_NS_PARTITION_SIZE (0x153000) /* NS partition: 1356 kB*/
54+
#define FLASH_NS_PARTITION_SIZE (0x16B000) /* NS partition: 1452 kB*/
5955

6056
#define S_ROM_ALIAS_BASE FLASH_BASE_ADDRESS
6157
#define NS_ROM_ALIAS_BASE FLASH_BASE_ADDRESS

platform/ext/target/nordic_nrf/common/nrf54lv10a/partition/flash_layout.h

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
* 0x0006_0000 Protected Storage Area (16 KB)
2828
* 0x0006_4000 Internal Trusted Storage Area (16 KB)
2929
* 0x0006_8000 OTP / NV counters area (8 KB)
30-
* 0x0006_A000 Non-secure image primary (504 KB)
31-
* 0x000E_8000 Non-secure storage, used when built with NRF_NS_STORAGE=ON,
30+
* 0x0006_A000 Non-secure image primary (556 KB)
31+
* 0x000F_5000 Non-secure storage, used when built with NRF_NS_STORAGE=ON,
3232
* otherwise unused (32 KB)
3333
*/
3434

@@ -42,20 +42,16 @@
4242
/* Use Flash memory to store Code data */
4343
#define FLASH_BASE_ADDRESS (0x0)
4444

45-
/* nRF54LV10A has 1012 kB of non volatile memory (RRAM) but the last 62kB are reserved
46-
* for FLPR MCU in Zephyr. For simplicity and for possible support for running FLPR along
47-
* with TF-M later FLPR non volatile memory is not used by TF-M. */
48-
#define FLASH_TOTAL_SIZE (0xF0000) /* 960 kB since the last 62kB are reserved for FLPR */
45+
/* nRF54LV10A has 1012 kB of non volatile memory (RRAM) */
46+
#define FLASH_TOTAL_SIZE (0xFD000)
4947
#define TOTAL_ROM_SIZE FLASH_TOTAL_SIZE
5048

51-
/* nRF54LV10A has 192 kB of volatile memory (SRAM) but the last 48kB are reserved
52-
* for FLPR MCU in Zephyr. For simplicity and for possible support for running FLPR along
53-
* with TF-M later FLPR volatile memory is not used by TF-M. */
49+
/* nRF54LV10A has 192 kB of volatile memory (SRAM) */
5450
#define SRAM_BASE_ADDRESS (0x20000000)
55-
#define TOTAL_RAM_SIZE (0x00024000) /* 144 kB since the last 48kB are reserved for FLPR */
51+
#define TOTAL_RAM_SIZE (0x00030000)
5652

5753
#define FLASH_S_PARTITION_SIZE (0x60000) /* S partition: 384 kB*/
58-
#define FLASH_NS_PARTITION_SIZE (0x7E000) /* NS partition: 504 kB*/
54+
#define FLASH_NS_PARTITION_SIZE (0x8B000) /* NS partition: 556 kB*/
5955

6056
#define S_ROM_ALIAS_BASE FLASH_BASE_ADDRESS
6157
#define NS_ROM_ALIAS_BASE FLASH_BASE_ADDRESS

0 commit comments

Comments
 (0)