diff --git a/shell.nix b/shell.nix index 363b552..e2dd593 100644 --- a/shell.nix +++ b/shell.nix @@ -34,10 +34,6 @@ let set-gdb-config-file && cargo run --example ethernet ''; - editMigenScript = writeShellScriptBin "edit-migen-script" '' - nano -m migen/fpga_config.py - ''; - compileMigenScript = writeShellScriptBin "compile-migen-script" '' python3 migen/fpga_config.py echo "Compiled fpga_config.py to top.bin" @@ -65,6 +61,10 @@ let echo "Reset is complete, please reset the openocd server." ''; + openocdFlash = writeShellScriptBin "openocd-flash" '' + openocd -f openocd/openocd.cfg -f openocd/$1.cfg + ''; + in stdenv.mkDerivation { name = "nix-shell"; @@ -83,13 +83,11 @@ in runOpenOcdBlock setGDBConfigFile runEthernetServer - editMigenScript compileMigenScript flashFPGAConfig configureFPGA verifyFPGAConfig resetFlash + openocdFlash ]; - - RUST_BACKTRACE = 1; }