M-Labs/zynq-rs
11
0
Fork 15
Code Issues 6 Pull Requests Releases Wiki Activity

Update README and build.sh #59

Merged
sb10q merged 3 commits from harry/zynq-rs:master into master 2020-08-11 11:24:21 +08:00
Conversation 1 Commits 3 Files Changed 2 +11 -8
harry commented 2020-08-07 11:23:46 +08:00
Contributor
Copy Link

This is to keep consistency with the updated build instructions as per commit e8ba73a8c7.

This is to keep consistency with the updated build instructions as per commit e8ba73a8c74f79f543db6a495ac65aae68e18bab.
sb10q reviewed 2020-08-07 11:40:47 +08:00
README.md Outdated
@ -65,3 +65,3 @@
Clone this repo onto your development/build machine and the raspberry pi that controls the Xilinx 7000 board
On the dev machine, the below script builds zc706 and secure copies it to the target pi (in your pi $HOME directory)
On the dev machine, the below script builds zc706 and secure copies it to the nixbuild.m-labs.hk server:
sb10q commented 2020-08-07 11:40:47 +08:00
Owner
Copy Link

It's nixbld.m-labs.hk (not nixbuild...), and also the script does copy it to a RPI using the IPv4 port redirects. We should change the script to use the rpi IPv6 hostname.

It's nixbld.m-labs.hk (not nixbuild...), and also the script does copy it to a RPI using the IPv4 port redirects. We should change the script to use the rpi IPv6 hostname.
harry commented 2020-08-07 19:39:05 +08:00
Author
Contributor
Copy Link

Fixed in harry/zynq-rs:b6919d1730, but the updated build.sh has not been tested from outside.

Fixed in harry/zynq-rs:https://git.m-labs.hk/harry/zynq-rs/commit/b6919d1730889fcaf35ebfb17bac7e888f1edb77, but the updated build.sh has not been tested from outside.
sb10q reviewed 2020-08-08 10:03:21 +08:00
build.sh Outdated
@ -1 +1 @@
nix-shell --command "cargo xbuild --release -p experiments" && scp -P 2204 -C target/armv7-none-eabihf/release/zc706-experiments $1@nixbld.m-labs.hk:/home/$1/zc706/zc706.elf
nix-shell --command "cargo xbuild --release -p experiments" && scp -P 2204 -C target/armv7-none-eabihf/release/experiments -6 $1@nixbld.m-labs.hk:/home/$1/zc706/zc706.elf
sb10q commented 2020-08-08 10:03:21 +08:00
Owner
Copy Link

-6 will not work with -P 2204 nor is it needed otherwise. It's either -P 2204 nixbld.m-labs.hk or rpi-4.m-labs.hk.

``-6`` will not work with ``-P 2204`` nor is it needed otherwise. It's either ``-P 2204 nixbld.m-labs.hk`` or ``rpi-4.m-labs.hk``.
harry commented 2020-08-10 10:23:52 +08:00
Author
Contributor
Copy Link

So are we to abandon the use of nixbld.m-labs.hk altogether and use rpi-4 only instead?

So are we to abandon the use of `nixbld.m-labs.hk` altogether and use `rpi-4` only instead?
sb10q commented 2020-08-10 11:19:18 +08:00
Owner
Copy Link

Yes the port redirect on nixbld is only a workaround for people who don't have IPv6.

Yes the port redirect on nixbld is only a workaround for people who don't have IPv6.
harry commented 2020-08-11 11:24:16 +08:00
Author
Contributor
Copy Link

aed2a619f1 now replaces nixbld port 2204 with rpi-4. The scp's -6 parameter is unneeded.

aed2a619f17cf7a7e85efa2b0891609bbc0449a6 now replaces `nixbld` port 2204 with `rpi-4`. The `scp`'s `-6` parameter is unneeded.
sb10q closed this pull request 2020-08-11 11:24:21 +08:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/zynq-rs#59
No description provided.
Delete Branch "harry/zynq-rs:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?