Upmerge #8
Merged
Upmerge #8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Board was renamed here: zephyrproject-rtos/zephyr#23524 Patch aligns the name in MCUBoot and decouples one of nrf52840 dedicated overlay from exact board name. Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
Signed-off-by: Roman Okhrimenko <roman.okhrimenko@cypress.com>
Signed-off-by: Roman Okhrimenko <roman.okhrimenko@cypress.com>
k_sleep() requires explicit conversion of the unit since it takes an opaque type starting with: zephyrproject-rtos/zephyr#23382 Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
|
We shouldn't make merges here, just make pushes. @carlescufi |
carlescufi
added a commit
to carlescufi/zephyr
that referenced
this pull request
Mar 31, 2020
PR zephyrproject-rtos/mcuboot#8 was mistakenly merged instead of pushed, which made the last 4 commits of zephyr's mcuboot divergen in SHA with respect to the upstream ones. In order to preserve the status of the zephyr mcuboot repo as an exact mirror of the upstream one, a snapshot has been taken to preserve the current SHA (0f4463caec3c3a8fac1350d0d6dfbee678a8ce06) and then the master branch has been reset to the upstream equivalent (7e7b4ad1999bf148f88059195f8d2e1d3dccf190). This commit switches the pointer to the latter, but the mcuboot code itself is identical. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
carlescufi
added a commit
to zephyrproject-rtos/zephyr
that referenced
this pull request
Mar 31, 2020
PR zephyrproject-rtos/mcuboot#8 was mistakenly merged instead of pushed, which made the last 4 commits of zephyr's mcuboot divergen in SHA with respect to the upstream ones. In order to preserve the status of the zephyr mcuboot repo as an exact mirror of the upstream one, a snapshot has been taken to preserve the current SHA (0f4463caec3c3a8fac1350d0d6dfbee678a8ce06) and then the master branch has been reset to the upstream equivalent (7e7b4ad1999bf148f88059195f8d2e1d3dccf190). This commit switches the pointer to the latter, but the mcuboot code itself is identical. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
hakehuang
pushed a commit
to hakehuang/zephyr
that referenced
this pull request
Apr 30, 2020
PR zephyrproject-rtos/mcuboot#8 was mistakenly merged instead of pushed, which made the last 4 commits of zephyr's mcuboot divergen in SHA with respect to the upstream ones. In order to preserve the status of the zephyr mcuboot repo as an exact mirror of the upstream one, a snapshot has been taken to preserve the current SHA (0f4463caec3c3a8fac1350d0d6dfbee678a8ce06) and then the master branch has been reset to the upstream equivalent (7e7b4ad1999bf148f88059195f8d2e1d3dccf190). This commit switches the pointer to the latter, but the mcuboot code itself is identical. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.