Skip to content

Commit 62709d1

Browse files
degjorvadegjorva
committed
samples: crypto: migrate nRF5340 NS builds off Partition Manager
Disable Partition Manager for the nRF5340/ns target. For psa_tls also: Extend the DTS layout to nrf54lv10a/cpuapp/ns (new overlay) and update the nrf54l10/cpuapp/ns overlay. The stock DTS split allocates only 96 kB (nrf54l10) / 92 kB (nrf54lv10a) of SRAM to the non-secure. This new overlay matches the previous Partition Manager layout Fix nrf54lv10dk_nrf54lv10_cpuapp_ns.conf filename that was missing the 'a' variant suffix and was not being picked up by the build. Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
1 parent 2aae506 commit 62709d1

39 files changed

Lines changed: 1040 additions & 21 deletions

‎samples/crypto/aes_cbc/Kconfig.sysbuild‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
#
66

77
config PARTITION_MANAGER
8-
default n if !((SOC_SERIES_NRF91 || SOC_SERIES_NRF53) && BOARD_IS_NON_SECURE)
8+
default n if !(SOC_SERIES_NRF91 && BOARD_IS_NON_SECURE)
99

1010
source "share/sysbuild/Kconfig"

‎samples/crypto/aes_cbc/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/delete-node/ &boot_partition;
2+
/delete-node/ &slot0_partition;
3+
/delete-node/ &slot1_partition;
4+
/delete-node/ &storage_partition;
5+
6+
/delete-node/ &tfm_its_partition;
7+
/delete-node/ &tfm_otp_partition;
8+
/delete-node/ &tfm_ps_partition;
9+
10+
&flash0 {
11+
partitions {
12+
slot0_s_partition: partition@0 {
13+
label = "image-0-secure";
14+
reg = <0x0 0x40000>;
15+
};
16+
17+
slot0_ns_partition: partition@40000 {
18+
label = "image-0-nonsecure";
19+
reg = <0x40000 0xb4000>;
20+
};
21+
22+
tfm_storage_partition: partition@f4000 {
23+
compatible = "fixed-subpartitions";
24+
label = "tfm-storage";
25+
reg = <0xf4000 DT_SIZE_K(48)>;
26+
ranges = <0x0 0xf4000 DT_SIZE_K(48)>;
27+
#address-cells = <1>;
28+
#size-cells = <1>;
29+
30+
tfm_its_partition: partition@0 {
31+
label = "tfm-its";
32+
reg = <0x0 DT_SIZE_K(8)>;
33+
};
34+
35+
tfm_otp_partition: partition@4000 {
36+
label = "tfm-otp";
37+
reg = <0x4000 DT_SIZE_K(8)>;
38+
};
39+
40+
tfm_ps_partition: partition@8000 {
41+
label = "tfm-ps";
42+
reg = <0x8000 DT_SIZE_K(16)>;
43+
};
44+
45+
};
46+
};
47+
};
48+

‎samples/crypto/aes_ccm/Kconfig.sysbuild‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
#
66

77
config PARTITION_MANAGER
8-
default n if !((SOC_SERIES_NRF91 || SOC_SERIES_NRF53) && BOARD_IS_NON_SECURE)
8+
default n if !(SOC_SERIES_NRF91 && BOARD_IS_NON_SECURE)
99

1010
source "share/sysbuild/Kconfig"

‎samples/crypto/aes_ccm/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/delete-node/ &boot_partition;
2+
/delete-node/ &slot0_partition;
3+
/delete-node/ &slot1_partition;
4+
/delete-node/ &storage_partition;
5+
6+
/delete-node/ &tfm_its_partition;
7+
/delete-node/ &tfm_otp_partition;
8+
/delete-node/ &tfm_ps_partition;
9+
10+
&flash0 {
11+
partitions {
12+
slot0_s_partition: partition@0 {
13+
label = "image-0-secure";
14+
reg = <0x0 0x40000>;
15+
};
16+
17+
slot0_ns_partition: partition@40000 {
18+
label = "image-0-nonsecure";
19+
reg = <0x40000 0xb4000>;
20+
};
21+
22+
tfm_storage_partition: partition@f4000 {
23+
compatible = "fixed-subpartitions";
24+
label = "tfm-storage";
25+
reg = <0xf4000 DT_SIZE_K(48)>;
26+
ranges = <0x0 0xf4000 DT_SIZE_K(48)>;
27+
#address-cells = <1>;
28+
#size-cells = <1>;
29+
30+
tfm_its_partition: partition@0 {
31+
label = "tfm-its";
32+
reg = <0x0 DT_SIZE_K(8)>;
33+
};
34+
35+
tfm_otp_partition: partition@4000 {
36+
label = "tfm-otp";
37+
reg = <0x4000 DT_SIZE_K(8)>;
38+
};
39+
40+
tfm_ps_partition: partition@8000 {
41+
label = "tfm-ps";
42+
reg = <0x8000 DT_SIZE_K(16)>;
43+
};
44+
45+
};
46+
};
47+
};
48+

‎samples/crypto/aes_ctr/Kconfig.sysbuild‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
#
66

77
config PARTITION_MANAGER
8-
default n if !((SOC_SERIES_NRF91 || SOC_SERIES_NRF53) && BOARD_IS_NON_SECURE)
8+
default n if !(SOC_SERIES_NRF91 && BOARD_IS_NON_SECURE)
99

1010
source "share/sysbuild/Kconfig"

