From 866f10b1714a103b5fa2d1732af242020d1d1273 Mon Sep 17 00:00:00 2001 From: Steve Fan Date: Mon, 6 Dec 2021 15:09:44 +0800 Subject: [PATCH 1/3] readme: fix variant alphabet case --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eb0f98f..9236077 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ 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 ``` -- 2.42.0 From 4e4130cc7d983a82148381a772bbfebbc49fb319 Mon Sep 17 00:00:00 2001 From: Steve Fan Date: Mon, 6 Dec 2021 15:10:25 +0800 Subject: [PATCH 2/3] readme: add a reminder for future NixOS users --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9236077..7247a31 100644 --- a/README.md +++ b/README.md @@ -62,13 +62,15 @@ cd .. 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/refs/tags/21.05.tar.gz` instead + License ------- -- 2.42.0 From 6cef1e934c2ef0806961a8121760e869918a81cd Mon Sep 17 00:00:00 2001 From: Steve Fan Date: Mon, 6 Dec 2021 15:20:22 +0800 Subject: [PATCH 3/3] fixup! readme: add a reminder for future NixOS users --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7247a31..25fb175 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Notes: - 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/refs/tags/21.05.tar.gz` instead +[^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 ------- -- 2.42.0