[DNM] upmerge to upsteram f50054d #4
Merged
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
This will fix #336 by adding deprecation warning to Jira and Confluence links as these are not used by the project anymore. Signed-off-by: Sigvart M. Hovland <[email protected]>
This commit adds a choice for the device to use for serial recovery. Signed-off-by: Emanuele Di Santo <[email protected]> Signed-off-by: Andrzej Puzdrowski <[email protected]> fixup
This commit adds a project configuration for the upcoming nrf52840_pca10059 board. Signed-off-by: Emanuele Di Santo <[email protected]> Signed-off-by: Andrzej Puzdrowski <[email protected]>
Add missing declaration of sys_clock_disable() to fix compiler warning. Signed-off-by: Emanuele Di Santo <[email protected]>
Cleanup board configuration. Signed-off-by: Emanuele Di Santo <[email protected]>
…2.6.1 Signed-off-by: Yiping Peng <[email protected]> Signed-off-by: Yiping Peng <[email protected]>
Add a hidden MCUBOOT config entry to mark a project as MCUBOOT. It is useful when other parts of the system need to be aware that they are, in fact, the bootloader. Signed-off-by: Emanuele Di Santo <[email protected]>
zephyrproject-rtos/zephyr#11180: Zephyr target was corrupted as recently zephyr's device tree started adding DT_ prefix in generated labels. This path aligns flash name macro used. Signed-off-by: Andrzej Puzdrowski <[email protected]>
nvlsianpu
changed the title
Is this compatible with fw-*-zephyr ? If not, should we, and how do we, apply both patches at the same time? |
|
Good point - so this should wait for appropriate update in fw-zephyr. (We can merge this right after its counterpart) |
SebastianBoe
approved these changes
Nov 14, 2018
lemrey
reviewed
Nov 16, 2018
|
@lemrey open PR to https://github.com/JuulLabs-OSS/mcuboot. We can copy changes after really fast. |
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.
This is fast forward as NCS doesn't apply internal changes so far.
New version introduces:
nrf52840_pca10059 dongle serial recovery over USB CDC ACM support
Fixed an issue that supported later versions of mbedtls than mbedtls-2.6.1
hidden MCUBOOT Kconfig entry to mark a project as MCUBOOT.
fix zephyr target: corrupted build after zephyr scripts: dts: Use DT_ prefix in generated labels zephyrproject-rtos/zephyr#11180
other minor changes
go after nrfconnect/sdk-zephyr#46