‎samples/crypto/aes_ctr/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/delete-node/ &boot_partition;
2+
/delete-node/ &slot0_partition;
3+
/delete-node/ &slot1_partition;
4+
/delete-node/ &storage_partition;
5+
6+
/delete-node/ &tfm_its_partition;
7+
/delete-node/ &tfm_otp_partition;
8+
/delete-node/ &tfm_ps_partition;
9+
10+
&flash0 {
11+
partitions {
12+
slot0_s_partition: partition@0 {
13+
label = "image-0-secure";
14+
reg = <0x0 0x40000>;
15+
};
16+
17+
slot0_ns_partition: partition@40000 {
18+
label = "image-0-nonsecure";
19+
reg = <0x40000 0xb4000>;
20+
};
21+
22+
tfm_storage_partition: partition@f4000 {
23+
compatible = "fixed-subpartitions";
24+
label = "tfm-storage";
25+
reg = <0xf4000 DT_SIZE_K(48)>;
26+
ranges = <0x0 0xf4000 DT_SIZE_K(48)>;
27+
#address-cells = <1>;
28+
#size-cells = <1>;
29+
30+
tfm_its_partition: partition@0 {
31+
label = "tfm-its";
32+
reg = <0x0 DT_SIZE_K(8)>;
33+
};
34+
35+
tfm_otp_partition: partition@4000 {
36+
label = "tfm-otp";
37+
reg = <0x4000 DT_SIZE_K(8)>;
38+
};
39+
40+
tfm_ps_partition: partition@8000 {
41+
label = "tfm-ps";
42+
reg = <0x8000 DT_SIZE_K(16)>;
43+
};
44+
45+
};
46+
};
47+
};
48+

‎samples/crypto/aes_gcm/Kconfig.sysbuild‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
#
66

77
config PARTITION_MANAGER
8-
default n if !((SOC_SERIES_NRF91 || SOC_SERIES_NRF53) && BOARD_IS_NON_SECURE)
8+
default n if !(SOC_SERIES_NRF91 && BOARD_IS_NON_SECURE)
99

1010
source "share/sysbuild/Kconfig"

‎samples/crypto/aes_gcm/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/delete-node/ &boot_partition;
2+
/delete-node/ &slot0_partition;
3+
/delete-node/ &slot1_partition;
4+
/delete-node/ &storage_partition;
5+
6+
/delete-node/ &tfm_its_partition;
7+
/delete-node/ &tfm_otp_partition;
8+
/delete-node/ &tfm_ps_partition;
9+
10+
&flash0 {
11+
partitions {
12+
slot0_s_partition: partition@0 {
13+
label = "image-0-secure";
14+
reg = <0x0 0x40000>;
15+
};
16+
17+
slot0_ns_partition: partition@40000 {
18+
label = "image-0-nonsecure";
19+
reg = <0x40000 0xb4000>;
20+
};
21+
22+
tfm_storage_partition: partition@f4000 {
23+
compatible = "fixed-subpartitions";
24+
label = "tfm-storage";
25+
reg = <0xf4000 DT_SIZE_K(48)>;
26+
ranges = <0x0 0xf4000 DT_SIZE_K(48)>;
27+
#address-cells = <1>;
28+
#size-cells = <1>;
29+
30+
tfm_its_partition: partition@0 {
31+
label = "tfm-its";
32+
reg = <0x0 DT_SIZE_K(8)>;
33+
};
34+
35+
tfm_otp_partition: partition@4000 {
36+
label = "tfm-otp";
37+
reg = <0x4000 DT_SIZE_K(8)>;
38+
};
39+
40+
tfm_ps_partition: partition@8000 {
41+
label = "tfm-ps";
42+
reg = <0x8000 DT_SIZE_K(16)>;
43+
};
44+
45+
};
46+
};
47+
};
48+

‎samples/crypto/chachapoly/Kconfig.sysbuild‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
#
66

77
config PARTITION_MANAGER
8-
default n if !((SOC_SERIES_NRF91 || SOC_SERIES_NRF53) && BOARD_IS_NON_SECURE)
8+
default n if !(SOC_SERIES_NRF91 && BOARD_IS_NON_SECURE)
99

1010
source "share/sysbuild/Kconfig"

‎samples/crypto/chachapoly/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/delete-node/ &boot_partition;
2+
/delete-node/ &slot0_partition;
3+
/delete-node/ &slot1_partition;
4+
/delete-node/ &storage_partition;
5+
6+
/delete-node/ &tfm_its_partition;
7+
/delete-node/ &tfm_otp_partition;
8+
/delete-node/ &tfm_ps_partition;
9+
10+
&flash0 {
11+
partitions {
12+
slot0_s_partition: partition@0 {
13+
label = "image-0-secure";
14+
reg = <0x0 0x40000>;
15+
};
16+
17+
slot0_ns_partition: partition@40000 {
18+
label = "image-0-nonsecure";
19+
reg = <0x40000 0xb4000>;
20+
};
21+
22+
tfm_storage_partition: partition@f4000 {
23+
compatible = "fixed-subpartitions";
24+
label = "tfm-storage";
25+
reg = <0xf4000 DT_SIZE_K(48)>;
26+
ranges = <0x0 0xf4000 DT_SIZE_K(48)>;
27+
#address-cells = <1>;
28+
#size-cells = <1>;
29+
30+
tfm_its_partition: partition@0 {
31+
label = "tfm-its";
32+
reg = <0x0 DT_SIZE_K(8)>;
33+
};
34+
35+
tfm_otp_partition: partition@4000 {
36+
label = "tfm-otp";
37+
reg = <0x4000 DT_SIZE_K(8)>;
38+
};
39+
40+
tfm_ps_partition: partition@8000 {
41+
label = "tfm-ps";
42+
reg = <0x8000 DT_SIZE_K(16)>;
43+
};
44+
45+
};
46+
};
47+
};
48+

0 commit comments

Comments
 (0)