Skip to content

manifest: update mcuboot #31225

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
Merged
merged 1 commit into from
Jan 14, 2021
Merged

manifest: update mcuboot #31225

merged 1 commit into from
Jan 14, 2021

Conversation

@henrikbrixandersen
Copy link
Member

@henrikbrixandersen henrikbrixandersen commented Jan 11, 2021 •
edited
Loading

Synchronized up to:
mcu-tools/mcuboot@e512181

Signed-off-by: Henrik Brix Andersen [email protected]

@henrikbrixandersen henrikbrixandersen changed the title manifes: update mcuboot manifest: update mcuboot Jan 11, 2021
@github-actions github-actions bot added manifest west manifest-mcuboot DNM This PR should not be merged (Do Not Merge) labels Jan 11, 2021
@github-actions
Copy link

github-actions bot commented Jan 11, 2021 •
edited
Loading

The following projects have a revision update in this Pull Request:

Name Old Revision New Revision
mcuboot zephyrproject-rtos/mcuboot@c71d218 zephyrproject-rtos/mcuboot@c986a90 (master)

Note: This message is automatically posted and updated by the Manifest GitHub Action.

nvlsianpu
nvlsianpu suggested changes Jan 11, 2021
View reviewed changes
Copy link
Contributor

@nvlsianpu nvlsianpu left a comment

Choose a reason for hiding this comment

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

Can you update the changeloog?

@henrikbrixandersen
Copy link
Member Author

Can you update the changeloog?

@nvlsianpu I will. Currently looking into how mcu-tools/mcuboot@e75e33d was tested. I cannot get MCUboot to compile with CONFIG_LOG_MINIMAL due to undefined references to log_init() and log_process().

@henrikbrixandersen
Copy link
Member Author

I opened a PR against upstream MCUboot for fixing compilation with CONFIG_LOG_MINIMAL=y: mcu-tools/mcuboot#911

@henrikbrixandersen henrikbrixandersen force-pushed the mcuboot_nxp_cleanup_mpu branch 2 times, most recently from 227b4dd to aa77786 Compare January 13, 2021 21:16
@henrikbrixandersen henrikbrixandersen added this to the v2.5.0 milestone Jan 13, 2021
@henrikbrixandersen
Copy link
Member Author

@nvlsianpu Do you mean the ChangeLog within the Zephyr release notes? If yes, I am unsure of what level of detail to document the changes pulled in by this re-synchronisation.

@nvlsianpu
Copy link
Contributor

@henrikbrixandersen

Ad note similar as I did in #29238
Only zephyr related things.
basing on your list you can add:

* bootloader:

  * Kconfig: allow xip-revert only for xip-mode
  * ext: tinycrypt: update ctr mode to stream
  * use minimal CBPRINTF implementation
  * configure logging to LOG_MINIMAL by default
  * boot: cleanup NXP MPU configuration before boot
  * fix nokogiri<=1.11.0.rc4 vulnerability

* imgtool:

  * Add support for setting fixed ROM address into image header

@henrikbrixandersen
Copy link
Member Author

Ad note similar as I did in #29238
Only zephyr related things.
basing on your list you can add:

@nvlsianpu Thanks! Added.

@nvlsianpu
Copy link
Contributor

@henrikbrixandersen zephyr-rtos/mcuboot updated, you can update SHA

@henrikbrixandersen
manifest: update mcuboot
3a2e113 
Synchronized up to:
mcu-tools/mcuboot@e512181

Signed-off-by: Henrik Brix Andersen <[email protected]>
@github-actions github-actions bot removed the DNM This PR should not be merged (Do Not Merge) label Jan 14, 2021
@henrikbrixandersen
Copy link
Member Author

@henrikbrixandersen zephyr-rtos/mcuboot updated, you can update SHA

Thanks. Updated.

@nvlsianpu nvlsianpu requested review from carlescufi and utzig January 14, 2021 11:40
@nvlsianpu
Copy link
Contributor

@carlescufi May you merge?

@carlescufi carlescufi merged commit 94ae6fc into zephyrproject-rtos:master Jan 14, 2021
@henrikbrixandersen henrikbrixandersen deleted the mcuboot_nxp_cleanup_mpu branch January 14, 2021 21:24
@henrikbrixandersen henrikbrixandersen mentioned this pull request Jan 18, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nashif nashif Awaiting requested review from nashif

@carlescufi carlescufi Awaiting requested review from carlescufi

2 more reviewers

@utzig utzig utzig approved these changes

@nvlsianpu nvlsianpu nvlsianpu approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area: Documentation area: Modules manifest manifest-mcuboot

Projects

None yet

Milestone

v2.5.0

Development

Successfully merging this pull request may close these issues.

4 participants

@henrikbrixandersen @nvlsianpu @utzig @carlescufi