M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

build_soc: override identifier_str only for gateware

This commit is contained in:
Astro 2020-08-31 21:44:27 +02:00 committed by Sébastien Bourdeauducq
parent 3d84135810
commit 91df3d7290
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/build_soc.py
View File

@ -47,12 +47,11 @@ class ReprogrammableIdentifier(Module, AutoCSR):
def add_identifier(soc, *args, identifier_str=None, **kwargs): def add_identifier(soc, *args, identifier_str=None, **kwargs):
if hasattr(soc, "identifier"): if hasattr(soc, "identifier"):
raise ValueError raise ValueError
if identifier_str is None: software_identifier_str = get_identifier_string(soc, *args, **kwargs)
# not overridden with --identifier-str gateware_identifier_str = identifier_str or software_identifier_str
identifier_str = get_identifier_string(soc, *args, **kwargs)
soc.submodules.identifier = ReprogrammableIdentifier(identifier_str)
soc.config["IDENTIFIER_STR"] = identifier_str
soc.submodules.identifier = ReprogrammableIdentifier(gateware_identifier_str)
soc.config["IDENTIFIER_STR"] = software_identifier_str
def build_artiq_soc(soc, argdict): def build_artiq_soc(soc, argdict):