forked from M-Labs/artiq
build_soc: override identifier_str only for gateware
This commit is contained in:
parent
3d84135810
commit
91df3d7290
@ -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):
|
||||||
|
Loading…
Reference in New Issue
Block a user