smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hooks: Updates for new swarren-lx1 HW

Browse Source 
The old machine died, and since the new machine is different HW, all the
USB port IDs are different.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Stephen Warren
2019-04-25 13:11:24 -06:00
committed by Simon Glass
parent 380b0c6fa4
commit 41aed6d73e
6 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/hooks/bin/swarren-lx1/conf.jetson-tk1_na
View File

@@ -33,4 +33,4 @@ download_impl=tegra-uboot-flasher
tubf_bin="${HOME}/ubtest-tegra-uboot-flasher/scripts"
tubf_board=jetson-tk1
tubf_config=jetson-tk1
board_usb_port_path=3-2.3
board_usb_port_path=1-8.3

4
test/hooks/bin/swarren-lx1/conf.p2371-2180_na
View File

@@ -33,13 +33,13 @@ else
boot_from_cboot=0
fi
console_dev=/dev/serial/by-path/pci-0000:00:14.0-usb-0:6:1.2-port0
console_dev=/dev/console-p2371-2180
power_impl=pm342
recovery_impl=pm342
nv_board_automation_bin="${HOME}/ubtest-nvidia-board-automation"
pm342_serial=SRW-0
board_usb_dev=/dev/usbdev-p2371-2180
board_usb_port_path=3-13
board_usb_port_path=1-5
if [ ${boot_from_cboot} -eq 1 ]; then
echo conf.p2371-2180_na: U-Boot branch requires flashing for testing

4
test/hooks/bin/swarren-lx1/conf.p2771-0000-500_na
View File

@@ -18,7 +18,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
console_dev=/dev/serial/by-path/pci-0000:00:14.0-usb-0:14:1.2-port0
console_dev=/dev/console-p2771-0000
power_impl=pm342
flash_impl=recovery_l4t
recovery_impl=pm342
@@ -29,4 +29,4 @@ reset_impl=pm342
nv_board_automation_bin="${HOME}/ubtest-nvidia-board-automation"
pm342_serial=SRW-1
board_usb_dev=/dev/usbdev-p2771-0000
board_usb_port_path=3-1
board_usb_port_path=3-2

4
test/hooks/py/swarren-lx1/u_boot_boardenv_jetson_tk1_na.py
View File

@@ -26,9 +26,9 @@ env__usb_dev_ports = (
{
"fixture_id": "micro_b",
"tgt_usb_ctlr": "0",
"host_ums_dev_node": "/dev/disk/by-path/pci-0000:00:14.0-usb-0:2.3:1.0-scsi-0:0:0:0",
"host_ums_dev_node": "/dev/disk/by-path/pci-0000:00:14.0-usb-0:8.3:1.0-scsi-0:0:0:0",
"host_usb_dev_node": "/dev/usbdev-jetson-tk1",
"host_usb_port_path": "3-2.3",
"host_usb_port_path": "1-8.3",
},
)

4
test/hooks/py/swarren-lx1/u_boot_boardenv_p2371_2180_na.py
View File

@@ -26,9 +26,9 @@ env__usb_dev_ports = (
{
"fixture_id": "micro_b",
"tgt_usb_ctlr": "0",
"host_ums_dev_node": "/dev/disk/by-path/pci-0000:00:14.0-usb-0:13:1.0-scsi-0:0:0:0",
"host_ums_dev_node": "/dev/disk/pci-0000:00:14.0-usb-0:5:1.0-scsi-0:0:0:0",
"host_usb_dev_node": "/dev/usbdev-p2371-2180",
"host_usb_port_path": "3-13",
"host_usb_port_path": "1-5",
},
)

34
test/hooks/udev/swarren-lx1/99-ubtest.rules
View File

