Skip to content

Commit 4e78a4c

Browse files
eivindj-nordiceivindj-nordic
committed
manifest: update sdk-nrf to v3.4.0-rc1
Update sdk-nrf to v3.4.0-rc1. Replace CONFIG_NRF_SECUROTY with CONFIG_PSA_CRYPTO. Updated number of required board qualifiers to 3. Update to use mapped-partition in DTS. Workaround for SHELL_STACK_SIZE. Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>
1 parent 8b9af5e commit 4e78a4c

64 files changed

Lines changed: 263 additions & 114 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build_samples.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- runs-on=${{ github.run_id }}
1717
- runner=64cpu-linux-x64
1818
# Keep aligned with target NCS version
19-
container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.2.0
19+
container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.4.0-rc1
2020
defaults:
2121
run:
2222
# Bash shell is needed to set toolchain related environment variables in docker container

‎.github/workflows/twister.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- runs-on=${{ github.run_id }}
1414
- runner=64cpu-linux-x64
1515
# Keep aligned with target NCS version
16-
container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.3.0
16+
container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.4.0-rc1
1717
defaults:
1818
run:
1919
# Bash shell is needed to set toolchain related environment variables in docker container

‎applications/firmware_loader/ble_mcumgr/prj.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CONFIG_MCUMGR_GRP_OS_ECHO=y
3939
CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y
4040
CONFIG_MCUMGR_GRP_OS_BOOTLOADER_INFO=y
4141
CONFIG_NRF_SDH_BLE=y
42-
CONFIG_NRF_SECURITY=y
42+
CONFIG_PSA_CRYPTO=y
4343
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
4444
CONFIG_PSA_WANT_GENERATE_RANDOM=y
4545
CONFIG_BLE_MCUMGR=y

‎applications/installer/src/main.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ LOG_MODULE_REGISTER(installer, CONFIG_INSTALLER_LOG_LEVEL);
3030
#define EXPECTED_HEADER { 0x92, 0x11, 0xf2, 0xe9 }
3131
#define PROCESS_SECTOR_SIZE 4096
3232

33+
#define LOAD_OFFSET PARTITION_NODE_ADDRESS(DT_CHOSEN(zephyr_code_partition))
34+
3335
extern uintptr_t _flash_used;
3436
static const uint8_t expected_header[] = EXPECTED_HEADER;
3537

@@ -63,7 +65,7 @@ int main(void)
6365
struct bm_installs replacement_metadata;
6466
struct flash_area fa_installer = {
6567
.fa_id = 1,
66-
.fa_off = CONFIG_FLASH_LOAD_OFFSET,
68+
.fa_off = LOAD_OFFSET,
6769
.fa_size = PROCESS_SECTOR_SIZE,
6870
.fa_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_flash_controller)),
6971
};
@@ -74,7 +76,7 @@ int main(void)
7476
static uint8_t write_buffer[CONFIG_ROM_START_OFFSET] = { 0x00 };
7577
#endif
7678

77-
update_data = (struct bm_installs_update *)((int)&_flash_used + CONFIG_FLASH_LOAD_OFFSET);
79+
update_data = (struct bm_installs_update *)((int)&_flash_used + LOAD_OFFSET);
7880

