Skip to content
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

Jump to bottom

Integrate DFU target SMP #12073

Merged
merged 5 commits into from
Sep 21, 2023
Merged

Integrate DFU target SMP #12073

merged 5 commits into from
Sep 21, 2023

Conversation

jheiskan81
Copy link
Contributor

@jheiskan81 jheiskan81 commented Aug 18, 2023 •
edited
Loading

Fota download utils

  • Created FOTA download client for support for existing DFU target

MCUmgr SMP client library

  • Library for init DFU TARGET SMP and MCUmgr IMG & OS client for FOTA.
  • shell for testing DFU SMP with Fota download utils and MCMGR client

LwM2M utils library updates

  • Integrated FOTA download client to LwM2M utils library
  • Extend Advanced FOTA object support new instance for SMP
  • Advanced FOTA support dynamic instance count

LwM2M client Sample update

  • LwM2M Client sample support for SMP instance to FOTA
  • Init MCUmgr client

SMP server sample

  • MCUmgr SMP server for Evaluate external FOTA with nRF52840 at nRF9160DK

MCUboot still missing from upmerge 4 commit:

  • 6512d4c89 boot: boot_serial: Fix wrong cbor type for confirm
  • 8c3ae1674 boot_serial: fix image number handle in image upload request
  • 37c74a8dc boot_serial: fix misuse of 'matched' param from zcbor_map_decode_bulk()
  • 2cffb3558 boot_serial: Fix showing images that are not valid

I have been tested with those commits that MCUBoot recovery mode works.

@github-actions github-actions bot added the doc-required PR must not be merged without tech writer approval. label Aug 18, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Aug 18, 2023 •
edited
Loading

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
test-ci-nrfconnect-boot-fw-update X
test-fw-nrfconnect-nrf-iot_mosh X
test-fw-nrfconnect-nrf-iot_serial_lte_modem X
test-fw-nrfconnect-nrf-iot_zephyr_lwm2m X

Detailed information of selected test modules

Note: This message is automatically posted and updated by the CI

@jheiskan81 jheiskan81 force-pushed the mcumgr_client_dev branch 2 times, most recently from 0de4967 to 8e9e818 Compare August 18, 2023 11:45
@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

@github-actions github-actions bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. and removed doc-required PR must not be merged without tech writer approval. labels Aug 21, 2023
@jheiskan81 jheiskan81 force-pushed the mcumgr_client_dev branch 2 times, most recently from 539aecd to 03640d1 Compare August 21, 2023 09:11
SeppoTakalo
SeppoTakalo requested changes Aug 21, 2023
View reviewed changes
include/net/fota_download.h Outdated Show resolved Hide resolved
include/net/fota_download_client.h Outdated Show resolved Hide resolved
samples/cellular/lwm2m_client/src/main.c Outdated Show resolved Hide resolved
samples/cellular/lwm2m_client/src/main.c Outdated Show resolved Hide resolved
subsys/net/lib/fota_download/Kconfig Outdated Show resolved Hide resolved
subsys/net/lib/mcumgr_smp_client/src/mcumgr_smp_client_shell.c Outdated Show resolved Hide resolved
@jheiskan81 jheiskan81 force-pushed the mcumgr_client_dev branch 4 times, most recently from ebd9758 to c59c2d5 Compare August 22, 2023 12:32
@jheiskan81
Copy link
Contributor Author

@SeppoTakalo I have fixed your comments

@jheiskan81
Copy link
Contributor Author

@juhaylinen Thanks for review. I have fix your comment's

nordicjm
nordicjm requested changes Sep 15, 2023
View reviewed changes
samples/cellular/lwm2m_client/fota_external_mcu.rst Outdated Show resolved Hide resolved
samples/cellular/smp_client/prj.conf Outdated Show resolved Hide resolved
samples/cellular/smp_svr/prj.conf Outdated
CONFIG_IMG_MANAGER=y
CONFIG_MCUBOOT_IMG_MANAGER=y
# App image version
CONFIG_MCUBOOT_IMAGE_VERSION="1.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION

