stevefan1999
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
582 Commits 5 Branches 0 Tags 2.5 MiB
Commit Graph

413 Commits

Author SHA1 Message Date
mwojcik f80f2ac99d added support for satellite variants in nix-build 2021-08-31 11:55:34 +02:00
mwojcik db9b744825 satman: fixed timeout millisecond/u64 mismatch 2021-08-30 15:06:46 +02:00
mwojcik be0baf5da8 satman: adjusted drtio::Error instances 2021-08-30 14:38:00 +02:00
mwojcik 59cf4bc689 libboard_zynq: fully modified to work with core_io 2021-08-27 15:16:13 +02:00
mwojcik 581f6c6b4e libboard_artiq: tried moving drtio to io::proto 2021-08-27 14:44:54 +02:00
mwojcik e0516eeda9 libio: removed custom read/write, moved to core_io 2021-08-27 13:12:19 +02:00
mwojcik 9b2b1dadaa satman: repeater fixes, missing code 2021-08-26 15:20:33 +02:00
mwojcik cb3f0a404c libio: read/write traits from libio not core_io 2021-08-26 14:59:04 +02:00
mwojcik 10cbea72a2 clean up in dependencies 2021-08-26 13:16:51 +02:00
mwojcik ff7ba56d26 forgot to remove a debug print 2021-08-26 12:54:19 +02:00
mwojcik 39d522e1a7 drtioaux_proto: removed failure, need to fix traits 2021-08-25 13:03:54 +02:00
mwojcik a8a2da575b libboard_artiq: added mem.rs, yet to fix drtioaux 2021-08-24 14:11:30 +02:00
mwojcik 37eb4669fb makefile: satman support, separated from runtime 2021-08-24 13:57:10 +02:00
mwojcik b585eaaa37 zc706: added memory iface generator 2021-08-24 13:51:38 +02:00
mwojcik 1358c8bfe9 zc706 gateware: base class for drtio is SoCCore 2021-08-24 12:01:04 +02:00
mwojcik b2d9003d9f drtioaucontroller: made two decoders 2021-08-20 15:13:56 +02:00
mwojcik e43684a3ed moved AXI SRAM to migen-axi 2021-08-18 12:36:17 +02:00
mwojcik 7b868e1c9d few fixes, typos and missed unnecessary statements 2021-08-17 13:16:02 +02:00
mwojcik 61f81cec47 sram: redesigned write FSM. removed unused signals 2021-08-17 11:10:08 +02:00
mwojcik 3e1d14ff38 replaced increment logic with ready Incr module 2021-08-16 15:33:50 +02:00
mwojcik 67ed7fae78 sram: or operator in wrong place for wrapped burst 2021-08-16 12:05:23 +02:00
mwojcik f015d6732b sram: support for different burst settings on read 2021-08-16 11:51:50 +02:00
mwojcik b6dd5bea68 sram: fixed wrong assumptions on some signals 2021-08-13 14:58:18 +02:00
mwojcik bfe0c34f57 sram: rewrote read fsm for sram 2021-08-13 14:14:43 +02:00
mwojcik 39509f01d6 aux_controller: sram ported to axi, first attempt 2021-08-13 13:06:10 +02:00
mwojcik 066987bf07 aux_controller: started porting from wb to axi 2021-08-11 14:34:44 +02:00
mwojcik 7ff59f57a9 gateware: updated gtx interface 2021-08-10 15:11:21 +02:00
Sebastien Bourdeauducq 2ed2ffe417 update dependencies 2021-08-09 15:16:54 +08:00
mwojcik 118893c0b2 disabled adding axi slave/mem 
drtioauxcontroller uses AXI rather than Wishbone
still won't compile - unresolved clock domain error
 2021-08-06 15:25:59 +02:00
mwojcik ae86bbb76e zc706 gateware fixes: 
replaced crg cd_sys.clk with ps7.cd_sys.clk
restored gpio
removed mentions of i2c
user_sma_clock consumed by _RTIOCRG already
 2021-08-06 13:31:16 +02:00
mwojcik d68cf7dd49 gateware: replaced wb slave w/ axi (diff soccore) 2021-08-06 11:05:49 +02:00
mwojcik f9860a61b7 sys_clk_freq is actually 125mhz 2021-08-06 10:39:37 +02:00
mwojcik d1705113aa kasli: gtx transcvr expects separate tx/rx pads 2021-08-06 10:05:45 +02:00
mwojcik 97dfa07bdb determined probable sys_clk_freq for GTX transcvr 2021-08-06 10:05:04 +02:00
mwojcik f45fa28dac satman: 
* added Zynq-specific impls of basic functions (main/panic/irq)
* added makefile definition
* fixed drtioaux compilation error (feature never_type)
 2021-08-05 16:05:44 +02:00
mwojcik ecc8a0ccc0 kasli-soc: qpll is not part of this board, removed mentions 2021-08-04 16:44:08 +02:00
mwojcik e17b398483 added siphaser driver code for drtio satellites 2021-08-04 12:55:03 +02:00
mwojcik b95692548e Merge branch 'master' into drtio_port 2021-08-04 09:38:08 +02:00
Sebastien Bourdeauducq 18e05c91e1 zc706: si5324 is not needed for standalone target 2021-08-04 09:14:19 +08:00
mwojcik e3d3cb2311 si5324: bring on par with mainline ARTIQ (#132) 
si5324 driver in runtime should be now equal in function to the one in artiq.

kasli-soc has no way of doing a hard reset on the peripheral, but zc706 does.

Reviewed-on: M-Labs/artiq-zynq#132
Co-authored-by: mwojcik <mw@m-labs.hk>
Co-committed-by: mwojcik <mw@m-labs.hk>
 2021-08-04 09:12:38 +08:00
mwojcik 6a9729bede Merge branch 'master' into drtio_port 2021-08-03 09:56:14 +02:00
mwojcik b2dd68bd92 removed unnecessary and wrong add_drtio 2021-08-03 09:52:50 +02:00
Sebastien Bourdeauducq f543501012 si5324: remove debug print 2021-08-02 14:14:59 +08:00
mwojcik cafbe97e47 zc706: added targets to default.nix, fixed wrong base cls 2021-07-30 15:14:40 +02:00
mwojcik 3ba7fe1e6b kasli_soc uses gtx transceiver instead of gtp 2021-07-30 12:52:58 +02:00
Sebastien Bourdeauducq 111ac0c716 runtime: clock Si5324 from its crystal 2021-07-30 17:07:58 +08:00
Sebastien Bourdeauducq 8128dc0b56 Revert "kasli-soc: work around I2C breakage (#130)" 
This reverts commit f1fd55dee5.
 2021-07-30 16:55:06 +08:00
mwojcik 0ce86317c9 zc706: added rough master/satellite drtio support 2021-07-29 15:38:23 +02:00
mwojcik 248530faf1 gateware: kasli_soc - first attempt at drtio 2021-07-29 13:41:02 +02:00
mwojcik c0e2e11968 drtio_routing: changed warning message 2021-07-28 10:05:50 +02:00
mwojcik 97d95c37f5 satman: removed references to spi for now 2021-07-27 14:44:43 +02:00
mwojcik 4540b8ec98 share identifier_read between runtime and satman 2021-07-27 14:42:29 +02:00
mwojcik 4e5f1a0673 fixed compilation errors - runtime compiles now 2021-07-27 12:40:55 +02:00
mwojcik 76b085333f annotation fixes - no_std in libboard_artiq 2021-07-27 11:00:53 +02:00
mwojcik 630a934df0 removed mentions of fail, updated alloc 2021-07-27 10:27:43 +02:00
mwojcik 0d7d403edc merged proto_core_io with libio 2021-07-27 09:38:38 +02:00
mwojcik 5e39cd32d1 removed unused imports, added necessary. 2021-07-26 14:41:00 +02:00
mwojcik 522bea7e1c reverted build script with linker file arg. Hybrid solution. 2021-07-26 14:38:43 +02:00
mwojcik 2c3091e792 experimental: build script with linker file arg 2021-07-26 13:57:37 +02:00
mwojcik 8b780ec83b fixing compilation errors: moved libboard_zynq sources to src folder 2021-07-26 11:41:50 +02:00
mwojcik e081ea926b build script taken from runtime to libbuild_zynq, dependencies adjusted 2021-07-26 10:28:44 +02:00
mwojcik a06b485b67 build files copied from build_misoc 2021-07-23 14:59:29 +02:00
mwojcik 3af0ee6242 satman: moved i2c to libboard_zynq (no wrapper) 2021-07-23 14:45:48 +02:00
mwojcik b963bbbf77 satman: replaced ident with the one from runtime 2021-07-23 14:14:07 +02:00
mwojcik 415a3be8ce satman: removed irq::exception ref - no direct replacement 2021-07-23 14:11:05 +02:00
mwojcik 0502737481 satman: replaced clock with GlobalTimer completely 2021-07-23 13:15:07 +02:00
mwojcik 5e76f7c0b4 moved proto, moved logger, updated runtime 2021-07-23 11:28:16 +02:00
mwojcik f170104304 libboard_artiqzynq -> libboard_artiq; moved si5324 2021-07-23 11:15:31 +02:00
mwojcik d309409a84 satman: removed jcdg completely 2021-07-23 11:00:48 +02:00
mwojcik 7b25bc710e removed references for clock, replaced with timer 2021-07-22 14:39:27 +02:00
mwojcik 5fa575ce4c drtio_routing: made to use libconfig; moved logger 2021-07-22 12:15:20 +02:00
mwojcik 2647ef7249 moved si5324, added notes on required porting 2021-07-22 12:15:18 +02:00
mwojcik 60a8861a22 added libboard_artiqzync (?), moved more libs 2021-07-22 12:15:12 +02:00
mwojcik 731f52992f moved related libraries, culled unnecessary ones 2021-07-22 12:15:07 +02:00
mwojcik 7e97e86446 removed ad9154 and jesd204 stuff; notes on ports 2021-07-22 12:14:58 +02:00
spaqin 3656fcc510 drtio: moved satman fw 2021-07-21 09:25:37 +02:00
Sebastien Bourdeauducq dcb6129b0e update dependencies 2021-07-05 13:56:40 +08:00
Sebastien Bourdeauducq f25e261bdd update dependencies 2021-06-25 17:12:47 +08:00
Sebastien Bourdeauducq 2ba4d8935d fix compilation with nixpkgs 21.05 
The environment variable is optional to keep compatibility with other build environments.

Closes #131
 2021-06-25 15:57:39 +08:00
Sebastien Bourdeauducq 8c8a5d53b9 update dependencies 2021-06-19 22:51:25 +08:00
Sebastien Bourdeauducq 852123b42a kasli-soc: add RTIO LEDs 2021-05-30 20:40:53 +08:00
Sebastien Bourdeauducq f1fd55dee5 kasli-soc: work around I2C breakage (#130) 2021-05-29 17:13:41 +08:00
Sebastien Bourdeauducq 21d98711c1 use new smoltcp error code 2021-05-29 17:13:22 +08:00
Sebastien Bourdeauducq 0ae2138034 kasli-soc: preliminary si5324 support 2021-05-29 16:15:27 +08:00
Sebastien Bourdeauducq 1b474d2dd4 update dependencies 2021-05-29 14:20:23 +08:00
Sebastien Bourdeauducq 506c741238 support absence of gateware RTIO clock selection mux 2021-02-15 21:41:30 +08:00
Sebastien Bourdeauducq 8815f76114 kasli_soc: fix has_grabber 2021-02-15 21:41:02 +08:00
Sebastien Bourdeauducq ef18fa4c6d kasli_soc: add RTIO log channel 2021-02-15 19:56:59 +08:00
Sebastien Bourdeauducq faf9714e10 add demo build for Kasli-SoC 2021-02-15 19:52:13 +08:00
Sebastien Bourdeauducq 8d4e42be32 remove redpitaya and coraz7 support 2021-02-15 19:30:13 +08:00
Astro fcb38fae6c runtime: disable TCP delayed ack 2021-02-08 03:24:18 +01:00
Astro bfd8343876 update zynq-rs and dependencies (smoltcp 0.7.0) 2021-02-08 03:24:18 +01:00
Sebastien Bourdeauducq 4039431533 kasli_soc: fix eem iostandards 2021-02-07 22:34:29 +08:00
Sebastien Bourdeauducq 3f9bd06468 add Kasli-SoC generic gateware builder (WIP) 2021-02-07 14:44:32 +08:00
pca006132 bb65074254 updated zynq-rs and IRQ handling 2021-01-28 12:56:54 +08:00
pca006132 c2a6fb72f7 updated zynq-rs dependency 2021-01-26 12:38:09 +08:00
pca006132 faa335461d runtime: modified protocols to use device endian 2021-01-22 13:36:38 +08:00
pca006132 be01fbd943 runtime/irq: use assembly for naked IRQ handler 
and solves the bug introduced due to stack unwinding...
 2021-01-18 17:08:04 +08:00
pca006132 9e8b554c6d runtime/kernel/core1: use correct ABI 2021-01-18 16:43:30 +08:00
pca006132 b4ff6dda24 runtime: use naked function for IRQ 
non-naked IRQ would somehow trigger interrupts after several kernel
restarts, investigating
 2021-01-18 10:38:50 +08:00