From a4fbb96296030ffc8e610b1ce8aff4492cf65ddd Mon Sep 17 00:00:00 2001 From: stevefan1999 Date: Mon, 6 Dec 2021 15:20:55 +0800 Subject: [PATCH] little fixes for README (#157) Co-authored-by: Steve Fan Reviewed-on: https://git.m-labs.hk/M-Labs/artiq-zynq/pulls/157 Co-authored-by: stevefan1999 Co-committed-by: stevefan1999 --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eb0f98fb..25fb1756 100644 --- a/README.md +++ b/README.md @@ -55,20 +55,22 @@ Impure incremental build and execution on a remote JTAG server: nix-shell cd src gateware/zc706.py -g ../build/gateware -v # build gateware -make GWARGS="-v " # build firmware +make GWARGS="-V " # build firmware cd .. ./remote_run.sh -i ``` Notes: -- This is developed with Nixpkgs 21.05, and the ``nixbld.m-labs.hk`` binary substituter can also be used here (see the ARTIQ manual for the public key and instructions). +- This is developed with Nixpkgs 21.05[^1], and the ``nixbld.m-labs.hk`` binary substituter can also be used here (see the ARTIQ manual for the public key and instructions). - The impure build process is also compatible with non-Nix systems. - When calling make, you need to specify both the variant and firmware type. - Firmware type must be either ``runtime`` for DRTIO-less or DRTIO master variants, or ``satman`` for DRTIO satellite. - If the board is connected to the local machine, use the ``local_run.sh`` script. - To update ``zynq-rs``, update the cargo files as per usual for Rust projects, but also keep ``zynq-rs.nix`` in sync. +[^1]: Thus, on newer version of NixOS, you should run `nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/21.05.tar.gz` instead + License -------