@@ -26,41 +26,47 @@
# Serial console
ACTION=="add", KERNELS=="ttyS0", ENV{UBTEST_DEVICE}="1", SYMLINK+="console-jetson-tk1"
# Phidgets control board
ACTION=="add", SUBSYSTEMS=="usb", DRIVER=="usb", KERNELS=="3-2.7", ENV{UBTEST_DEVICE}="1", SYMLINK+="phidgets-jetson-tk1"
ACTION=="add", SUBSYSTEMS=="usb", DRIVER=="usb", KERNELS=="1-8.7", ENV{UBTEST_DEVICE}="1", SYMLINK+="phidgets-jetson-tk1"
# Device-mode port
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="3-2.3", ENV{UBTEST_DEVICE}="1", SYMLINK+="usbdev-jetson-tk1"
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="1-8.3", ENV{UBTEST_DEVICE}="1", SYMLINK+="usbdev-jetson-tk1"
# Jetson Nano (p3450-0000)
# Serial console
ACTION=="add", SUBSYSTEM=="tty", KERNELS=="1-3.4.4:1.0", ENV{UBTEST_DEVICE}="1", SYMLINK+="console-nano"
# Device-mode port
ACTION=="add", SUBSYSTEMS=="usb", DRIVER=="usb", KERNELS=="1-3.2", ENV{UBTEST_DEVICE}="1", SYMLINK+="usbdev-nano"
# Jetson TX1 (P2371-2180)
# Serial console
ACTION=="add", SUBSYSTEM=="tty", KERNELS=="3-6:1.2", ENV{UBTEST_DEVICE}="1", SYMLINK+="console-p2371-2180"
ACTION=="add", SUBSYSTEM=="tty", KERNELS=="1-4:1.2", ENV{UBTEST_DEVICE}="1", SYMLINK+="console-p2371-2180"
# PM342 debug board
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="3-6", ENV{UBTEST_DEVICE}="1"
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="1-4", ENV{UBTEST_DEVICE}="1", SYMLINK+="pm342-p2371-2180"
# Device-mode port
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="3-13", ENV{UBTEST_DEVICE}="1", SYMLINK+="usbdev-p2371-2180"
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="1-5", ENV{UBTEST_DEVICE}="1", SYMLINK+="usbdev-p2371-2180"
# Jetson TX2 (P2771-0000)
# Serial console
ACTION=="add", SUBSYSTEM=="tty", KERNELS=="3-14:1.2", ENV{UBTEST_DEVICE}="1", SYMLINK+="console-p2771-0000"
ACTION=="add", SUBSYSTEM=="tty", KERNELS=="1-7:1.2", ENV{UBTEST_DEVICE}="1", SYMLINK+="console-p2771-0000"
# PM342 debug board
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="3-14", ENV{UBTEST_DEVICE}="1"
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="1-7", ENV{UBTEST_DEVICE}="1", SYMLINK+="pm342-p2771-0000"
# Device-mode port
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="3-1", ENV{UBTEST_DEVICE}="1", SYMLINK+="usbdev-p2771-0000"
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="3-2", ENV{UBTEST_DEVICE}="1", SYMLINK+="usbdev-p2771-0000"
# Jetson Xavier (B)
# Serial console
ACTION=="add", SUBSYSTEM=="tty", KERNELS=="3-2.6:1.3", ENV{UBTEST_DEVICE}="1", SYMLINK+="console-xavier-b"
ACTION=="add", SUBSYSTEM=="tty", KERNELS=="1-8.6:1.3", ENV{UBTEST_DEVICE}="1", SYMLINK+="console-xavier-b"
# FTDI port
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="3-2.6", ENV{UBTEST_DEVICE}="1"
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="1-8.6", ENV{UBTEST_DEVICE}="1", SYMLINK+="pm342-xavier-b"
# Device-mode port
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="3-2.5", ENV{UBTEST_DEVICE}="1", SYMLINK+="usbdev-xavier-b"
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="1-8.5", ENV{UBTEST_DEVICE}="1", SYMLINK+="usbdev-xavier-b"
# Jetson Xavier (C)
# Serial console
ACTION=="add", SUBSYSTEM=="tty", KERNELS=="3-2.4:1.3", ENV{UBTEST_DEVICE}="1", SYMLINK+="console-xavier-c"
ACTION=="add", SUBSYSTEM=="tty", KERNELS=="1-8.4:1.3", ENV{UBTEST_DEVICE}="1", SYMLINK+="console-xavier-c"
# FTDI port
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="3-2.4", ENV{UBTEST_DEVICE}="1"
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="1-8.4", ENV{UBTEST_DEVICE}="1", SYMLINK+="pm342-xavier-c"
# Device-mode port
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="3-2.2", ENV{UBTEST_DEVICE}="1", SYMLINK+="usbdev-xavier-c"
ACTION=="add", SUBSYSTEMS=="usb", KERNELS=="1-8.2", ENV{UBTEST_DEVICE}="1", SYMLINK+="usbdev-xavier-c"
# NVIDIA's PM342 control scripts search for devices with matching USB vendor
# and device ID, then check each to verify if it matches the requested serial