From 0681d472c7a6b59d619386f965dd87b4e48b300f Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 22 Dec 2017 17:14:10 +0800 Subject: [PATCH] conda: fix sayma_rtm_csr.csv location for Sayma AMC --- artiq/gateware/targets/sayma_amc_standalone.py | 14 +------------- conda/artiq-sayma_amc-standalone/build.sh | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/artiq/gateware/targets/sayma_amc_standalone.py b/artiq/gateware/targets/sayma_amc_standalone.py index 768f48d0f..c9361cee5 100755 --- a/artiq/gateware/targets/sayma_amc_standalone.py +++ b/artiq/gateware/targets/sayma_amc_standalone.py @@ -27,7 +27,6 @@ from artiq.gateware import remote_csr from artiq.gateware import rtio from artiq.gateware.rtio.phy import ttl_simple, sawg from artiq import __version__ as artiq_version -from artiq import __path__ as artiq_path PhyPads = namedtuple("PhyPads", "txp txn") @@ -220,9 +219,6 @@ class Standalone(MiniSoC, AMPSoC): def main(): - installed_rtm_csr_csv = os.path.join( - artiq_path[0], "binaries", "sayma_rtm", "sayma_rtm_csr.csv") - parser = argparse.ArgumentParser( description="ARTIQ device binary builder / Sayma AMC stand-alone") builder_args(parser) @@ -230,10 +226,6 @@ def main(): parser.add_argument("--rtm-csr-csv", default=os.path.join("artiq_sayma_rtm", "sayma_rtm_csr.csv"), help="CSV file listing remote CSRs on RTM (default: %(default)s)") - parser.add_argument("--installed-rtm-csr-csv", - default=False, action="store_true", - help="use installed CSV file for RTM CSRs instead " - "({}, default: %(default)s)".format(installed_rtm_csr_csv)) parser.add_argument("--with-sawg", default=False, action="store_true", help="add JESD204B and SAWG channels (default: %(default)s)") @@ -241,13 +233,9 @@ def main(): soc = Standalone(with_sawg=args.with_sawg, **soc_sdram_argdict(args)) - if args.installed_rtm_csr_csv: - rtm_csr_csv = installed_rtm_csr_csv - else: - rtm_csr_csv = args.rtm_csr_csv remote_csr_regions = remote_csr.get_remote_csr_regions( soc.mem_map["serwb"] | soc.shadow_base, - rtm_csr_csv) + args.rtm_csr_csv) for name, origin, busword, csrs in remote_csr_regions: soc.add_csr_region(name, origin, busword, csrs) # Configuration for RTM peripherals. Keep in sync with sayma_rtm.py! diff --git a/conda/artiq-sayma_amc-standalone/build.sh b/conda/artiq-sayma_amc-standalone/build.sh index c0a3e1975..aa116befb 100644 --- a/conda/artiq-sayma_amc-standalone/build.sh +++ b/conda/artiq-sayma_amc-standalone/build.sh @@ -3,7 +3,7 @@ SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/sayma_amc-standalone mkdir -p $SOC_PREFIX -V=1 $PYTHON -m artiq.gateware.targets.sayma_amc_standalone --installed-rtm-csr-csv +V=1 $PYTHON -m artiq.gateware.targets.sayma_amc_standalone --rtm-csr-csv $SP_DIR/artiq/binaries/sayma_rtm/sayma_rtm_csr.csv cp misoc_standalone_sayma_amc/gateware/top.bit $SOC_PREFIX cp misoc_standalone_sayma_amc/software/bios/bios.bin $SOC_PREFIX cp misoc_standalone_sayma_amc/software/runtime/runtime.fbi $SOC_PREFIX