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

drtio: remove support for transceiver SMAs 

Passive SFP cables do not require bitstream rebuilds and do not cause weird transceiver failures.
This commit is contained in:
Sebastien Bourdeauducq 2017-01-27 23:33:50 +08:00
parent 7b2eba9fbd
commit 94b0783897
2 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
artiq/gateware/targets/kc705_drtio_master.py
View File

@ -27,7 +27,7 @@ class Master(MiniSoC, AMPSoC):
} }
mem_map.update(MiniSoC.mem_map) mem_map.update(MiniSoC.mem_map)
def __init__(self, cfg, medium, **kwargs): def __init__(self, cfg, **kwargs):
MiniSoC.__init__(self, MiniSoC.__init__(self,
cpu_type="or1k", cpu_type="or1k",
sdram_controller_type="minicon", sdram_controller_type="minicon",
@ -38,16 +38,9 @@ class Master(MiniSoC, AMPSoC):
platform = self.platform platform = self.platform
if medium == "sfp": self.comb += platform.request("sfp_tx_disable_n").eq(1)
self.comb += platform.request("sfp_tx_disable_n").eq(1) tx_pads = platform.request("sfp_tx")
tx_pads = platform.request("sfp_tx") rx_pads = platform.request("sfp_rx")
rx_pads = platform.request("sfp_rx")
elif medium == "sma":
tx_pads = platform.request("user_sma_mgt_tx")
rx_pads = platform.request("user_sma_mgt_rx")
else:
raise ValueError
if cfg == "simple_gbe": if cfg == "simple_gbe":
# GTX_1000BASE_BX10 Ethernet compatible, 62.5MHz RTIO clock # GTX_1000BASE_BX10 Ethernet compatible, 62.5MHz RTIO clock
# simple TTLs # simple TTLs
@ -110,12 +103,9 @@ def main():
parser.add_argument("-c", "--config", default="simple_gbe", parser.add_argument("-c", "--config", default="simple_gbe",
help="configuration: simple_gbe/sawg_3g " help="configuration: simple_gbe/sawg_3g "
"(default: %(default)s)") "(default: %(default)s)")
parser.add_argument("--medium", default="sfp",
help="medium to use for transceiver link: sfp/sma "
"(default: %(default)s)")
args = parser.parse_args() args = parser.parse_args()
soc = Master(args.config, args.medium, **soc_kc705_argdict(args)) soc = Master(args.config, **soc_kc705_argdict(args))
build_artiq_soc(soc, builder_argdict(args)) build_artiq_soc(soc, builder_argdict(args))

20
artiq/gateware/targets/kc705_drtio_satellite.py
View File

@ -125,7 +125,7 @@ class Satellite(BaseSoC):
} }
mem_map.update(BaseSoC.mem_map) mem_map.update(BaseSoC.mem_map)
def __init__(self, cfg, medium, **kwargs): def __init__(self, cfg, **kwargs):
BaseSoC.__init__(self, BaseSoC.__init__(self,
cpu_type="or1k", cpu_type="or1k",
sdram_controller_type="minicon", sdram_controller_type="minicon",
@ -154,16 +154,9 @@ class Satellite(BaseSoC):
sequencer.reset.eq(si5324_reset_clock.si5324_not_ready) sequencer.reset.eq(si5324_reset_clock.si5324_not_ready)
] ]
if medium == "sfp": self.comb += platform.request("sfp_tx_disable_n").eq(1)
self.comb += platform.request("sfp_tx_disable_n").eq(1) tx_pads = platform.request("sfp_tx")
tx_pads = platform.request("sfp_tx") rx_pads = platform.request("sfp_rx")
rx_pads = platform.request("sfp_rx")
elif medium == "sma":
tx_pads = platform.request("user_sma_mgt_tx")
rx_pads = platform.request("user_sma_mgt_rx")
else:
raise ValueError
if cfg == "simple_gbe": if cfg == "simple_gbe":
# GTX_1000BASE_BX10 Ethernet compatible, 62.5MHz RTIO clock # GTX_1000BASE_BX10 Ethernet compatible, 62.5MHz RTIO clock
# simple TTLs # simple TTLs
@ -210,12 +203,9 @@ def main():
parser.add_argument("-c", "--config", default="simple_gbe", parser.add_argument("-c", "--config", default="simple_gbe",
help="configuration: simple_gbe/sawg_3g " help="configuration: simple_gbe/sawg_3g "
"(default: %(default)s)") "(default: %(default)s)")
parser.add_argument("--medium", default="sfp",
help="medium to use for transceiver link: sfp/sma "
"(default: %(default)s)")
args = parser.parse_args() args = parser.parse_args()
soc = Satellite(args.config, args.medium, **soc_kc705_argdict(args)) soc = Satellite(args.config, **soc_kc705_argdict(args))
builder = Builder(soc, **builder_argdict(args)) builder = Builder(soc, **builder_argdict(args))
builder.add_software_package("liballoc") builder.add_software_package("liballoc")
builder.add_software_package("satman", os.path.join(artiq_dir, "firmware", "satman")) builder.add_software_package("satman", os.path.join(artiq_dir, "firmware", "satman"))