7981
if (update_data == NULL) {
8082
LOG_ERR("Installer data is NULL");

‎boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,39 @@
2121
status = "okay";
2222

2323
partitions {
24-
compatible = "fixed-partitions";
2524
#address-cells = <1>;
2625
#size-cells = <1>;
26+
ranges;
2727

2828
slot0_partition: partition@0 {
29+
compatible = "zephyr,mapped-partition";
2930
label = "slot0";
3031
reg = <0x00000000 DT_SIZE_K(390)>;
3132
};
3233

3334
storage_partition: partition@61800 {
34-
compatible = "fixed-subpartitions";
35+
compatible = "zephyr,mapped-partition";
3536
label = "storage";
3637
reg = <0x00061800 DT_SIZE_K(8)>;
3738
ranges = <0x0 0x61800 DT_SIZE_K(8)>;
3839
#address-cells = <1>;
3940
#size-cells = <1>;
4041

4142
peer_manager_partition: partition@0 {
43+
compatible = "zephyr,mapped-partition";
4244
label = "peer_manager";
4345
reg = <0x00000000 DT_SIZE_K(4)>;
4446
};
4547

4648
storage0_partition: partition@1000 {
49+
compatible = "zephyr,mapped-partition";
4750
label = "storage0";
4851
reg = <0x00001000 DT_SIZE_K(4)>;
4952
};
5053
};
5154

5255
softdevice_partition: partition@63800 {
56+
compatible = "zephyr,mapped-partition";
5357
label = "softdevice";
5458
reg = <0x00063800 DT_SIZE_K(101)>;
5559
};

‎boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,32 @@
2929
status = "okay";
3030

3131
partitions {
32-
compatible = "fixed-partitions";
3332
#address-cells = <1>;
3433
#size-cells = <1>;
34+
ranges;
3535

3636
boot_partition: partition@0 {
37+
compatible = "zephyr,mapped-partition";
3738
label = "boot";
3839
reg = <0x00000000 DT_SIZE_K(31)>;
3940
};
4041

4142
storage_partition: partition@7c00 {
42-
compatible = "fixed-subpartitions";
43+
compatible = "zephyr,mapped-partition";
4344
label = "storage";
4445
reg = <0x00007c00 DT_SIZE_K(8)>;
4546
ranges = <0x0 0x7c00 DT_SIZE_K(8)>;
4647
#address-cells = <1>;
4748
#size-cells = <1>;
4849

4950
peer_manager_partition: partition@0 {
51+
compatible = "zephyr,mapped-partition";
5052
label = "peer_manager";
5153
reg = <0x00000000 DT_SIZE_K(4)>;
5254
};
5355

5456
storage0_partition: partition@1000 {
57+
compatible = "zephyr,mapped-partition";
5558
label = "storage0";
5659
reg = <0x00001000 DT_SIZE_K(4)>;
5760
};
@@ -60,21 +63,25 @@
6063
/* Area from 0x9c00 to 0xa000 is unused due to alignment */
6164

6265
slot0_partition: partition@a000 {
66+
compatible = "zephyr,mapped-partition";
6367
label = "slot0";
6468
reg = <0x0000a000 DT_SIZE_K(292)>;
6569
};
6670

6771
slot1_partition: partition@53000 {
72+
compatible = "zephyr,mapped-partition";
6873
label = "slot1";
6974
reg = <0x00053000 DT_SIZE_K(64)>;
7075
};
7176

7277
softdevice_partition: partition@63000 {
78+
compatible = "zephyr,mapped-partition";
7379
label = "softdevice";
7480
reg = <0x00063000 (DT_SIZE_K(103) + 0x200)>;
7581
};
7682

7783
metadata_partition: partition@7ce00 {
84+
compatible = "zephyr,mapped-partition";
7885
label = "metadata";
7986
reg = <0x0007ce00 0x200>;
8087
};

‎boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s145_softdevice.dts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,39 @@
2121
status = "okay";
2222

2323
partitions {
24-
compatible = "fixed-partitions";
2524
#address-cells = <1>;
2625
#size-cells = <1>;
26+
ranges;
2727

2828
slot0_partition: partition@0 {
29+
compatible = "zephyr,mapped-partition";
2930
label = "slot0";
3031
reg = <0x00000000 DT_SIZE_K(354)>;
3132
};
3233

3334
storage_partition: partition@58800 {
34-
compatible = "fixed-subpartitions";
35+
compatible = "zephyr,mapped-partition";
3536
label = "storage";
3637
reg = <0x00058800 DT_SIZE_K(8)>;
3738
ranges = <0x0 0x58800 DT_SIZE_K(8)>;
3839
#address-cells = <1>;
3940
#size-cells = <1>;
4041

4142
peer_manager_partition: partition@0 {
43+
compatible = "zephyr,mapped-partition";
4244
label = "peer_manager";
4345
reg = <0x00000000 DT_SIZE_K(4)>;
4446
};
4547

4648
storage0_partition: partition@1000 {
49+
compatible = "zephyr,mapped-partition";
4750
label = "storage0";
4851
reg = <0x00001000 DT_SIZE_K(4)>;
4952
};
5053
};
5154

5255
softdevice_partition: partition@5a800 {
56+
compatible = "zephyr,mapped-partition";
5357
label = "softdevice";
5458
reg = <0x0005a800 DT_SIZE_K(137)>;
5559
};

‎boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s145_softdevice_mcuboot.dts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,32 @@
2929
status = "okay";
3030

3131
partitions {
32-
compatible = "fixed-partitions";
3332
#address-cells = <1>;
3433
#size-cells = <1>;
34+
ranges;
3535

3636
boot_partition: partition@0 {
37+
compatible = "zephyr,mapped-partition";
3738
label = "boot";
3839
reg = <0x00000000 DT_SIZE_K(31)>;
3940
};
4041

4142
storage_partition: partition@7c00 {
42-
compatible = "fixed-subpartitions";
43+
compatible = "zephyr,mapped-partition";
4344
label = "storage";
4445
reg = <0x00007c00 DT_SIZE_K(8)>;
4546
ranges = <0x0 0x7c00 DT_SIZE_K(8)>;
4647
#address-cells = <1>;
4748
#size-cells = <1>;
4849

4950
peer_manager_partition: partition@0 {
51+
compatible = "zephyr,mapped-partition";
5052
label = "peer_manager";
5153
reg = <0x00000000 DT_SIZE_K(4)>;
5254
};
5355

5456
storage0_partition: partition@1000 {
57+
compatible = "zephyr,mapped-partition";
5558
label = "storage0";
5659
reg = <0x00001000 DT_SIZE_K(4)>;
5760
};
@@ -60,21 +63,25 @@
6063
/* Area from 0x9c00 to 0xa000 is unused due to alignment */
6164

6265
slot0_partition: partition@a000 {
66+
compatible = "zephyr,mapped-partition";
6367
label = "slot0";
6468
reg = <0x0000a000 DT_SIZE_K(256)>;
6569
};
6670

6771
slot1_partition: partition@4a000 {
72+
compatible = "zephyr,mapped-partition";
6873
label = "slot1";
6974
reg = <0x0004a000 DT_SIZE_K(64)>;
7075
};
7176

7277
softdevice_partition: partition@5a000 {
78+
compatible = "zephyr,mapped-partition";
7379
label = "softdevice";
7480
reg = <0x0005a000 (DT_SIZE_K(139) + 0x200)>;
7581
};
7682

7783
metadata_partition: partition@7ce00 {
84+
compatible = "zephyr,mapped-partition";
7885
label = "metadata";
7986
reg = <0x0007ce00 0x200>;
8087
};

‎boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,39 @@
2121
status = "okay";
2222

2323
partitions {
24-
compatible = "fixed-partitions";
2524
#address-cells = <1>;
2625
#size-cells = <1>;
26+
ranges;
2727

2828
slot0_partition: partition@0 {
29+
compatible = "zephyr,mapped-partition";
2930
label = "slot0";
3031
reg = <0x00000000 DT_SIZE_K(902)>;
3132
};
3233

3334
storage_partition: partition@e1800 {
34-
compatible = "fixed-subpartitions";
35+
compatible = "zephyr,mapped-partition";
3536
label = "storage";
3637
reg = <0x000e1800 DT_SIZE_K(8)>;
3738
ranges = <0x0 0xe1800 DT_SIZE_K(8)>;
3839
#address-cells = <1>;
3940
#size-cells = <1>;
4041

4142
peer_manager_partition: partition@0 {
43+
compatible = "zephyr,mapped-partition";
4244
label = "peer_manager";
4345
reg = <0x00000000 DT_SIZE_K(4)>;
4446
};
4547

4648
storage0_partition: partition@1000 {
49+
compatible = "zephyr,mapped-partition";
4750
label = "storage0";
4851
reg = <0x00001000 DT_SIZE_K(4)>;
4952
};
5053
};
5154

5255
softdevice_partition: partition@e3800 {
56+
compatible = "zephyr,mapped-partition";
5357
label = "softdevice";
5458
reg = <0x000e3800 DT_SIZE_K(101)>;
5559
};

‎boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,32 @@
2929
status = "okay";
3030

3131
partitions {
32-
compatible = "fixed-partitions";
3332
#address-cells = <1>;
3433
#size-cells = <1>;
34+
ranges;
3535

3636
boot_partition: partition@0 {
37+
compatible = "zephyr,mapped-partition";
3738
label = "boot";
3839
reg = <0x00000000 DT_SIZE_K(31)>;
3940
};
4041

4142
storage_partition: partition@7c00 {
42-
compatible = "fixed-subpartitions";
43+
compatible = "zephyr,mapped-partition";
4344
label = "storage";
4445
reg = <0x00007c00 DT_SIZE_K(8)>;
4546
ranges = <0x0 0x7c00 DT_SIZE_K(8)>;
4647
#address-cells = <1>;
4748
#size-cells = <1>;
4849

4950
peer_manager_partition: partition@0 {
51+
compatible = "zephyr,mapped-partition";
5052
label = "peer_manager";
5153
reg = <0x00000000 DT_SIZE_K(4)>;
5254
};
5355

5456
storage0_partition: partition@1000 {
57+
compatible = "zephyr,mapped-partition";
5558
label = "storage0";
5659
reg = <0x00001000 DT_SIZE_K(4)>;
5760
};
@@ -60,21 +63,25 @@
6063
/* Area from 0x9c00 to 0xa000 is unused due to alignment */
6164

6265
slot0_partition: partition@a000 {
66+
compatible = "zephyr,mapped-partition";
6367
label = "slot0";
6468
reg = <0x0000a000 DT_SIZE_K(804)>;
6569
};
6670

6771
slot1_partition: partition@d3000 {
72+
compatible = "zephyr,mapped-partition";
6873
label = "slot1";
6974
reg = <0x000d3000 DT_SIZE_K(64)>;
7075
};
7176

7277
softdevice_partition: partition@e3000 {
78+
compatible = "zephyr,mapped-partition";
7379
label = "softdevice";
7480
reg = <0x000e3000 (DT_SIZE_K(103) + 0x200)>;
7581
};
7682

7783
metadata_partition: partition@fce00 {
84+
compatible = "zephyr,mapped-partition";
7885
label = "metadata";
7986
reg = <0x000fce00 0x200>;
8087
};

0 commit comments

Comments
 (0)