drop board-generated on ARTIQ 7
This is becoming too complicated, and with the number of systems increasing we should find a better way of managing bitstream builds anyway. Simply caching Verilog->bitfile does not cut it.
This commit is contained in:
parent
07620ae716
commit
fcc91513ec
|
@ -1,12 +1,12 @@
|
||||||
{ pkgs ? import <nixpkgs> { overlays = [ (import ./artiq-fast/mozilla-overlay.nix) ]; }
|
{ pkgs ? import <nixpkgs> { overlays = [ (import ./artiq-fast/mozilla-overlay.nix) ]; }
|
||||||
, a6p ? <a6p>
|
, use-generated ? <use-generated>
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
sinaraSystemsRev = builtins.readFile <artiq-board-generated/sinara-rev.txt>;
|
sinaraSystemsRev = builtins.readFile <artiq-board-generated/sinara-rev.txt>;
|
||||||
sinaraSystemsHash = builtins.readFile <artiq-board-generated/sinara-hash.txt>;
|
sinaraSystemsHash = builtins.readFile <artiq-board-generated/sinara-hash.txt>;
|
||||||
sinaraSystemsSrc =
|
sinaraSystemsSrc =
|
||||||
if a6p
|
if use-generated
|
||||||
then pkgs.fetchgit {
|
then pkgs.fetchgit {
|
||||||
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
|
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
|
||||||
rev = sinaraSystemsRev;
|
rev = sinaraSystemsRev;
|
||||||
|
@ -14,7 +14,7 @@ let
|
||||||
}
|
}
|
||||||
else <sinaraSystemsSrc>;
|
else <sinaraSystemsSrc>;
|
||||||
artiq-fast =
|
artiq-fast =
|
||||||
if a6p
|
if use-generated
|
||||||
then <artiq-board-generated/fast>
|
then <artiq-board-generated/fast>
|
||||||
else <artiq-fast>;
|
else <artiq-fast>;
|
||||||
artiqVersion = import (artiq-fast + "/pkgs/artiq-version.nix") {
|
artiqVersion = import (artiq-fast + "/pkgs/artiq-version.nix") {
|
||||||
|
@ -47,7 +47,7 @@ let
|
||||||
''
|
''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
|
|
||||||
${if a6p
|
${if use-generated
|
||||||
then ''
|
then ''
|
||||||
cp -a ${<artiq-board-generated>} $out/board-generated
|
cp -a ${<artiq-board-generated>} $out/board-generated
|
||||||
ln -s board-generated/fast $out/fast
|
ln -s board-generated/fast $out/fast
|
||||||
|
@ -59,7 +59,7 @@ let
|
||||||
cp ${./artiq-full}/extras.nix $out
|
cp ${./artiq-full}/extras.nix $out
|
||||||
cp ${./artiq-full}/*.patch $out
|
cp ${./artiq-full}/*.patch $out
|
||||||
|
|
||||||
${if a6p
|
${if use-generated
|
||||||
then ''
|
then ''
|
||||||
REV=${sinaraSystemsRev}
|
REV=${sinaraSystemsRev}
|
||||||
HASH=${sinaraSystemsHash}
|
HASH=${sinaraSystemsHash}
|
||||||
|
@ -77,7 +77,7 @@ let
|
||||||
{ pkgs ? import <nixpkgs> {}}:
|
{ pkgs ? import <nixpkgs> {}}:
|
||||||
|
|
||||||
let
|
let
|
||||||
artiq-fast = import ${if a6p then "./board-generated" else "."}/fast { inherit pkgs; };
|
artiq-fast = import ${if use-generated then "./board-generated" else "."}/fast { inherit pkgs; };
|
||||||
ddbDeps = [
|
ddbDeps = [
|
||||||
artiq-fast.artiq
|
artiq-fast.artiq
|
||||||
(pkgs.python3.withPackages (ps: [ ps.jsonschema ]))
|
(pkgs.python3.withPackages (ps: [ ps.jsonschema ]))
|
||||||
|
@ -90,11 +90,11 @@ let
|
||||||
builtins.map (variant: "\"${variant}\"") standaloneVariants
|
builtins.map (variant: "\"${variant}\"") standaloneVariants
|
||||||
)}];
|
)}];
|
||||||
|
|
||||||
vivado = import ${if a6p then "./board-generated" else "."}/fast/vivado.nix {
|
vivado = import ${if use-generated then "./board-generated" else "."}/fast/vivado.nix {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
};
|
};
|
||||||
artiq-board =
|
artiq-board =
|
||||||
${if a6p
|
${if use-generated
|
||||||
then ''
|
then ''
|
||||||
import ./artiq-board-vivado.nix {
|
import ./artiq-board-vivado.nix {
|
||||||
inherit pkgs vivado;
|
inherit pkgs vivado;
|
||||||
|
@ -147,7 +147,7 @@ let
|
||||||
})
|
})
|
||||||
) {} ${serializedTargets};
|
) {} ${serializedTargets};
|
||||||
drtio-systems = {
|
drtio-systems = {
|
||||||
${pkgs.lib.optionalString a6p ''
|
${pkgs.lib.optionalString use-generated ''
|
||||||
ap = {
|
ap = {
|
||||||
master = "apmaster";
|
master = "apmaster";
|
||||||
satellites = {
|
satellites = {
|
||||||
|
|
|
@ -16,24 +16,6 @@
|
||||||
"artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false }
|
"artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"board-generated-beta": {
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": false,
|
|
||||||
"description": "Generated code for ARTIQ boards (beta version)",
|
|
||||||
"nixexprinput": "nixScripts",
|
|
||||||
"nixexprpath": "artiq-board-generated",
|
|
||||||
"checkinterval": 14400,
|
|
||||||
"schedulingshares": 1,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 50,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
|
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
|
||||||
"sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
|
|
||||||
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"full-beta": {
|
"full-beta": {
|
||||||
"enabled": 1,
|
"enabled": 1,
|
||||||
"hidden": false,
|
"hidden": false,
|
||||||
|
@ -48,8 +30,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
||||||
"a6p": { "type": "boolean", "value": "true" },
|
"use-generated": { "type": "boolean", "value": "false" }
|
||||||
"artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated-beta:generated-nix", "emailresponsible": false }
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -102,7 +83,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
||||||
"a6p": { "type": "boolean", "value": "true" },
|
"use-generated": { "type": "boolean", "value": "true" },
|
||||||
"artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated:generated-nix", "emailresponsible": false }
|
"artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated:generated-nix", "emailresponsible": false }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -139,7 +120,7 @@
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-21.05", "emailresponsible": false },
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
||||||
"sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
|
"sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
|
||||||
"a6p": { "type": "boolean", "value": "false" },
|
"use-generated": { "type": "boolean", "value": "false" },
|
||||||
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false }
|
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue