Skip to content

[Test only, do not review] Manifest update serial util #806

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
eivindj-nordic wants to merge 4 commits into
base: main
Choose a base branch
from
+692 −116
Open

[Test only, do not review] Manifest update serial util #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e47e0e6
mgmt: mcumgr: transport: move serial_util
michalek-no May 27, 2026
de13ba5
mgmt: mcumgr: serial transport rework
michalek-no May 28, 2026
735da08
application: installer: add flash padding
michalek-no Jun 3, 2026
334b15d
manifest: update sdk-nrf to v3.4.0-rc1
eivindj-nordic May 19, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/build_samples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- runs-on=${{ github.run_id }}
- runner=64cpu-linux-x64
# Keep aligned with target NCS version
container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.2.0
container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.4.0-rc1
defaults:
run:
# Bash shell is needed to set toolchain related environment variables in docker container
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/twister.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- runs-on=${{ github.run_id }}
- runner=64cpu-linux-x64
# Keep aligned with target NCS version
container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.3.0
container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.4.0-rc1
defaults:
run:
# Bash shell is needed to set toolchain related environment variables in docker container
Expand Down
2 changes: 1 addition & 1 deletion applications/firmware_loader/ble_mcumgr/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ CONFIG_MCUMGR_GRP_OS_ECHO=y
CONFIG_MCUMGR_GRP_OS_MCUMGR_PARAMS=y
CONFIG_MCUMGR_GRP_OS_BOOTLOADER_INFO=y
CONFIG_NRF_SDH_BLE=y
CONFIG_NRF_SECURITY=y
CONFIG_PSA_CRYPTO=y
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
CONFIG_PSA_WANT_GENERATE_RANDOM=y
CONFIG_BLE_MCUMGR=y
Expand Down
12 changes: 9 additions & 3 deletions applications/installer/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#define EXPECTED_HEADER { 0x92, 0x11, 0xf2, 0xe9 }
#define PROCESS_SECTOR_SIZE 4096

#define LOAD_OFFSET PARTITION_NODE_ADDRESS(DT_CHOSEN(zephyr_code_partition))

extern uintptr_t _flash_used;
static const uint8_t expected_header[] = EXPECTED_HEADER;

Expand Down Expand Up @@ -63,7 +65,7 @@
struct bm_installs replacement_metadata;
struct flash_area fa_installer = {
.fa_id = 1,
.fa_off = CONFIG_FLASH_LOAD_OFFSET,
.fa_off = LOAD_OFFSET,
.fa_size = PROCESS_SECTOR_SIZE,
.fa_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_flash_controller)),
};
Expand All @@ -74,7 +76,7 @@
static uint8_t write_buffer[CONFIG_ROM_START_OFFSET] = { 0x00 };
#endif

update_data = (struct bm_installs_update *)((int)&_flash_used + CONFIG_FLASH_LOAD_OFFSET);
update_data = (struct bm_installs_update *)((int)&_flash_used + LOAD_OFFSET);

if (update_data == NULL) {
LOG_ERR("Installer data is NULL");
Expand Down Expand Up @@ -198,6 +200,10 @@
}
#endif

int pad = CONFIG_DT_FLASH_WRITE_BLOCK_SIZE - (process_size % CONFIG_DT_FLASH_WRITE_BLOCK_SIZE);

Check warning on line 203 in applications/installer/src/main.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

LONG_LINE 

applications/installer/src/main.c:203  line length of 127 exceeds 100 columns
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.

process_size += pad;

rc = flash_area_write(&fa, pos, (void *)read_pos, process_size);

if (rc) {
Expand All @@ -218,7 +224,7 @@
"V_DELAY_IMAGE_CHUNK_COPY");
}

++i;
i-=-1;

Check failure on line 227 in applications/installer/src/main.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

SPACING 

applications/installer/src/main.c:227  space required before that '-' (ctx:OxV)
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.

Check failure on line 227 in applications/installer/src/main.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

SPACING 

applications/installer/src/main.c:227  spaces required around that '-=' (ctx:VxO)
See https://docs.zephyrproject.org/latest/contribute/guidelines.html#coding-style for more details.

if (i < CONFIG_BM_INSTALL_IMAGES) {
VERIFICATION_DELAY(CONFIG_APP_BM_INSTALLER_NEXT_IMAGE_COPY_DELAY_MS,
Expand Down
8 changes: 6 additions & 2 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,39 @@
status = "okay";

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

slot0_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "slot0";
reg = <0x00000000 DT_SIZE_K(390)>;
};

storage_partition: partition@61800 {
compatible = "fixed-subpartitions";
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00061800 DT_SIZE_K(8)>;
ranges = <0x0 0x61800 DT_SIZE_K(8)>;
#address-cells = <1>;
#size-cells = <1>;

peer_manager_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "peer_manager";
reg = <0x00000000 DT_SIZE_K(4)>;
};

storage0_partition: partition@1000 {
compatible = "zephyr,mapped-partition";
label = "storage0";
reg = <0x00001000 DT_SIZE_K(4)>;
};
};

softdevice_partition: partition@63800 {
compatible = "zephyr,mapped-partition";
label = "softdevice";
reg = <0x00063800 DT_SIZE_K(101)>;
};
Expand Down
11 changes: 9 additions & 2 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,32 @@
status = "okay";

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

boot_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "boot";
reg = <0x00000000 DT_SIZE_K(31)>;
};

storage_partition: partition@7c00 {
compatible = "fixed-subpartitions";
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00007c00 DT_SIZE_K(8)>;
ranges = <0x0 0x7c00 DT_SIZE_K(8)>;
#address-cells = <1>;
#size-cells = <1>;

peer_manager_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "peer_manager";
reg = <0x00000000 DT_SIZE_K(4)>;
};

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

slot0_partition: partition@a000 {
compatible = "zephyr,mapped-partition";
label = "slot0";
reg = <0x0000a000 DT_SIZE_K(292)>;
};

slot1_partition: partition@53000 {
compatible = "zephyr,mapped-partition";
label = "slot1";
reg = <0x00053000 DT_SIZE_K(64)>;
};

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

metadata_partition: partition@7ce00 {
compatible = "zephyr,mapped-partition";
label = "metadata";
reg = <0x0007ce00 0x200>;
};
Expand Down
8 changes: 6 additions & 2 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s145_softdevice.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,39 @@
status = "okay";

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

slot0_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "slot0";
reg = <0x00000000 DT_SIZE_K(354)>;
};

storage_partition: partition@58800 {
compatible = "fixed-subpartitions";
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00058800 DT_SIZE_K(8)>;
ranges = <0x0 0x58800 DT_SIZE_K(8)>;
#address-cells = <1>;
#size-cells = <1>;

peer_manager_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "peer_manager";
reg = <0x00000000 DT_SIZE_K(4)>;
};

storage0_partition: partition@1000 {
compatible = "zephyr,mapped-partition";
label = "storage0";
reg = <0x00001000 DT_SIZE_K(4)>;
};
};

softdevice_partition: partition@5a800 {
compatible = "zephyr,mapped-partition";
label = "softdevice";
reg = <0x0005a800 DT_SIZE_K(137)>;
};
Expand Down
11 changes: 9 additions & 2 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s145_softdevice_mcuboot.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,32 @@
status = "okay";

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

boot_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "boot";
reg = <0x00000000 DT_SIZE_K(31)>;
};

storage_partition: partition@7c00 {
compatible = "fixed-subpartitions";
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00007c00 DT_SIZE_K(8)>;
ranges = <0x0 0x7c00 DT_SIZE_K(8)>;
#address-cells = <1>;
#size-cells = <1>;

peer_manager_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "peer_manager";
reg = <0x00000000 DT_SIZE_K(4)>;
};

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

slot0_partition: partition@a000 {
compatible = "zephyr,mapped-partition";
label = "slot0";
reg = <0x0000a000 DT_SIZE_K(256)>;
};

slot1_partition: partition@4a000 {
compatible = "zephyr,mapped-partition";
label = "slot1";
reg = <0x0004a000 DT_SIZE_K(64)>;
};

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

metadata_partition: partition@7ce00 {
compatible = "zephyr,mapped-partition";
label = "metadata";
reg = <0x0007ce00 0x200>;
};
Expand Down
8 changes: 6 additions & 2 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,39 @@
status = "okay";

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

slot0_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "slot0";
reg = <0x00000000 DT_SIZE_K(902)>;
};

storage_partition: partition@e1800 {
compatible = "fixed-subpartitions";
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x000e1800 DT_SIZE_K(8)>;
ranges = <0x0 0xe1800 DT_SIZE_K(8)>;
#address-cells = <1>;
#size-cells = <1>;

peer_manager_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "peer_manager";
reg = <0x00000000 DT_SIZE_K(4)>;
};

storage0_partition: partition@1000 {
compatible = "zephyr,mapped-partition";
label = "storage0";
reg = <0x00001000 DT_SIZE_K(4)>;
};
};

softdevice_partition: partition@e3800 {
compatible = "zephyr,mapped-partition";
label = "softdevice";
reg = <0x000e3800 DT_SIZE_K(101)>;
};
Expand Down
11 changes: 9 additions & 2 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,32 @@
status = "okay";

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

boot_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "boot";
reg = <0x00000000 DT_SIZE_K(31)>;
};

storage_partition: partition@7c00 {
compatible = "fixed-subpartitions";
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00007c00 DT_SIZE_K(8)>;
ranges = <0x0 0x7c00 DT_SIZE_K(8)>;
#address-cells = <1>;
#size-cells = <1>;

peer_manager_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "peer_manager";
reg = <0x00000000 DT_SIZE_K(4)>;
};

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

slot0_partition: partition@a000 {
compatible = "zephyr,mapped-partition";
label = "slot0";
reg = <0x0000a000 DT_SIZE_K(804)>;
};

slot1_partition: partition@d3000 {
compatible = "zephyr,mapped-partition";
label = "slot1";
reg = <0x000d3000 DT_SIZE_K(64)>;
};

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

metadata_partition: partition@fce00 {
compatible = "zephyr,mapped-partition";
label = "metadata";
reg = <0x000fce00 0x200>;
};
Expand Down
Loading
Loading