From c94e9aebf4899a5ebcbe142c41b368f1979fb9a4 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Thu, 7 Oct 2021 09:40:09 +0200 Subject: [PATCH] removed fwtype_targets --- default.nix | 2 +- src/Makefile | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index d4f9532..f5c0b03 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}" ${fwtype}_target + make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ../build/${fwtype}.bin ''; installPhase = '' diff --git a/src/Makefile b/src/Makefile index ab61d93..a6a15e0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,15 +1,10 @@ TARGET := zc706 GWARGS := -V simple -all: runtime - -runtime_target: ../build/runtime.bin - -satman_target: ../build/satman.bin +all: ../build/runtime.bin .PHONY: all - ../build/pl.rs ../build/rustc-cfg ../build/mem.rs: gateware/* mkdir -p ../build python gateware/$(TARGET).py -r ../build/pl.rs -c ../build/rustc-cfg -m ../build/mem.rs $(GWARGS)