Compare commits

...

3 Commits

Author SHA1 Message Date
occheung 26225719a1 make: simplify 2020-09-25 11:24:58 +08:00
occheung 235ddaaf39 nix: simplify 2020-09-25 11:24:45 +08:00
occheung 0b01b9f090 openocd: clean cfg 2020-09-25 11:11:08 +08:00
6 changed files with 10 additions and 55 deletions

View File

@ -1,9 +1,5 @@
fpga_config: fpga_config.rs
openocd -f openocd/openocd.cfg -f openocd/fpga-config.cfg
fpga_config.rs: top.bin
cargo build --example fpga_config
top.bin:
python3 migen/fpga_config.py
fpga_config: main.rs
openocd -f openocd/openocd.cfg -f openocd/main.cfg
main.rs: top.bin
cargo build --release

View File

@ -1,6 +0,0 @@
init
reset init
halt
flash write_image erase target/thumbv7em-none-eabihf/debug/examples/ethernet
reset run
shutdown

View File

@ -1,6 +0,0 @@
init
reset init
halt
flash write_image erase target/thumbv7em-none-eabihf/debug/examples/fpga_config
reset run
shutdown

6
openocd/main.cfg Normal file
View File

@ -0,0 +1,6 @@
init
reset init
halt
flash write_image erase target/thumbv7em-none-eabihf/release/humpback-dds
reset run
shutdown

View File

@ -1,6 +0,0 @@
init
reset init
halt
flash write_image erase target/thumbv7em-none-eabihf/debug/examples/mqtt_client
reset run
shutdown

View File

@ -30,30 +30,6 @@ let
fi
'';
runEthernetServer = writeShellScriptBin "run-ethernet-server" ''
set-gdb-config-file && cargo run --example ethernet
'';
compileMigenScript = writeShellScriptBin "compile-migen-script" ''
python3 migen/fpga_config.py
echo "Compiled fpga_config.py to top.bin"
'';
flashFPGAConfig = writeShellScriptBin "flash-fpga-config" ''
openocd-flash fpga-config
'';
configureFPGA = writeShellScriptBin "configure-fpga" ''
compile-migen-script \
&& cargo build --example fpga_config \
&& flash-fpga-config
'';
resetFlash = writeShellScriptBin "reset-flash" ''
gdb -batch -x gdb_config/reset.gdb
echo "Reset is complete, please reset the openocd server."
'';
openocdFlash = writeShellScriptBin "openocd-flash" ''
openocd -f openocd/openocd.cfg -f openocd/$1.cfg
'';
@ -79,11 +55,6 @@ in
runOpenOcd
runOpenOcdBlock
setGDBConfigFile
runEthernetServer
compileMigenScript
flashFPGAConfig
configureFPGA
resetFlash
openocdFlash
publishMqtt
];