M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests 1 Releases Wiki Activity

added explicit runtime/satman targets for makefile

Browse Source
This commit is contained in:
mwojcik 2021-10-08 10:33:14 +02:00
parent 0efa83e956
commit b0259bcc39
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -35,7 +35,7 @@ let
export XARGO_RUST_SRC="${rustPlatform.rust.rustc}/lib/rustlib/src/rust/library" export XARGO_RUST_SRC="${rustPlatform.rust.rustc}/lib/rustlib/src/rust/library"
export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_9.clang-unwrapped.lib}/lib/clang/9.0.1/include" export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_9.clang-unwrapped.lib}/lib/clang/9.0.1/include"
export CARGO_HOME=$(mktemp -d cargo-home.XXX) export CARGO_HOME=$(mktemp -d cargo-home.XXX)
make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ../build/${fwtype}.bin make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ${fwtype}_target
''; '';
installPhase = '' installPhase = ''

8
src/Makefile
View File

@ -1,9 +1,13 @@
TARGET := zc706 TARGET := zc706
GWARGS := -V simple GWARGS := -V simple
all: ../build/runtime.bin all: runtime_target
.PHONY: all runtime_target: ../build/runtime.bin
satman_target: ../build/satman.bin
.PHONY: all runtime_target satman_target
../build/pl.rs ../build/rustc-cfg ../build/mem.rs: gateware/* ../build/pl.rs ../build/rustc-cfg ../build/mem.rs: gateware/*
mkdir -p ../build mkdir -p ../build