From cd3e46fb3ad891c7e7c5af5570b35d8cb52efa31 Mon Sep 17 00:00:00 2001
From: mwojcik <mw@m-labs.hk>
Date: Mon, 6 Sep 2021 15:23:53 +0200
Subject: [PATCH] fixes in makefile for kasli and satellite variants

---
 default.nix  | 2 +-
 src/Makefile | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/default.nix b/default.nix
index 350d932b..a6011c66 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}" ${if variant == "satellite" then "satman" else "runtime"}
+        make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ${fwtype}
       '';
 
       # there's probably a better way to go around it
diff --git a/src/Makefile b/src/Makefile
index 49b735b0..5eca52f9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,5 @@
 TARGET := zc706
 GWARGS := -V simple
-SATMAN_GWARGS := -V satellite
 
 all: runtime
 
@@ -23,11 +22,7 @@ runtime: ../build/runtime.bin
 ../build/runtime.bin: ../build/firmware/armv7-none-eabihf/release/runtime
 	llvm-objcopy -O binary ../build/firmware/armv7-none-eabihf/release/runtime ../build/runtime.bin
 
-satman_cfg:
-	mkdir -p ../build
-	python gateware/$(TARGET).py -r ../build/pl.rs -c ../build/rustc-cfg -m ../build/mem.rs $(SATMAN_GWARGS)
-
-satmanout: satman_cfg
+satmanout: ../build/pl.rs ../build/rustc-cfg
 	cd satman && \
 	XBUILD_SYSROOT_PATH=`pwd`/../../build/sysroot \
 	cargo xbuild --release \