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

M2354: Generate unique MCUboot image version #15027

Merged
merged 1 commit into from
Sep 8, 2021

Conversation

ccli8
Copy link
Contributor

@ccli8 ccli8 commented Aug 27, 2021

Summary of changes

This PR tries to change TF-M post-build script to generate unique MCUboot image version. This makes image version unique fetched via PSA Firmware Update API psa_fwu_query() and can help support secure or combined secure/non-secure firmware update. Refer to the discussion thread for difficulties with their update.


Pull request type

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[] No Tests required for this change (E.g docs only update)
[x] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

@ciarmcom ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Aug 27, 2021
@ciarmcom
Copy link
Member

@ccli8, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

@ccli8
Copy link
Contributor Author

ccli8 commented Aug 27, 2021

@LDong-Arm Same as #14441, this PR changes frozen tools/targets to update post-build script for M2354 for Mbed CLI 1.

0xc0170
0xc0170 previously approved these changes Aug 30, 2021
LDong-Arm
LDong-Arm previously approved these changes Aug 31, 2021
@LDong-Arm LDong-Arm mentioned this pull request Aug 31, 2021
Change MCUboot image versioning to meet requirements below:
1. Major.Minor.Revision must be non-decremental when used to derive security counter (-s 'auto').
2. Make Major.Minor.Revision+Build incremental to identify the firmware itself through psa_fwu_query().
3. Get around MCUboot failure with TF-M underestimated MAX_BOOT_RECORD_SZ
@ccli8 ccli8 force-pushed the nuvoton_m2354_tfm_fw_version branch from f74d4d9 to dcd30e0 Compare September 2, 2021 01:18
@mergify mergify bot dismissed stale reviews from 0xc0170 and LDong-Arm September 2, 2021 01:18

Pull request has been modified.

@ccli8
Copy link
Contributor Author

ccli8 commented Sep 2, 2021

Rebased for issue like #15030 (comment)

Copy link
Contributor

@LDong-Arm LDong-Arm left a comment

Choose a reason for hiding this comment

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

LGTM. We should ignore the frozen tools check failure, because the Nuvoton target is not used by the legacy tools.

@0xc0170
Copy link
Contributor

0xc0170 commented Sep 2, 2021

CI started

@mbed-ci
Copy link

mbed-ci commented Sep 2, 2021

Jenkins CI Test : ✔️ SUCCESS

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs Status
jenkins-ci/mbed-os-ci_unittests ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_greentea-test ✔️

@ciarmcom ciarmcom added the stale Stale Pull Request label Sep 7, 2021
@ciarmcom
Copy link
Member

ciarmcom commented Sep 7, 2021

This pull request has automatically been marked as stale because it has had no recent activity. , please complete review of the changes to move the PR forward. Thank you for your contributions.

@LDong-Arm
Copy link
Contributor

@0xc0170 Can we merge this as CI passed?

@ciarmcom ciarmcom removed the stale Stale Pull Request label Sep 7, 2021
@0xc0170 0xc0170 merged commit 3031898 into ARMmbed:master Sep 8, 2021
@mergify mergify bot removed the ready for merge label Sep 8, 2021
@ccli8 ccli8 deleted the nuvoton_m2354_tfm_fw_version branch September 9, 2021 00:27
@mbedmain mbedmain added release-version: 6.15.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Sep 16, 2021
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.

6 participants