occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity
5,941 Commits 14 Branches 35 Tags 23 MiB
Commit Graph

361 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq af88c4c93e clean up hmc7043 reset 2018-06-05 20:41:48 +08:00
Sebastien Bourdeauducq 38b5128222 conda: bump jesd204 2018-05-30 23:39:22 +08:00
Sebastien Bourdeauducq 560889372f firmware: grabber support 2018-05-29 10:26:36 +08:00
whitequark da851d8b7b conda: fix installation path in artiq-board. 2018-05-25 08:41:55 +00:00
whitequark bc86ade160 conda: add ignore_prefix_files in the outputs section too. 2018-05-25 08:41:19 +00:00
whitequark c3c9ffcd4f conda: override --install-lib, not --prefix. 2018-05-25 06:45:46 +00:00
whitequark 44910efd0a conda: remove lib/python3.5 from artiq package paths as well. 
Following c9287cfc.
 2018-05-25 02:23:18 +00:00
whitequark c9287cfc69 conda: put `noarch: python` on correct artiq-board package. 
Fixes #989.
 2018-05-24 21:09:50 +00:00
Sebastien Bourdeauducq b81b20caf8 conda: use h5py 2.8 
For some reason, conda installs 2.7 by default, which causes messages such as:
/home/sb/miniconda3/envs/py35/lib/python3.5/site-packages/h5py/__init__.py:36: FutureWarning: Conversion of the second argument of issubdtype from `float` to `np.floating` is deprecated. In future, it will be treated as `np.float64 == np.dtype(float).type`.
 2018-05-16 16:25:44 +08:00
whitequark 514eab3d39 Update Rust to 1.26.0. 2018-05-15 12:47:51 +00:00
Sebastien Bourdeauducq 4ed9fdbf27 conda: bump misoc 2018-05-12 22:58:48 +08:00
Sebastien Bourdeauducq da1a61b8cf conda: bump misoc. Closes #995 2018-05-09 21:27:28 +08:00
Sebastien Bourdeauducq 13618c7d6e conda: bump migen 2018-05-09 21:03:58 +08:00
Robert Jördens bfa7637760 conda: bump llvmlite-artiq dependency (ncurses) 2018-05-07 10:15:45 +02:00
whitequark 84e598de69 conda: fix build number for llvmlite-artiq (again). 2018-05-01 09:08:17 +00:00
whitequark 6cb9c8a9c1 conda: fix build number for llvmlite-artiq. 2018-05-01 09:04:15 +00:00
whitequark 623614f835 Update LLVM to 6.0.0 and Rust to 1.25.0. 2018-05-01 08:57:37 +00:00
whitequark 5170848cd6 conda: artiq-board should be noarch, like artiq itself. 
Fixes #989.
 2018-04-28 00:56:11 +00:00
Robert Jördens 5d3c76fd50 sayma_rtm: use bitstream opts in migen 2018-04-27 15:43:32 +00:00
Sebastien Bourdeauducq c86d41edc6 conda: update migen+misoc 2018-04-18 00:58:34 +08:00
Sebastien Bourdeauducq 142561c4bd conda: bump misoc 2018-04-17 18:46:35 +08:00
whitequark 1ef673c2d4 conda: split build/run requirements for artiq-board. 
Build requirements for packages in the outputs section seem to be
ignored.
 2018-04-08 02:34:34 +00:00
whitequark 4e21a13be0 conda: put requirements on correct artiq-board package. 
Fixes #975.
 2018-04-07 23:32:38 +00:00
Sebastien Bourdeauducq efbe915b24 conda: support satellite in board package 2018-04-03 19:36:40 +08:00
Sebastien Bourdeauducq dd1c5c61d0 conda: error out if command in build.sh fails 2018-04-03 19:36:31 +08:00
Sebastien Bourdeauducq d0f6123f5c conda: bump misoc again 2018-04-03 15:55:53 +08:00
Sebastien Bourdeauducq 2ca3fda898 conda: bump misoc. Closes #891 2018-04-03 14:29:29 +08:00
Sebastien Bourdeauducq e83863a8da conda: bump migen 2018-03-29 12:35:41 +08:00
Robert Jördens 65379b1f7a conda: bump migen, misoc 
* xilinx ODDR2 SRTYPE
* flterm leak
* I/ODELAY VTC/reset sequencing
* sayma SDRAM clock buffer LOC
 2018-03-19 19:58:52 +01:00
whitequark c4bfc83b38 conda: mark the artiq-build output package as noarch, not toplevel. 
This also changes `noarch: python` to `noarch: generic` since
this is semantically correct; the bitstream/firmware packages
contain no Python code.

Fixes #960.
 2018-03-15 23:17:05 +00:00
Sebastien Bourdeauducq 44277c5b7e conda: bump migen/misoc 2018-03-11 10:11:42 +08:00
Sebastien Bourdeauducq e65e2421a3 conda: bump migen/misoc 2018-03-09 22:35:40 +08:00
Robert Jördens 5cc1d2a1d3 conda: bump migen, misoc 
* flterm leak
* kasli version
* sayma ddram
* ethernet clocking
* fifo dout reset_less
 2018-03-07 17:17:30 +01:00
Robert Jördens ddcc68cff9 sayma_amc: move bitstream options to migen 
close #930
 2018-03-02 18:13:03 +08:00
whitequark b81855cce7 conda: don't use globs in file list. 2018-02-27 16:07:01 +00:00
whitequark 2f9d01295c conda: fix YAML syntax. 2018-02-27 14:03:50 +00:00
whitequark 771ba66055 conda: include all files in output package. 2018-02-27 13:40:02 +00:00
Robert Jördens 1de2da5644 conda: bump migen/misoc 2018-02-26 14:16:05 +01:00
Robert Jördens a35e4fe055 conda: bump jesd204b-0.5 2018-02-26 12:48:48 +01:00
Sebastien Bourdeauducq 98489d9739 conda: bump migen/misoc (#854) 2018-02-23 21:46:51 +08:00
whitequark 21b1757bfd Fix e8d21adf3. 
As usual, conda documentation does not provide a clear explanation
of what the options do...
 2018-02-22 13:26:42 +00:00
whitequark e8d21adf30 conda: turn off binary prefix detection everywhere. 
This just adds garbage to logs and serves no useful purpose.
 2018-02-22 12:55:47 +00:00
whitequark 8938b69559 conda: simplify recipes. 
conda-build appears to no longer require the workaround with
environ.get("GIT_*", "") to work.
 2018-02-22 12:45:27 +00:00
whitequark d83ae0bc6a conda: use the outputs section to dynamically name packages. 2018-02-22 09:25:22 +00:00
Sebastien Bourdeauducq c3b8fe06eb conda/artiq-board: use 'firmware' to encompass runtime and satman 2018-02-22 15:30:26 +08:00
whitequark 10c02afd9c conda: merge all board packages except sayma_rtm into one. 
Fixes #923.
 2018-02-22 07:22:33 +00:00
Robert Jördens 37a0d6580b spi2: add RTIO gateware and coredevice driver 
1006218997
 2018-02-21 13:37:36 +00:00
Sebastien Bourdeauducq 932fa884cc conda: add recipes for Kasli DRTIO 2018-02-21 11:15:01 +08:00
Sebastien Bourdeauducq eed64a6d6b conda: fix openocd dependency 2018-02-21 10:35:31 +08:00
Robert Jördens bfabf3c906 conda: bump migen (9c3a301) 2018-02-19 13:07:17 +00:00