From b0259bcc3966b2a61fc38ffa8bd5f34dc4484102 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Fri, 8 Oct 2021 10:33:14 +0200 Subject: [PATCH] added explicit runtime/satman targets for makefile --- default.nix | 2 +- src/Makefile | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 2826ce1..b2b39b2 100644 --- a/default.nix +++ b/default.nix @@ -35,7 +35,7 @@ let 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 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 = '' diff --git a/src/Makefile b/src/Makefile index a6a15e0..f9dbc2e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,9 +1,13 @@ TARGET := zc706 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/* mkdir -p ../build