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

RKUsbLoader/RKUSBDriver and minor fixes #437

Merged
merged 5 commits into from
Jun 19, 2019

Conversation

otavio
Copy link

@otavio otavio commented May 17, 2019

Description

Checklist

  • Documentation for the feature
  • Tests for the feature
  • The arguments and description in doc/configuration.rst have been updated
  • Add a section on how to use the feature to doc/usage.rst
  • Add a section on how to use the feature to doc/development.rst
  • CHANGES.rst has been updated
  • PR has been tested
  • Man pages have been regenerated

@codecov
Copy link

codecov bot commented May 17, 2019

Codecov Report

Merging #437 into master will decrease coverage by 1.1%.
The diff coverage is 40.3%.

Impacted file tree graph

@@           Coverage Diff            @@
##           master    #437     +/-   ##
========================================
- Coverage    57.4%   56.2%   -1.2%     
========================================
  Files         116     116             
  Lines        7347    7218    -129     
========================================
- Hits         4219    4061    -158     
- Misses       3128    3157     +29
Impacted Files Coverage Δ
labgrid/driver/networkusbstoragedriver.py 53.6% <ø> (-1.2%) ⬇️
labgrid/remote/client.py 40.1% <0%> (-0.3%) ⬇️
labgrid/remote/exporter.py 36.4% <100%> (+0.2%) ⬆️
labgrid/driver/__init__.py 100% <100%> (ø) ⬆️
labgrid/driver/usbloader.py 50% <40.5%> (-8.5%) ⬇️
labgrid/resource/udev.py 51% <50%> (-2.2%) ⬇️
labgrid/resource/remote.py 82.9% <66.6%> (-0.7%) ⬇️
labgrid/stepreporter.py 44.4% <0%> (-8%) ⬇️
labgrid/driver/usbtmcdriver.py 44% <0%> (-6%) ⬇️
labgrid/external/usbstick.py 47.8% <0%> (-4.1%) ⬇️
... and 53 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9091a77...18c007b. Read the comment docs.

Copy link
Member

@jluebbe jluebbe left a comment

Choose a reason for hiding this comment

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

This looks mostly ready. It needs more documentation and some information what the RKUSBDriver is useful for (RockChip?).

labgrid/driver/usbloader.py Outdated Show resolved Hide resolved
labgrid/driver/usbloader.py Outdated Show resolved Hide resolved
@chtavares chtavares force-pushed the master branch 2 times, most recently from b22594c to c1f2f57 Compare May 22, 2019 14:47
@Emantor Emantor added enhancement needs author info Requires more information from the PR/Issue author labels May 24, 2019
@chtavares chtavares force-pushed the master branch 4 times, most recently from 85f73b5 to 18c007b Compare May 30, 2019 13:55
@codecov
Copy link

codecov bot commented May 30, 2019

Codecov Report

Merging #437 into master will decrease coverage by 0.1%.
The diff coverage is 39.2%.

Impacted file tree graph

@@           Coverage Diff            @@
##           master    #437     +/-   ##
========================================
- Coverage    56.4%   56.2%   -0.2%     
========================================
  Files         116     116             
  Lines        7191    7261     +70     
========================================
+ Hits         4058    4084     +26     
- Misses       3133    3177     +44
Impacted Files Coverage Δ
labgrid/remote/client.py 40.2% <0%> (-0.3%) ⬇️
labgrid/remote/exporter.py 36.4% <100%> (+0.2%) ⬆️
labgrid/driver/__init__.py 100% <100%> (ø) ⬆️
labgrid/driver/usbloader.py 46.8% <34.8%> (-11.7%) ⬇️
labgrid/resource/udev.py 51% <50%> (-0.1%) ⬇️
labgrid/driver/networkusbstoragedriver.py 54.1% <50%> (+0.5%) ⬆️
labgrid/resource/remote.py 82.9% <66.6%> (-0.7%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 55b1801...e78febd. Read the comment docs.

@chtavares
Copy link
Contributor

@Emantor I need to use something that wait for the loader image start at the board. So how @otavio told you, I edited the code and now it does a loop, trying to load it with a max of 3s for the timeout.

@Emantor Emantor added Ready for review PRs which should be Rereviewed after Changes Requested and removed needs author info Requires more information from the PR/Issue author labels Jun 6, 2019
Emantor
Emantor previously requested changes Jun 6, 2019
labgrid/driver/usbloader.py Outdated Show resolved Hide resolved
@Emantor Emantor added needs author info Requires more information from the PR/Issue author and removed Ready for review PRs which should be Rereviewed after Changes Requested labels Jun 6, 2019
jluebbe
jluebbe previously approved these changes Jun 19, 2019
@otavio
Copy link
Author

otavio commented Jun 19, 2019

Hello; what is pending for this to move on? @Emantor any other needed change?

@chtavares
Copy link
Contributor

@jluebbe I did rebase on a master and did push, now it's all right.

Copy link
Member

@jluebbe jluebbe left a comment

Choose a reason for hiding this comment

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

Hello; what is pending for this to move on? @Emantor any other needed change?

Sorry, I looked at the first commits, got distracted and clicked approved by mistake. I've found some minor things, though. Otherwise it's good.

labgrid/driver/networkusbstoragedriver.py Outdated Show resolved Hide resolved
labgrid/driver/networkusbstoragedriver.py Outdated Show resolved Hide resolved
labgrid/driver/usbloader.py Outdated Show resolved Hide resolved
labgrid/driver/usbloader.py Outdated Show resolved Hide resolved
@chtavares
Copy link
Contributor

@jluebbe the changes have been applied

Christian Tavares added 2 commits June 19, 2019 10:41
Signed-off-by: Christian Tavares <[email protected]>
@jluebbe jluebbe dismissed Emantor’s stale review June 19, 2019 13:48

Requested changes have been applied.

@jluebbe jluebbe merged commit 7d1ded4 into labgrid-project:master Jun 19, 2019
@jluebbe
Copy link
Member

jluebbe commented Jul 20, 2022

@otavio Looking at this after some time, I noticed that your rk-usb-loader doesn't seem to be available? Is that a wrapper/fork of https://github.com/rockchip-linux/rkdeveloptool?

@otavio
Copy link
Author

otavio commented Jul 20, 2022

Yes. It is this tool.

In our labgrid config we use:

targets:
  main:
    resources:
      RKUSBLoader:
        match:
          'sys_name': '1-1.1.3'
      USBMassStorage:
        match:
          'ID_PATH': 'platform-3f980000.usb-usb-0:1.1.3:1.0-scsi-0:0:0:0'
      USBSerialPort:
        match:
          'ID_PATH': 'platform-3f980000.usb-usb-0:1.3:1.0'
        speed: 1500000
    drivers:
      RKUSBDriver:
        image: bootloader
        usb_loader: boot-rom

tools:
  rk-usb-loader: /usr/bin/rkdeveloptool
images:
  bootloader: images/u-boot.img
  boot-rom: images/RV1108_usb_boot.bin

@jluebbe
Copy link
Member

jluebbe commented Jul 20, 2022

Ah, it seems that we missed that in the review. The existing convention is to use the binary name, then the tools: key is only used if it's not in $PATH.

@otavio
Copy link
Author

otavio commented Jul 20, 2022

Please do whatever is need. We can update here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement needs author info Requires more information from the PR/Issue author
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants