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

[EFR32 OTA] Invoke Silabs API for writing, verifying and applying the image #13499

Merged
merged 13 commits into from
Jan 13, 2022
Merged

[EFR32 OTA] Invoke Silabs API for writing, verifying and applying the image #13499

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
83a7765
Code for testing bootloader integration
selissia Dec 30, 2021
c746890
Add bootloader API calls
selissia Jan 3, 2022
1e1f7b2
Add the rest of booloader calls to EFR32 OTA Requestor
selissia Jan 4, 2022
dafa839
Merge branch 'master' of github.com:selissia/connectedhomeip into sil…
selissia Jan 7, 2022
29c4941
Merge branch 'master' of github.com:selissia/connectedhomeip into sil…
selissia Jan 10, 2022
5adcb36
Call the OTARequestor Init() method
selissia Jan 10, 2022
1265e61
Use correct booloader API
selissia Jan 11, 2022
2ed0c90
Merge branch 'master' of github.com:selissia/connectedhomeip into sil…
selissia Jan 13, 2022
b3c09d8
Close exchange when session is released (#13448)
kghost Jan 11, 2022
b51532b
Merge branch 'silabs_bootloader_1' of github.com:selissia/connectedho…
selissia Jan 13, 2022
4b4a5a4
Clean up comments and debug code
selissia Jan 13, 2022
06ea1a3
Restyled by whitespace
restyled-commits Jan 13, 2022
cd5c399
Restyled by clang-format
restyled-commits Jan 13, 2022
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
Prev Previous commit
Next Next commit
Use correct booloader API
  • Loading branch information
@selissia
selissia committed Jan 11, 2022
commit 1265e6157eca17eca175accec632bad9ca316e4b
15 changes: 10 additions & 5 deletions src/platform/EFR32/OTAImageProcessorImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,20 @@ CHIP_ERROR OTAImageProcessorImpl::Apply()
{
uint32_t err = SL_BOOTLOADER_OK;

ChipLogError(SoftwareUpdate, "LISS Apply() is called ");
// Assuming that bootloader_verifyImage() call is not too expensive and
// doesn't need to be offladed to a different task
// doesn't need to be offloaded to a different task
err = bootloader_verifyImage(mSlotId, NULL);
if (err != SL_BOOTLOADER_OK)
{
ChipLogError(SoftwareUpdate, "bootloader_verifyImage error %ld", err);
return CHIP_ERROR_INTERNAL;
}

err = bootloader_setImageToBootload(mSlotId);
if (err != SL_BOOTLOADER_OK)
{
ChipLogError(SoftwareUpdate, "setImageToBootload error %ld", err);
return CHIP_ERROR_INTERNAL;
}

Expand Down Expand Up @@ -123,7 +126,7 @@ void OTAImageProcessorImpl::HandlePrepareDownload(intptr_t context)
bootloader_init();
mSlotId = 0; // Single slot unless we support multiple images
mWriteOffset = 0;
err = bootloader_eraseStorageSlot(mSlotId);
// err = bootloader_eraseStorageSlot(mSlotId);

imageProcessor->mDownloader->OnPreparedForDownload(err == SL_BOOTLOADER_OK ? CHIP_NO_ERROR : CHIP_ERROR_INTERNAL);
}
Expand Down Expand Up @@ -170,11 +173,13 @@ void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)

// TODO: Process block header if any

err = bootloader_writeStorage(mSlotId, imageProcessor->mBlock.size(),
reinterpret_cast<uint8_t *>(imageProcessor->mBlock.data()), mWriteOffset);
err = bootloader_eraseWriteStorage(mSlotId, mWriteOffset,
reinterpret_cast<uint8_t *>(imageProcessor->mBlock.data()), imageProcessor->mBlock.size());

if (err)
{
{
ChipLogError(SoftwareUpdate, "bootloader_eraseWriteStorage err %ld", err);

imageProcessor->mDownloader->EndDownload(CHIP_ERROR_WRITE_FAILED);
return;
}
Expand Down