Skip to content

RT-1000-396: Adjust SMP FOTA validation and status report sequence #5

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
vladimirkhusainov-emcraft merged 1 commit into from
Mar 6, 2025
Merged

RT-1000-396: Adjust SMP FOTA validation and status report sequence #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 subsys/net/lib/nrf_cloud/src/nrf_cloud_fota.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ static void install_smp_update(struct nrf_cloud_fota_job *fota)
* when called after image installation.
* For now, just use the standard FOTA flow: reboot and then read the version on startup.
*/
int ret = pending_fota_job_validate();
int ret = nrf_cloud_fota_smp_install();

if (ret < 0) {
current_fota.status = NRF_CLOUD_FOTA_FAILED;
Expand Down
6 changes: 2 additions & 4 deletions subsys/net/lib/nrf_cloud/src/nrf_cloud_fota_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,8 @@ static enum nrf_cloud_fota_validate_status modem_full_fota_validate_get(void)
static enum nrf_cloud_fota_validate_status smp_fota_validate_get(void)
{
#if defined(CONFIG_NRF_CLOUD_FOTA_SMP)
return nrf_cloud_fota_smp_install() ?
NRF_CLOUD_FOTA_VALIDATE_FAIL : NRF_CLOUD_FOTA_VALIDATE_PASS;
/* TODO: validate the new firmware */
return NRF_CLOUD_FOTA_VALIDATE_PASS;
#endif
return NRF_CLOUD_FOTA_VALIDATE_UNKNOWN;
}
Expand Down Expand Up @@ -499,8 +499,6 @@ int nrf_cloud_pending_fota_job_process(struct nrf_cloud_settings_fota_job * cons
job->validate = boot_fota_validate_get(job->bl_flags);
} else if (job->type == NRF_CLOUD_FOTA_SMP) {
job->validate = smp_fota_validate_get();
/* TODO: reboot for now, but this should not be necessary */
*reboot_required = true;
} else {
LOG_ERR("Unknown FOTA job type: %d", job->type);
return -ENOENT;
Expand Down