Skip to content

[EIS-449] mcumgr DFU #241

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

Merged
merged 6 commits into from
Sep 9, 2024
Merged

[EIS-449] mcumgr DFU #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a94da4
manifest: update zephyr fork
JordanYates Sep 8, 2024
1b205d8
scripts: vscode: add bl2 `.elf` to TFM debug
JordanYates Sep 8, 2024
0e5d1b2
snippets: infuse: tauro: force disable SD in bootloader
JordanYates Sep 9, 2024
9a65b14
snippets: infuse: fix tfm partition config
JordanYates Sep 8, 2024
e5173a7
kconfig: defaults: core: allow confirming TF-M images
JordanYates Sep 8, 2024
b783927
kconfig: defaults: core: fix BT DFU
JordanYates Sep 9, 2024
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
10 changes: 10 additions & 0 deletions Kconfig.defaults.core
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,16 @@ configdefault MCUMGR_SMP_SUPPORT_ORIGINAL_PROTOCOL
default n
configdefault MCUMGR_TRANSPORT_BT
default y
configdefault MCUMGR_TRANSPORT_BT_REASSEMBLY
default y
# nRF Connect for Mobile assumes at least 512 bytes payload available
configdefault MCUMGR_TRANSPORT_NETBUF_SIZE
default 520
# TF-M uses `OVERWRITE-ONLY`, which requires confirming non-active images
configdefault MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_IMAGE_ANY
default y if BUILD_WITH_TFM
configdefault MCUMGR_GRP_IMG_ALLOW_ERASE_PENDING
default y if BUILD_WITH_TFM
configdefault MCUMGR_GRP_OS_INFUSE
default y
configdefault MCUMGR_GRP_IMG
Expand Down
6 changes: 6 additions & 0 deletions scripts/west_commands/vscode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,12 @@ def _tfm_build(self, build_dir, cache):
launch["configurations"][0]["executable"] = str(build_dir / "bin" / "tfm_s.elf")
launch["configurations"][1]["executable"] = str(build_dir / "bin" / "tfm_s.elf")

bl2_elf = build_dir / "bin" / "bl2.elf"
if bl2_elf.exists():
launch["configurations"][0]["preAttachCommands"] = [
f"add-symbol-file {bl2_elf}"
]

# Get options from parent Zephyr build
parent_cache = zcmake.CMakeCache.from_build_dir(build_dir.parent)
c_cpp_properties["configurations"][0]["compilerPath"] = parent_cache.get(
Expand Down
14 changes: 7 additions & 7 deletions snippets/infuse/boards/nrf7002dk_nrf5340_cpuapp_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@
};
slot0_partition: partition@10000 {
label = "image-0";
reg = <0x00010000 0x000F0000>;
reg = <0x00010000 0x000E0000>;
};
slot0_s_partition: subpartition@10000 {
label = "image-0-secure";
reg = <0x00010000 0x00030000>;
};
slot0_ns_partition: subpartition@40000 {
label = "image-0-nonsecure";
reg = <0x00040000 0xC0000>;
reg = <0x00040000 0x000B0000>;
};
};
};
Expand All @@ -100,19 +100,19 @@

slot1_partition: partition@0 {
label = "image-1";
reg = <0x00000000 0x30000>;
reg = <0x00000000 0x000E0000>;
};
slot1_s_partition: subpartition@0 {
label = "image-1-secure";
reg = <0x00000000 0x30000>;
reg = <0x00000000 0x00030000>;
};
slot1_ns_partition: subpartition@30000 {
label = "image-1-nonsecure";
reg = <0x00030000 0xC0000>;
reg = <0x00030000 0x000B0000>;
};
data_logger_partition: partition@100000 {
data_logger_partition: partition@E0000 {
label = "data_logger";
reg = <0x00100000 0x700000>;
reg = <0x000E0000 0x000720000>;
};
};
};
Expand Down
16 changes: 9 additions & 7 deletions snippets/infuse/boards/tauro_nrf9151_ns.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
write-block-size = <1>;
img-secondary-secure = <&slot1_s_partition>;
img-secondary-nonsecure = <&slot1_ns_partition>;
/* Drive pin high to disable SD card interface */
extra-defines = "SPI_NOR_ENABLE_PIN=20";
};
};

Expand Down Expand Up @@ -107,15 +109,15 @@
};
slot0_partition: partition@10000 {
label = "image-0";
reg = <0x00010000 0x000F0000>;
reg = <0x00010000 0x000E0000>;
};
slot0_s_partition: subpartition@10000 {
label = "image-0-secure";
reg = <0x00010000 0x00030000>;
};
slot0_ns_partition: subpartition@40000 {
label = "image-0-nonsecure";
reg = <0x00040000 0xC0000>;
reg = <0x00040000 0x000B0000>;
};
};
};
Expand Down Expand Up @@ -166,19 +168,19 @@

slot1_partition: partition@0 {
label = "image-1";
reg = <0x00000000 0xF0000>;
reg = <0x00000000 0x000E0000>;
};
slot1_s_partition: subpartition@0 {
label = "image-1-secure";
reg = <0x00000000 0x30000>;
reg = <0x00000000 0x00030000>;
};
slot1_ns_partition: subpartition@30000 {
label = "image-1-nonsecure";
reg = <0x00030000 0xC0000>;
reg = <0x00030000 0x000B0000>;
};
data_logger_partition: partition@F0000 {
data_logger_partition: partition@E0000 {
label = "data_logger";
reg = <0x000F0000 0xF10000>;
reg = <0x000E0000 0x000F20000>;
};
};
};
18 changes: 8 additions & 10 deletions snippets/infuse/boards/thingy53_nrf5340_cpuapp_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,15 @@
};
slot0_partition: partition@10000 {
label = "image-0";
reg = <0x00010000 0xF0000>;
reg = <0x00010000 0x000E0000>;
};
slot0_s_partition: subpartition@10000 {
label = "image-0-secure";
reg = <0x00010000 0x30000>;
reg = <0x00010000 0x00030000>;
};
slot0_ns_partition: subpartition@40000 {
label = "image-0-nonsecure";
reg = <0x00040000 0xC0000>;
reg = <0x00040000 0x000B0000>;
};
tfm_ps_partition: partition@f0000 {
label = "tfm-ps";
Expand All @@ -167,23 +167,21 @@
#address-cells = <1>;
#size-cells = <1>;


slot1_partition: partition@0 {
label = "image-1";
reg = <0x00000000 0xF0000>;
reg = <0x00000000 0x000E0000>;
};
slot1_s_partition: subpartition@0 {
label = "image-1-secure";
reg = <0x00000000 0x30000>;
reg = <0x00000000 0x00030000>;
};
slot1_ns_partition: subpartition@30000 {
label = "image-1-nonsecure";
reg = <0x00030000 0xC0000>;
reg = <0x00030000 0x000B0000>;
};

data_logger_partition: partition@100000 {
data_logger_partition: partition@E0000 {
label = "data_logger";
reg = <0x00100000 0x700000>;
reg = <0x000E0000 0x000720000>;
};
};
};
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ manifest:

projects:
- name: zephyr
revision: 990770d96b0f0d2da015b4a0ce244f64f0594e21
revision: 04d8855a9746225849dd1591231c5ba4d6a6692b
# Limit imported repositories to reduce clone time
import:
name-allowlist:
Expand Down
Loading