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

conda: fix sayma_rtm_csr.csv location for Sayma AMC

This commit is contained in:
Sebastien Bourdeauducq 2017-12-22 17:14:10 +08:00
parent cbd69287a7
commit 0681d472c7
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artiq/gateware/targets/sayma_amc_standalone.py
View File

@ -27,7 +27,6 @@ from artiq.gateware import remote_csr
from artiq.gateware import rtio from artiq.gateware import rtio
from artiq.gateware.rtio.phy import ttl_simple, sawg from artiq.gateware.rtio.phy import ttl_simple, sawg
from artiq import __version__ as artiq_version from artiq import __version__ as artiq_version
from artiq import __path__ as artiq_path
PhyPads = namedtuple("PhyPads", "txp txn") PhyPads = namedtuple("PhyPads", "txp txn")
@ -220,9 +219,6 @@ class Standalone(MiniSoC, AMPSoC):
def main(): def main():
installed_rtm_csr_csv = os.path.join(
artiq_path[0], "binaries", "sayma_rtm", "sayma_rtm_csr.csv")
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description="ARTIQ device binary builder / Sayma AMC stand-alone") description="ARTIQ device binary builder / Sayma AMC stand-alone")
builder_args(parser) builder_args(parser)
@ -230,10 +226,6 @@ def main():
parser.add_argument("--rtm-csr-csv", parser.add_argument("--rtm-csr-csv",
default=os.path.join("artiq_sayma_rtm", "sayma_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)") 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", parser.add_argument("--with-sawg",
default=False, action="store_true", default=False, action="store_true",
help="add JESD204B and SAWG channels (default: %(default)s)") 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)) 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( remote_csr_regions = remote_csr.get_remote_csr_regions(
soc.mem_map["serwb"] | soc.shadow_base, soc.mem_map["serwb"] | soc.shadow_base,
rtm_csr_csv) args.rtm_csr_csv)
for name, origin, busword, csrs in remote_csr_regions: for name, origin, busword, csrs in remote_csr_regions:
soc.add_csr_region(name, origin, busword, csrs) soc.add_csr_region(name, origin, busword, csrs)
# Configuration for RTM peripherals. Keep in sync with sayma_rtm.py! # Configuration for RTM peripherals. Keep in sync with sayma_rtm.py!

2
conda/artiq-sayma_amc-standalone/build.sh
View File

@ -3,7 +3,7 @@
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/sayma_amc-standalone SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/sayma_amc-standalone
mkdir -p $SOC_PREFIX 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/gateware/top.bit $SOC_PREFIX
cp misoc_standalone_sayma_amc/software/bios/bios.bin $SOC_PREFIX cp misoc_standalone_sayma_amc/software/bios/bios.bin $SOC_PREFIX
cp misoc_standalone_sayma_amc/software/runtime/runtime.fbi $SOC_PREFIX cp misoc_standalone_sayma_amc/software/runtime/runtime.fbi $SOC_PREFIX