From 7edd192c3bf191493a1ae3b54ff3622cb00ac00f Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 9 Sep 2020 14:57:03 +0800 Subject: [PATCH] remove outdated/unmaintained files --- README.md | 77 +++---------------------------------------------------- qemu.gdb | 6 ----- runner.sh | 11 -------- tmux.sh | 36 -------------------------- 4 files changed, 3 insertions(+), 127 deletions(-) delete mode 100644 qemu.gdb delete mode 100755 runner.sh delete mode 100755 tmux.sh diff --git a/README.md b/README.md index abfbe9d..449795a 100644 --- a/README.md +++ b/README.md @@ -8,37 +8,7 @@ Currently the ELF output is placed at `target/armv7-none-eabihf/release/experime # Debug -## Using the Xilinx toolchain - -Tested with the ZC706 board. - -Run the Xilinx Microprocessor Debugger: -```shell -/opt/Xilinx/14.7/ISE_DS/EDK/bin/lin64/xmd -``` - -Connect to target (given it is connected and you have permissions): -```tcl -connect arm hw -``` - -Leave xmd running. - -Start the Xilinx version of the GNU debugger with your latest build: -```shell -/opt/Xilinx/14.7/ISE_DS/EDK/gnu/arm/lin/bin/arm-xilinx-linux-gnueabi-gdb zc706 -``` - -Connect the debugger to xmd over TCP on localhost: -```gdb -target remote :1234 -``` - -Proceed using gdb with `load`, `c` - -## Using OpenOCD - -### Running on the ZC706 +## Running on the ZC706 ```shell nix-shell --command "cargo xbuild --release -p experiments" @@ -46,7 +16,7 @@ cd openocd openocd -f zc706.cfg ``` -### Running on the Cora Z7-10 +## Running on the Cora Z7-10 ```shell nix-shell --command "cd experiments && cargo xbuild --release --no-default-features --features=target_cora_z7_10" @@ -54,49 +24,8 @@ cd openocd openocd -f cora-z7-10.cfg ``` -### Loading a bitstream into volatile memory +## Loading a bitstream into volatile memory ```shell openocd -f zc706.cfg -c "pld load 0 blinker_migen.bit; exit" ``` - -### Development Process - -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): -```shell -cd ~/zynq-rs -./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: -```shell -ssh pi4 -cd zynq-rs -# For ZC706, run: -./tmux.sh 0 -# For Cora Z7, run: -./tmux.sh -``` - -Time to run your code with: -```shell -zynq-connect -zynq-restart -c -``` -or, for a more succinct experience, (identical to above) -```shell -dc -dr -c -``` - -After every build on your dev machine, simply run: -```shell -dr -c -``` -Sometimes you might need to type `load` after `dr`. - diff --git a/qemu.gdb b/qemu.gdb deleted file mode 100644 index 8ebd754..0000000 --- a/qemu.gdb +++ /dev/null @@ -1,6 +0,0 @@ -target remote :1234 - -# print demangled symbols by default -set print asm-demangle on - -load diff --git a/runner.sh b/runner.sh deleted file mode 100755 index b0bedfe..0000000 --- a/runner.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e -m - -ELF=$1 -IMAGE=$ELF.bin -arm-none-eabihf-objcopy -O binary $ELF $IMAGE -qemu-system-arm -M xilinx-zynq-a9 -s -kernel $IMAGE -chardev file,id=uart0,path=/tmp/qemu.serial & -sleep 1 -gdb -x qemu.gdb $ELF -kill -KILL %1 diff --git a/tmux.sh b/tmux.sh deleted file mode 100755 index 0dcde6b..0000000 --- a/tmux.sh +++ /dev/null @@ -1,36 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p gdb openocd cgdb tmux -SESSION=$USER - -if [ $1 -eq 0 ] -then - tmux -2 new-session -d -s $SESSION - tmux new-window -t $SESSION:1 -n 'ZC706' - tmux split-window -h - tmux select-pane -t 0 - tmux send-keys "stty 115200 < /dev/ttyUSB1 && cat /dev/ttyUSB1" C-m - tmux select-pane -t 1 - tmux send-keys "sleep 10 && cgdb zc706.elf -x openocd/gdb-zynq-commands" C-m - tmux split-window -v - tmux resize-pane -D 20 - tmux send-keys "cd openocd && openocd -f zc706.cfg -c reset init" C-m -else - tmux -2 new-session -d -s $SESSION - tmux new-window -t $SESSION:1 -n 'CORA Z7' - tmux split-window -h - tmux select-pane -t 0 - tmux send-keys "stty 115200 < /dev/ttyUSB1 && cat /dev/ttyUSB1" C-m - tmux select-pane -t 1 - tmux send-keys "sleep 10 && cgdb target/armv7-none-eabihf/release/zc706-experiments -x openocd/gdb-zynq-commands" C-m - tmux split-window -v - tmux resize-pane -D 20 - tmux send-keys "cd openocd && openocd -f cora-z7-10.cfg -c reset init" C-m -fi -# Set default window -tmux select-window -t $SESSION:1 - -# Set focus on gdb -tmux select-pane -t $SESSION:.- - -# Attach to session -tmux -2 attach-session -t $SESSION