srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

efc: use variant (expected everywhere else)

This commit is contained in:
Sebastien Bourdeauducq 2023-08-25 15:52:40 +08:00
parent 2139456f80
commit 3452d0c423
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artiq/gateware/targets/efc.py
View File

@ -167,6 +167,7 @@ def main():
description="ARTIQ device binary builder for EEM FMC Carrier systems") description="ARTIQ device binary builder for EEM FMC Carrier systems")
builder_args(parser) builder_args(parser)
parser.set_defaults(output_dir="artiq_efc") parser.set_defaults(output_dir="artiq_efc")
parser.add_argument("-V", "--variant", default="shuttler")
parser.add_argument("--gateware-identifier-str", default=None, parser.add_argument("--gateware-identifier-str", default=None,
help="Override ROM identifier") help="Override ROM identifier")
args = parser.parse_args() args = parser.parse_args()

5
flake.nix
View File

@ -358,10 +358,9 @@
target = "kc705"; target = "kc705";
variant = "nist_clock"; variant = "nist_clock";
}; };
artiq-board-efc = makeArtiqBoardPackage { artiq-board-efc-shuttler = makeArtiqBoardPackage {
target = "efc"; target = "efc";
variant = "shuttler"; variant = "shuttler";
buildCommand = "python -m artiq.gateware.targets.efc";
}; };
inherit sphinxcontrib-wavedrom latex-artiq-manual; inherit sphinxcontrib-wavedrom latex-artiq-manual;
artiq-manual-html = pkgs.stdenvNoCC.mkDerivation rec { artiq-manual-html = pkgs.stdenvNoCC.mkDerivation rec {
@ -462,7 +461,7 @@
}; };
hydraJobs = { hydraJobs = {
inherit (packages.x86_64-linux) artiq artiq-board-kc705-nist_clock artiq-board-efc openocd-bscanspi; inherit (packages.x86_64-linux) artiq artiq-board-kc705-nist_clock artiq-board-efc-shuttler openocd-bscanspi;
gateware-sim = pkgs.stdenvNoCC.mkDerivation { gateware-sim = pkgs.stdenvNoCC.mkDerivation {
name = "gateware-sim"; name = "gateware-sim";
buildInputs = [ buildInputs = [