• Joined on 2021-07-22
mwojcik pushed to drtio_scripts at mwojcik/artiq-zynq 2021-10-07 20:48:18 +08:00
fbd5604906 Merge branch 'master' into drtio_scripts
41295b0e01 update cargoSha256
aaec0abdf6 fix build/warnings before drtio is fully merged
e241957419 add libbuild_zynq
50262b3f0c runtime: link_thread -> link_task
Compare 8 commits »
mwojcik pushed to drtio_gateware at mwojcik/artiq-zynq 2021-10-07 17:51:40 +08:00
6c2c4a9119 zc706: forgot to add drtiorep csr group
mwojcik pushed to drtio_gateware at mwojcik/artiq-zynq 2021-10-07 17:44:51 +08:00
b11f689e2d zc706: added user_sma_mgt, repeaters for sat
mwojcik pushed to drtio_scripts at mwojcik/artiq-zynq 2021-10-07 15:40:16 +08:00
c94e9aebf4 removed fwtype_targets
mwojcik commented on pull request M-Labs/artiq-zynq#135 2021-10-07 15:40:05 +08:00
DRTIO port - scripts

I was aiming for clearer reference of the targets in nix-scripts, or when called manually. But it's unnecessary after all, it can be called straight up with the output file rule.

mwojcik commented on pull request M-Labs/artiq-zynq#136 2021-10-07 14:34:02 +08:00
DRTIO port - satman firmware

Turns out it can, it's pulled from runtime now.

mwojcik pushed to drtio_satman at mwojcik/artiq-zynq 2021-10-07 14:33:58 +08:00
a3a6156db1 sharing link.x with runtime
mwojcik commented on pull request M-Labs/artiq-zynq#136 2021-10-07 14:02:14 +08:00
DRTIO port - satman firmware

Is Jdac stuff then unsupported on all platforms? I imagine that it could be forwarded to a mainline artiq-based satellite that does have ad9154. Or is mixing satellites not supported?

mwojcik pushed to drtio_satman at mwojcik/artiq-zynq 2021-10-07 13:47:49 +08:00
d874115f29 removed unnecessary files
mwojcik commented on issue M-Labs/artiq-zynq#117 2021-10-06 21:58:49 +08:00
make ZC706 RTIO channel numbers the same as the KC705

It's almost possible - the only issue is that zc706 does not have user SMA GPIO port. Too bad it's right in the middle... some kind of placeholder will be necessary?

mwojcik pushed to 117_rtio_channels at mwojcik/artiq-zynq 2021-10-06 21:32:24 +08:00
a20598da78 verified missing pins in zc706 docs, added ams, sd
mwojcik pushed to 117_rtio_channels at mwojcik/artiq-zynq 2021-10-06 21:01:27 +08:00
0f0f0f8986 rearranged rtio for nist qc2
mwojcik commented on pull request M-Labs/artiq-zynq#140 2021-10-06 17:56:39 +08:00
DRTIO port - gateware

Okay, makes sense, I was somewhat worried about mismatched voltages for si5324. Although I don't think this is the place to be removing the simple targets, that should be done in another PR (not only…

mwojcik pushed to drtio_gateware at mwojcik/artiq-zynq 2021-10-06 17:54:11 +08:00
7362f6784d Revert "removed simple variants targets" - this is not the place for it
mwojcik pushed to drtio_gateware at mwojcik/artiq-zynq 2021-10-06 17:51:59 +08:00
25c5b670fa removed simple variants targets
mwojcik pushed to drtio_gateware at mwojcik/artiq-zynq 2021-10-06 17:45:51 +08:00
655bcb99cf removed use_si5324_33
mwojcik pushed to drtio_gateware at mwojcik/artiq-zynq 2021-10-06 17:39:50 +08:00
df5436409d prepared for rtioclkmultiplier/serdes in artiq
mwojcik pushed to drtio_gateware at mwojcik/artiq-zynq 2021-10-06 17:31:45 +08:00
0f8a7f3a4c kasli_soc: fix master rtio clock
91fae0b6c9 fix aux_controller -> drtio_aux_controller
Compare 2 commits »
mwojcik pushed to drtio_gateware at mwojcik/artiq-zynq 2021-10-06 15:08:17 +08:00
9bbc12be23 aux_controller renamed to drtio_aux_controller
mwojcik commented on pull request M-Labs/artiq-zynq#140 2021-10-06 15:05:57 +08:00
DRTIO port - gateware

It's the same thing for artiq kasli, kc705 and sayma_rtm boards. I could separate it and save few lines everywhere, but where to put it, so it fits nicely? I'm thinking…