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
2 changed files with 11 additions and 8 deletions

View File

@ -1,7 +1,7 @@
# Build # Build
```shell ```shell
nix-shell --command "cargo xbuild --release" nix-shell --command "cargo xbuild --release -p experiments"
``` ```
Currently the ELF output is placed at `target/armv7-none-eabihf/release/experiments` Currently the ELF output is placed at `target/armv7-none-eabihf/release/experiments`
@ -41,7 +41,7 @@ Proceed using gdb with `load`, `c`
### Running on the ZC706 ### Running on the ZC706
```shell ```shell
nix-shell --command "cargo xbuild --release" nix-shell --command "cargo xbuild --release -p experiments"
cd openocd cd openocd
openocd -f zc706.cfg openocd -f zc706.cfg
``` ```
@ -64,16 +64,19 @@ openocd -f cora-z7-10.cfg
Clone this repo onto your development/build machine and the raspberry pi that controls the Xilinx 7000 board 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 target pi (in your pi $HOME directory):
Outdated
Review

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.
Outdated
Review

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 ```shell
cd ~/zc706 cd ~/zynq-rs
./build.sh $your_user/ssh_id ./build.sh $your_user_or_ssh_id
``` ```
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: 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 ```shell
ssh pi4 ssh pi4
cd zc706 cd zynq-rs
# For ZC706, run:
./tmux.sh 0
# For Cora Z7, run:
./tmux.sh ./tmux.sh
``` ```

View File

@ -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 -C target/armv7-none-eabihf/release/experiments $1@rpi-4.m-labs.hk:/home/$1/zc706/zc706.elf
Outdated
Review

-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``.
Outdated
Review

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?
Outdated
Review

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.