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 +2 -8
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aed2a619f1 - Show all commits

8
README.md
View File

@ -64,18 +64,12 @@ openocd -f zc706.cfg -c "pld load 0 blinker_migen.bit; exit"
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 nixbuild.m-labs.hk server:
On the dev machine, the below script builds zc706 and secure copies it to the target pi (in your pi $HOME directory):
sb10q commented 2020-08-07 11:40:47 +08:00
Outdated
Review
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
Outdated
Review
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.
```shell
cd ~/zynq-rs
./build.sh $your_user_or_ssh_id
```
Alternatively, you may copy the zc706 build to the target pi (in your pi $HOME directory, for example) using:
```shell
cd ~/zynq-rs
scp -C target/armv7-none-eabihf/release/experiments your_user_or_ssh_id@pi_hostname:/home/your_user_or_ssh_id/zynq-rs/zc706.elf
```
On the pi, we need an information rich environment that includes a relatively reliable `gdb` experience (that includes `ctrl-p` and `ctrl-n` command history that persists across `cgdb` executions), run:
```shell
ssh pi4

2
build.sh
View File

@ -1 +1 @@
nix-shell --command "cargo xbuild --release -p experiments" && scp -P 2204 -C target/armv7-none-eabihf/release/experiments $1@nixbld.m-labs.hk:/home/$1/zc706/zc706.elf
nix-shell --command "cargo xbuild --release -p experiments" && scp -C target/armv7-none-eabihf/release/experiments $1@rpi-4.m-labs.hk:/home/$1/zc706/zc706.elf
sb10q commented 2020-08-08 10:03:21 +08:00
Outdated
Review
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
Outdated
Review
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
Outdated
Review
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.