@nordicjm
Copy link
Contributor

(rebase is required)

@jheiskan81
Copy link
Contributor Author

@nordicjm rebased and fixed.

@umapraseeda
Copy link
Contributor

@nordicjm, FYI, I am going to add a commit soon (after offline discussions with @peknis and @jheiskan81).

@umapraseeda
Copy link
Contributor

Missing RST for smp_client (discussed with @jheiskan81 - smp_client folder to be removed eventually before merge).

@jheiskan81
Copy link
Contributor Author

@nordicjm @umapraseeda I remove SMP client sample commit from this PR. I will do separate PR for this sample with proper documentation.

@jheiskan81 jheiskan81 force-pushed the mcumgr_client_dev branch 3 times, most recently from 872085a to 95dace2 Compare September 20, 2023 08:54
@jheiskan81
Copy link
Contributor Author

Rebased for new CI Run.

net: fota_download: Fota download DFU_TARGET_SMP update
a4e1a8a 
Updated API for support DFU_TARGET_SMP.

Extend Fota download util library which will support all fota
DFU target's for download, schedule and activate image.

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
Juha Heiskanen added 3 commits September 21, 2023 09:45
net: mcumgr_smp_client: MCUmgr/SMP client with shell
5d9bc49 
Library for init DFU TARGET SMP and MCUmgr IMG & OS client.
Library support download new Image for External MCU by
fota download client, Image enable, Reset and Read Image info.

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
net: lwm2m_client_utils: Multi instance Fota support for SPM
283379c 
Update Advanced FOTA for support dynamic instance count.
Default instance count is 2 and 3 if DFU_TARGET_SPM is enabled.

Update Linked instance resource to support multiple linked
update process.

Register SPM Client instance to FOTA.

Integrated new Fota download client and removed DFU target
spesific code.

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
samples: smp_svr: Reference sample for Fota external
b62c0a2 
Sample how to activate MCUBoot recovery or SMP server for
external Fota.

Review edits for SMP server sample doc

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
Signed-off-by: Uma Praseeda <uma.praseeda@nordicsemi.no>
@jheiskan81
Copy link
Contributor Author

jheiskan81 commented Sep 21, 2023 •
edited
Loading

Fix possible coming issue from next zephyr upmerge:

IMG_MGMT_HASH_LEN -> IMG_MGMT_DATA_SHA_LEN

samples: lwm2m_client: MCUMGR client fota update
ee28295 
Added overlay for support MCUMGR client.
DTC overlay for activate Recovery mode.
Move I2C to thing board definition.
Review edits for LwM2M client sample doc.

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
Signed-off-by: Uma Praseeda <uma.praseeda@nordicsemi.no>
@rlubos rlubos merged commit 73eec34 into nrfconnect:main Sep 21, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hakonfam hakonfam hakonfam left review comments

@peknis peknis peknis approved these changes

@umapraseeda umapraseeda umapraseeda approved these changes

@nordicjm nordicjm nordicjm approved these changes

@juhaylinen juhaylinen juhaylinen approved these changes

@SeppoTakalo SeppoTakalo SeppoTakalo approved these changes

@rlubos rlubos Awaiting requested review from rlubos

@sigvartmh sigvartmh Awaiting requested review from sigvartmh

@lemrey lemrey Awaiting requested review from lemrey

@anangl anangl Awaiting requested review from anangl

@carlescufi carlescufi Awaiting requested review from carlescufi

Assignees
No one assigned
Labels
doc-required PR must not be merged without tech writer approval.
Projects
None yet
Milestone
2.5.0
Development

Successfully merging this pull request may close these issues.
9 participants
@jheiskan81 @NordicBuilder @nordicjm @umapraseeda @hakonfam @SeppoTakalo @juhaylinen @peknis @rlubos