From cc6e7095f3fc0e6e110f51a4c631c1be3735305c Mon Sep 17 00:00:00 2001 From: Stephan Maka Date: Sun, 27 Dec 2020 01:59:39 +0100 Subject: [PATCH] artiq-full: add a boardsWithoutBuildSplit blacklist --- artiq-full.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/artiq-full.nix b/artiq-full.nix index 3f32f02..2d4b8dd 100644 --- a/artiq-full.nix +++ b/artiq-full.nix @@ -102,13 +102,22 @@ let "wipm7master" "wipm7satellite" ]); + # Splitting the build process into software+gateware does + # not work when artiq embeds compiled firmware into generated + # Vivado input. + boardsWithoutBuildSplit = [ + { target = "sayma"; variant = "rtm"; } + ]; vivado = import ./fast/vivado.nix { inherit pkgs; }; - artiq-board-import = + artiq-board-import = path: import path { inherit pkgs vivado; }; + artiq-board = args: if pkgs.lib.strings.versionAtLeast artiq-fast.artiq.version "6.0" - then ./artiq-board.nix - else ./fast/artiq-board.nix; - artiq-board = import artiq-board-import { inherit pkgs vivado; }; + && ! builtins.elem { inherit (args) target variant; } boardsWithoutBuildSplit + then + artiq-board-import ./artiq-board.nix args + else + artiq-board-import ./fast/artiq-board.nix args; conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; }; src = pkgs.fetchgit { url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";