-
Notifications
You must be signed in to change notification settings - Fork 224
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
Fixed serial dfu using usb #148
Open
CapnOdin
wants to merge
136
commits into
nrfconnect:main
Choose a base branch
from
CapnOdin:cdc_acm_dfu
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+648
−22
Open
Changes from all commits
Commits
Show all changes
136 commits
Select commit
Hold shift + click to select a range
014f42d
zephyr: Replace DT_FLASH_DEV_NAME with DT_CHOSEN_ZEPHYR_FLASH_CONTROL…
galak 8cd5dc5
zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt macros
galak 39d1aef
Revert "zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt macros"
nvlsianpu 48b8ef0
Revert "Revert "zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt ma…
nvlsianpu 5657d00
mergeup: merge up to upstream 82c5f7c
nvlsianpu b7254d1
zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA_
galak 322b11a
zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA for multimage
nvlsianpu 1f181dd
sim: Fixup devicetree.h for changes to mcuboot
galak e88113b
scripts/assemble: Rework to use EDT library to get devicetree data
galak f625267
kconfig: Update to CONFIG_FLOAT to CONFIG_FPU rename in zephyr
joerchan 4bb0f95
cmake: use find_package to locate Zephyr
tejlmand ba7748d
Convert from Zephyr to C99 types
galak 60cc568
Revert "zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA_"
nvlsianpu 032eb72
mergeup: merge up to upstream 9b48d08
nvlsianpu d52aff5
mergeup: merge up to upstream 33fbef5
nvlsianpu 9920005
zephyr: serial: Align with new callback signature
carlescufi 813d29c
mergeup: merge up to upstream 1cb076c
nvlsianpu 0f2c585
mergeup: merge up to upstream 5a6e181
nvlsianpu 3ab5ab3
sample: inclusive language: whitelist -> allow
nashif f78d1d0
imgtool: fix package's author email
utzig 4804219
zephyr: struct device const-ification
utzig a5d79cf
boot: zephyr: Fix build issue for multiple conf files
MarekPieta e8bfc03
zephyr: Fix serial recovery compilation warnings
de-nordic e312fa2
synch with upstream 296949e
nvlsianpu 7718705
[nrf noup] ci: add Jenkins-based CI for NCS
thst-nordic 228e886
[nrf toup] zephyr: add support for Thingy:91
bjda 45f0833
[nrf noup] zephyr: Remove duplication from Kconfig and cmake
sigvartmh 68f2bcc
[nrf noup] boot: bootutil: Add shared crypto functions for ECDSA
sigvartmh e6e6850
[nrf noup] boot: zephyr: Call fw_info_ext_api_provide() before booting
oyvindronningstad 04514d6
[nrf noup] treewide: add NCS partition manager support
SebastianBoe 59e02e2
[nrf noup] zephyr: lock mcuboot using fprotect before jumping
hakonfam f35f763
[nrf noup] boot: zephyr: nrf53 network core bootloader implementation
sigvartmh 1788ad7
[nrf noup] kconfig: use cc310 for ecdsa by default
hakonfam 4d1b74b
[nrf noup] kconfig: enable external crypto config
hakonfam 74e2e0f
[nrf fromtree] zephyr: Fix serial recovery compilation warnings
de-nordic 54238ad
[nrf fromtree] boot: zephyr: reset SPLIM registers before boot
hakonfam 45a94cb
[nrf fromtree] boot: zephyr: Disable HW stack protection
mniestroj d0634dd
[nrf fromtree] doc: fix link to external page in PORTING
utzig 80eb854
[nrf fromtree] kconfig: zephyr: provide logic ...
hakonfam 3264059
[nrf fromtree] bootutil: fix swap-move brick with padded image0
utzig 931d96b
[nrf fromtree] bootutil: fix boostrapping in swap-move
utzig 02833fa
[nrf fromlist] zephyr: update name of nrf5340 dk
hakonfam b03e43f
[nrf fromlist] zephyr: enable progressive erase on all nRF boards
bjda a821395
[nrf fromlist] doc: clean up multi-image documentation
mbolivar-nordic 8564559
[nrf fromlist] bootutil: copy image size with fast overwrite
utzig e9d64d4
[nrf temphack] Kconfig: add accessor for flash write block size
mbolivar-nordic a8cc987
[nrf temphack] do_boot: clean peripherals state before boot
nvlsianpu 4c5ff85
[nrf temphack] boot: bootutil: Word align read buffer in loader
sigvartmh ac05235
[nrf temphack] Kconfig: select 8-bits flash access for recovery mode
nvlsianpu e64c5f0
synch with upstream c625da4
nvlsianpu 710ce7f
synch with upstream c74c551
nvlsianpu c71d218
Merge: Synchronized up to JuulLabs-OSS@c74c551
nvlsianpu b54f9ac
synch with upstream d2122bc
nvlsianpu 9680f01
Revert "[nrf fromlist] bootutil: copy image size with fast overwrite"
ioannisg f5f3439
Revert "[nrf fromlist] doc: clean up multi-image documentation"
ioannisg d9a0c0f
Revert "[nrf fromlist] zephyr: enable progressive erase on all nRF bo…
ioannisg 8c4b1d5
Revert "[nrf fromlist] zephyr: update name of nrf5340 dk"
ioannisg 3cadeb9
Revert "[nrf fromtree] bootutil: fix boostrapping in swap-move"
ioannisg 9912d21
Revert "[nrf fromtree] bootutil: fix swap-move brick with padded image0"
ioannisg ddcc4e1
Revert "[nrf fromtree] doc: fix link to external page in PORTING"
ioannisg 4fb56e7
Revert "[nrf fromtree] boot: zephyr: Disable HW stack protection"
ioannisg 9851136
Revert "[nrf fromtree] boot: zephyr: reset SPLIM registers before boot"
ioannisg 8d0f628
Revert "[nrf fromtree] zephyr: Fix serial recovery compilation warnings"
ioannisg aada128
Revert "[nrf fromtree] kconfig: zephyr: provide logic ..."
ioannisg 6e3825f
Merge: Synchronized up to mcu-tools@d2122bc
nvlsianpu ec663cc
Revert "[nrf temphack] Kconfig: select 8-bits flash access for recove…
ioannisg 389b7f2
Revert "[nrf temphack] boot: bootutil: Word align read buffer in loader"
ioannisg a85b621
Revert "[nrf temphack] do_boot: clean peripherals state before boot"
ioannisg 9bbc222
Revert "[nrf noup] kconfig: enable external crypto config"
ioannisg e991409
Revert "[nrf noup] kconfig: use cc310 for ecdsa by default"
ioannisg fb00c70
Revert "[nrf noup] boot: zephyr: nrf53 network core bootloader implem…
ioannisg 7aa2990
Revert "[nrf temphack] Kconfig: add accessor for flash write block size"
ioannisg d544535
Revert "[nrf noup] zephyr: lock mcuboot using fprotect before jumping"
ioannisg 449c296
Revert "[nrf noup] treewide: add NCS partition manager support"
ioannisg f8d1c84
Revert "[nrf noup] boot: bootutil: Add shared crypto functions for EC…
ioannisg c7ee647
Revert "[nrf noup] zephyr: Remove duplication from Kconfig and cmake"
ioannisg f5fdc5c
[nrf mergeup]: Synchronize mcuboot with zephyrproject-rtos/mcuboot
ioannisg 3fddc54
[nrf noup] zephyr: Remove duplication from Kconfig and cmake
sigvartmh fd12a3d
[nrf noup] boot: bootutil: Add shared crypto for ECDSA and SHA
sigvartmh ecbaa04
[nrf noup] treewide: add NCS partition manager support
SebastianBoe 01c58f5
[nrf noup] zephyr: lock mcuboot using fprotect before jumping
hakonfam ee8ab63
[nrf temphack] Kconfig: add accessor for flash write block size
mbolivar-nordic df05bff
[nrf noup] boot: zephyr: nrf53 network core bootloader implementation
sigvartmh ee5338f
[nrf noup] kconfig: use cc310 for ecdsa by default
hakonfam fbd3e7a
[nrf noup] kconfig: enable external crypto config
hakonfam bd4d82f
[nrf temphack] do_boot: clean peripherals state before boot
nvlsianpu 794fbcf
[nrf noup] PM: adapted PM related code to CONFIG_SINGLE_APPLICATION_SLOT
nvlsianpu 534a4ec
[nrf fromlist] zephyr: use minimal CBPRINTF implementation
nvlsianpu 853e112
[nrf temphack]: remove CONFIG_DEBUG=y in Zephyr prj.conf
tejlmand b95e493
[nrf fromtree] zephyr/Kconfig: Added default pin for serial ...
osaether ef39423
[nrf noup] pm: clarify the purpose of the mcuboot_pad partition
vidarbe cb5a7b3
Merge: Synchronized up to mcu-tools/mcuboot@e512181
henrikbrixandersen c986a90
Merge: Synchronized up to https://github.com/mcu-tools/mcuboot/commit…
nvlsianpu 915a281
synch with upstream be64e6a
nvlsianpu 6f48e0a
Merge: synchronized up to https://github.com/mcu-tools/mcuboot/commit…
nvlsianpu 52ff566
synch with upstream ce50334
nvlsianpu 3f49b5a
Merge: synchronized up to https://github.com/mcu-tools/mcuboot/commit…
nvlsianpu 9f8ccb9
[nrf noup] ci: use zephyr/scripts/ci/check_compliance.py
thst-nordic 8834daf
[nrf noup] ci: replace jenkins pipeline in jenkinsfile with a stub
thst-nordic eda03c6
Revert "[nrf noup] ci: replace jenkins pipeline in jenkinsfile with a…
jfischer-no 8faa32b
Revert "[nrf noup] ci: use zephyr/scripts/ci/check_compliance.py"
jfischer-no 62f5e99
Revert "[nrf noup] pm: clarify the purpose of the mcuboot_pad partition"
jfischer-no d180288
Revert "[nrf fromtree] zephyr/Kconfig: Added default pin for serial ..."
jfischer-no 3397b9a
Revert "[nrf temphack]: remove CONFIG_DEBUG=y in Zephyr prj.conf"
jfischer-no 6109ca6
Revert "[nrf fromlist] zephyr: use minimal CBPRINTF implementation"
jfischer-no c86f393
Revert "[nrf noup] PM: adapted PM related code to CONFIG_SINGLE_APPLI…
jfischer-no 6f10738
Revert "[nrf temphack] do_boot: clean peripherals state before boot"
jfischer-no 154f9c0
Revert "[nrf noup] kconfig: enable external crypto config"
jfischer-no 78a55d2
Revert "[nrf noup] kconfig: use cc310 for ecdsa by default"
jfischer-no 8ea00df
Revert "[nrf noup] boot: zephyr: nrf53 network core bootloader implem…
jfischer-no 12c6bf9
Revert "[nrf temphack] Kconfig: add accessor for flash write block size"
jfischer-no c7de60b
Revert "[nrf noup] zephyr: lock mcuboot using fprotect before jumping"
jfischer-no 3b2a790
Revert "[nrf noup] treewide: add NCS partition manager support"
jfischer-no 7958a42
[nrf mergeup]: Synchronize mcuboot with zephyrproject-rtos/mcuboot
jfischer-no 84cc24d
[nrf noup] treewide: add NCS partition manager support
SebastianBoe 0bb3e66
[nrf noup] zephyr: lock mcuboot using fprotect before jumping
hakonfam 6841a6b
[nrf noup] boot: zephyr: nrf53 network core bootloader implementation
sigvartmh d80776b
[nrf noup] kconfig: use cc310 for ecdsa by default
hakonfam ca4d049
[nrf noup] kconfig: enable external crypto config
hakonfam 18a0a8a
[nrf temphack] do_boot: clean peripherals state before boot
nvlsianpu a79c7ec
[nrf noup] PM: adapted PM related code to CONFIG_SINGLE_APPLICATION_SLOT
nvlsianpu 798c351
[nrf temphack]: remove CONFIG_DEBUG=y in Zephyr prj.conf
tejlmand cab5843
[nrf noup] pm: clarify the purpose of the mcuboot_pad partition
vidarbe 0e60baf
[nrf noup] ci: use zephyr/scripts/ci/check_compliance.py
thst-nordic 78fc1d6
[nrf noup] ci: replace jenkins pipeline in jenkinsfile with a stub
thst-nordic 770fe67
synch with upstream a513b8e
nvlsianpu 30e0c5a
Merge: synchronized up to mcu-tools@a513b8e
nvlsianpu 2c0608f
synch with upstream 360763d
nvlsianpu 4620e27
[nrf noup] pm: Don't create second image partition in single slot build
sebastiandraus 3fc5941
Merge: Synchronized up to https://github.com/zephyrproject-rtos/mcubo…
nvlsianpu 3384cd3
Revert "[nrf noup] boot: zephyr: nrf53 network core bootloader implem…
nvlsianpu ef3af33
[nrf mergeup]: Synchronize MCUboot with zephyrproject-rtos/mcuboot
nvlsianpu b767052
[nrf noup] boot: zephyr: nrf53 network core bootloader implementation
sigvartmh 858dd03
[nrf temphack] prj.conf: don't use CONFIG_LOG_MODE_MINIMAL yet
nvlsianpu 3ea42d2
Revert "[nrf temphack] prj.conf: don't use CONFIG_LOG_MODE_MINIMAL yet"
anangl 769d5a3
Made boot_serial_start yield to allow the usb connection to be establ…
CapnOdin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
name: Backport | ||
on: | ||
pull_request: | ||
types: | ||
- closed | ||
- labeled | ||
|
||
jobs: | ||
backport: | ||
runs-on: ubuntu-18.04 | ||
name: Backport | ||
steps: | ||
- name: Backport Bot | ||
uses: Gaurav0/[email protected] | ||
with: | ||
bot_username: NordicBuilder | ||
bot_token: 151a9b45052f9ee8be5a59963d31ad7b92c3ecb5 | ||
bot_token_key: 67bb1f1f998d546859786a4088917c65415c0ebd | ||
github_token: ${{ secrets.GITHUB_TOKEN }} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
# All these sections are optional, edit this file as you like. | ||
[general] | ||
ignore=title-trailing-punctuation, T3, title-max-length, T1, body-hard-tab, B3, B1 | ||
# verbosity should be a value between 1 and 3, the commandline -v flags take precedence over this | ||
verbosity = 3 | ||
# By default gitlint will ignore merge commits. Set to 'false' to disable. | ||
ignore-merge-commits=true | ||
# Enable debug mode (prints more output). Disabled by default | ||
debug = false | ||
|
||
# Set the extra-path where gitlint will search for user defined rules | ||
# See http://jorisroovers.github.io/gitlint/user_defined_rules for details | ||
extra-path=../../zephyr/scripts/gitlint | ||
|
||
[title-max-length-no-revert] | ||
line-length=72 | ||
|
||
[body-min-line-count] | ||
min-line-count=1 | ||
|
||
[body-max-line-count] | ||
max-line-count=200 | ||
|
||
[title-starts-with-subsystem] | ||
regex = ^(?!subsys:)(([^:]+):)(\s([^:]+):)*\s(.+)$ | ||
|
||
[title-must-not-contain-word] | ||
# Comma-separated list of words that should not occur in the title. Matching is case | ||
# insensitive. It's fine if the keyword occurs as part of a larger word (so "WIPING" | ||
# will not cause a violation, but "WIP: my title" will. | ||
words=wip | ||
|
||
[title-match-regex] | ||
# python like regex (https://docs.python.org/2/library/re.html) that the | ||
# commit-msg title must be matched to. | ||
# Note that the regex can contradict with other rules if not used correctly | ||
# (e.g. title-must-not-contain-word). | ||
#regex=^US[0-9]* | ||
|
||
[max-line-length-with-exceptions] | ||
# B1 = body-max-line-length | ||
line-length=72 | ||
|
||
[body-min-length] | ||
min-length=3 | ||
|
||
[body-is-missing] | ||
# Whether to ignore this rule on merge commits (which typically only have a title) | ||
# default = True | ||
ignore-merge-commits=false | ||
|
||
[body-changed-file-mention] | ||
# List of files that need to be explicitly mentioned in the body when they are changed | ||
# This is useful for when developers often erroneously edit certain files or git submodules. | ||
# By specifying this rule, developers can only change the file when they explicitly reference | ||
# it in the commit message. | ||
#files=gitlint/rules.py,README.md |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
@Library("CI_LIB") _ | ||
|
||
def pipeline = new ncs.sdk_mcuboot.Main() | ||
|
||
pipeline.run(JOB_NAME) | ||
|
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 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 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 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 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 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 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jfischer-no Is it possible that USB processing is at to low priority?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is not enough info about the surroundings, is there a problem with enumeration during startup?
The competitor(s) (driver/usb_transfer/CDC ACM) priority is system workqueue priority or CONFIG_USB_WORKQUEUE_PRIORITY.
main(void)
⬇️
⬇️
boot_serial_start(&boot_funcs)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jfischer-no Is there any specific info you want me to provide?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How does the problem manifest itself on the host side? Is the device enumerated/configured successfully or are there timeouts during the transfer? What is host OS?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have tried it on Windows 10 and Manjaro Arm (Raspberry Pi 4) without yielding no device appears in device manager nor in /dev/. The OS seems to act the same way it would if no USB had been connected.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It works on my custom nrf52840 print and on my evk-nina-b3. But not on my nrf5340dk. To be clear it won't compile when targeting nrf5340dk_nrf5340_cpuapp.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suspect it fails because of:
I cannot help with that, but you can comment this include out for testing. Apart from faults after image reading, when the Button 1 is pressed the bootloader goes into recovery mode and USB initialized fine:
west build -b nrf5340dk_nrf5340_cpuapp ./ -- -DCONF_FILE="./usb_cdc_acm_log_recovery.conf" -DCONFIG_FLASH=y
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@CapnOdin could you retest with nRF Connect SDK 1.5.1 now that it's released?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@CapnOdin also, which revision of the nRF53 DK do you have?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It says the following on the box:
nRF6835
0.11.0
2020.50
From the box my earlier nrf5340-PDK came in I can tell that the second value is the revision but I have no idea why it says nRF6835 on the sticker.
Yes I will test it in 1.5.1 on Monday.