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.

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

[nrf fromlist] susbys/dfu/img_util: refined ERASE PROGRESSIVELY imple… #2073

Merged
merged 2 commits into from
Oct 23, 2024

Conversation

nvlsianpu
Copy link
Contributor

…mentation

Moved MCUboot trailer's status erase ahead any write operation.

Upstream PR: zephyrproject-rtos/zephyr#79152

Copy link
Contributor

@kapi-no kapi-no left a comment

Choose a reason for hiding this comment

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

The high-level DFU test for our sample project works now. Thanks for the fix!

@nvlsianpu nvlsianpu force-pushed the dfu-img_util-fix-rainbow-erase branch 3 times, most recently from a34c93f to 305fc23 Compare October 8, 2024 20:23
@kapi-no kapi-no self-requested a review October 9, 2024 10:09
@kapi-no kapi-no added this to the ncs-2.8.0 milestone Oct 10, 2024
@nvlsianpu nvlsianpu force-pushed the dfu-img_util-fix-rainbow-erase branch 2 times, most recently from 1cc6b02 to 554cd97 Compare October 11, 2024 12:27
Copy link
Contributor

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

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

Apply comments from upstream to upstream then reapply here

@nvlsianpu nvlsianpu force-pushed the dfu-img_util-fix-rainbow-erase branch from 554cd97 to 4d75caf Compare October 14, 2024 08:11
@nvlsianpu
Copy link
Contributor Author

@nordicjm Revisit.

@nordicjm
Copy link
Contributor

@nordicjm Revisit.

The changes need to be made to the upstream PR, then brought in with a cherry pick, fromlist/fromtree must be a 1:1 with the upstream commits

@nvlsianpu nvlsianpu force-pushed the dfu-img_util-fix-rainbow-erase branch 2 times, most recently from 9ce031f to a495ed0 Compare October 17, 2024 08:11
@nvlsianpu
Copy link
Contributor Author

@nordicjm Synchronized.

@kapi-no kapi-no requested a review from nordicjm October 17, 2024 09:52
@kapi-no
Copy link
Contributor

kapi-no commented Oct 17, 2024

@nvlsianpu, please rebase as there is new GH action now and the sdk-zephyr PRs need to be rebased for it to run properly

@nvlsianpu nvlsianpu force-pushed the dfu-img_util-fix-rainbow-erase branch from a495ed0 to a0a34c2 Compare October 17, 2024 10:01
@nvlsianpu
Copy link
Contributor Author

@kapi-no rebased

@kapi-no
Copy link
Contributor

kapi-no commented Oct 17, 2024

@carlescufi, why is the "Commit tags" job failing? It seems that the script is not able to cherry-pick the 32eab50df3a5e8f9ff1299261bfb21f5714fd9ab commit from the following PR:

https://github.com/zephyrproject-rtos/zephyr/pull/79152/commits

@carlescufi
Copy link
Contributor

@carlescufi, why is the "Commit tags" job failing? It seems that the script is not able to cherry-pick the 32eab50df3a5e8f9ff1299261bfb21f5714fd9ab commit from the following PR:

https://github.com/zephyrproject-rtos/zephyr/pull/79152/commits

@nvlsianpu @kapi-no this means that the commit does not apply cleanly, and thus @nvlsianpu modified it while cherry-picking. Is that the case @nvlsianpu ?

@nvlsianpu
Copy link
Contributor Author

nvlsianpu commented Oct 17, 2024

@carlescufi Yes that the case. I did 1st approach to that fix and this is the second one. In the end the code is the same, but commit content differs. Is that mean that I should do the revert before cherry-picking the fromlist commit?

@nvlsianpu nvlsianpu force-pushed the dfu-img_util-fix-rainbow-erase branch 3 times, most recently from f47b8ab to c1c8e9a Compare October 19, 2024 09:04
@kapi-no
Copy link
Contributor

kapi-no commented Oct 22, 2024

This is needed to fix the upmerge regression for the DFU operation in the Fast Pair Locator Tag sample. The DFU process currently fails. Please do not remove the NCS 2.8 milestone.

@HaavardRei
Copy link
Contributor

This is needed to fix the upmerge regression for the DFU operation in the Fast Pair Locator Tag sample. The DFU process currently fails. Please do not remove the NCS 2.8 milestone.

Also needed for Mesh as DFU image upload on nRF54L15 fails due to the commit being reverted.

…LY for non-flash mem"

This reverts commit 30f066a.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
…mentation

Moved MCUboot trailer's status erase ahead any write operation,
which is step which helps with addition of support for devices
don't require explicit pager erase.
For these kind of devices flattening of mcuboot image status in
the trailer was introduced.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
(cherry picked from commit 17c15e3)
@nvlsianpu nvlsianpu force-pushed the dfu-img_util-fix-rainbow-erase branch from c1c8e9a to 0a78dd8 Compare October 22, 2024 12:09
@nordicjm nordicjm merged commit 2542e3c into nrfconnect:main Oct 23, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants