srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity
6,739 Commits 63 Branches 34 Tags 19 MiB
Commit Graph

391 Commits

Author SHA1 Message Date
whitequark 3eb882b6b7 conda: remove openocd version constraint. 
Conda chokes on it and I don't care enough to fix it.
 2018-01-16 08:51:45 +00:00
whitequark 44cd7dfa23 conda: update misoc. 2018-01-16 08:09:25 +00:00
whitequark 444b901dbe sayma: add RTM configuration port. 2018-01-16 07:28:00 +00:00
Robert Jördens d52568e254 conda: bump migen (kasli link_up) 2018-01-15 16:41:24 +01:00
Robert Jördens fd82a1a9af conda: bump migen (kasli) 2018-01-15 16:14:58 +01:00
Robert Jördens ef40fb93c2 conda: add artiq-kasli-opticlock 2018-01-15 15:04:46 +01:00
Robert Jördens 344ce7e294 conda: bump misoc (kasli sfp) 2018-01-15 14:17:40 +01:00
Robert Jördens 8a960c1b31 conda: bump openocd (kasli) 2018-01-15 14:17:40 +01:00
Robert Jördens fe44b6651a conda: bump misoc (1000basex) 2018-01-15 14:17:40 +01:00
whitequark 267c699835 firmware: support DDRPHY without write leveling (fixes #886). 
Currently, this is kasli.
 2018-01-09 02:41:02 +00:00
whitequark 987a9c8308 conda: update rustc to 1.23.0. 2018-01-08 21:39:15 +00:00
Robert Jördens 08dada9e16 artiq-dev: bump misoc (spi logic fold) 2018-01-03 09:14:35 +01:00
Sebastien Bourdeauducq 37eb73bf5c conda: bump migen 2017-12-29 10:45:46 +08:00
Robert Jördens 6f27ca81fb conda/artiq-dev: bump migen (color xilinx, colorama) 2017-12-28 23:37:28 +01:00
Robert Jördens f26d08fed3 conda/artiq-dev: bump migen (color vivado 2017.4) 2017-12-28 22:47:25 +01:00
Robert Jördens 605da18684 conda/artiq-dev: bump misoc (spi) 2017-12-28 16:53:41 +01:00
whitequark 6d0168edb7 conda: bump misoc dependency. 2017-12-28 15:26:12 +00:00
whitequark a9ad4f08e9 conda: bump misoc dependency. 2017-12-28 13:36:28 +00:00
whitequark acd13837ff firmware: implement the new bootloader. 2017-12-28 13:18:51 +00:00
Sebastien Bourdeauducq 6801921fc0 drtio: instrument GTH transceiver 2017-12-28 15:03:14 +08:00
whitequark c626456030 conda: bump misoc dependency. 2017-12-28 05:21:30 +00:00
whitequark 68f128944a firmware: clean up makefiles. 2017-12-27 23:10:47 +00:00
whitequark d7cb4963e1 firmware: prepare config block for access from BIOS/bootloader. 
* remove liballoc dependency from mod config,
  * move mod config to libboard,
  * move config sector immediately after BIOS sector.
 2017-12-27 21:28:40 +00:00
whitequark f46a58f5b2 conda: bump rustc version requirement. 2017-12-27 01:44:16 +00:00
whitequark edfacbd063 conda: ship runtime.elf in board-specific packages. 
This is so that backtraces may be symbolized.
 2017-12-26 21:50:31 +00:00
whitequark 40ca0ac83f conda: update llvmlite-artiq dependency. 2017-12-26 21:46:20 +00:00
whitequark c939c6183e Update to LLVM 4.0. 2017-12-26 14:09:17 +00:00
whitequark 230f2e5e18 runtime: print (address-only) backtraces on core device panics. 2017-12-25 18:32:41 +00:00
Sebastien Bourdeauducq 0681d472c7 conda: fix sayma_rtm_csr.csv location for Sayma AMC 2017-12-22 17:14:10 +08:00
Sebastien Bourdeauducq 44959144d8 conda: add Sayma AMC standalone board package 2017-12-22 16:44:04 +08:00
Sebastien Bourdeauducq e43e14152a conda: remove BUILD_SETTINGS_FILE boilerplate 2017-12-22 09:15:22 +08:00
Sebastien Bourdeauducq 8adb50037f conda: remove superfluous SoC build command line arguments 2017-12-22 00:01:26 +08:00
Sebastien Bourdeauducq 6cad942041 conda: add Sayma RTM package 2017-12-21 23:59:14 +08:00
Sebastien Bourdeauducq 25022b28c3 conda: bump migen+misoc 2017-12-16 00:10:49 +08:00
Sebastien Bourdeauducq 569484f888 remove phaser, adapt SAWG example to Sayma 2017-12-14 18:49:27 +08:00
Robert Jördens 69b2d1abfc conda/artiq-dev: fix channel list 
Now, with conda 4.1 packages are sorted by channel, version, build
number in decreasing priority. The highest matching package is
taken. https://conda.io/docs/user-guide/tasks/manage-channels.html

For the artiq-dev environment, the m-labs/label/dev channel should be
first, then the main channel, then defaults, and then conda-forge
(community supported packages).

closes #864
 2017-12-07 12:31:30 +01:00
Robert Jördens c47006b154 conda: bump migen 
Relevant changes:

* Kasli
 2017-12-06 16:55:27 +01:00
Robert Jördens fcbf6fde8a conda: bump misoc again 
(wrong version in previous commit)
shot at #837
 2017-12-06 16:50:44 +01:00
Robert Jördens 41e30a5ddf conda: bump misoc dependency 
* fixed LiteETH preamble/SFD checker (this is a shot at #837)
 2017-12-06 16:48:21 +01:00
whitequark cf5d50de0c conda: do not compile .py files to .pyc. 
We are producing a noarch package, and conda will strip all .pyc
files, so this is a significant waste of time.
 2017-11-26 23:59:53 +00:00
whitequark 30f47994db artiq-dev: fix typo. 2017-11-26 23:48:41 +00:00
whitequark 8e8f037971 runtime: print ethmac preamble error count. 
Also, print total error count, not the difference (but still compute
the difference to determine *when* to print).
 2017-11-26 22:35:26 +00:00
Sebastien Bourdeauducq 5a972907f3 conda: update misoc 2017-11-02 12:27:46 +08:00
Sebastien Bourdeauducq cd51bd3980 conda: fix misoc version 2017-10-30 18:37:20 +08:00
whitequark b03e36e4e9 conda: update misoc. 2017-10-30 09:33:02 +00:00
Robert Jördens 70e6f77d4d conda: bump openocd to simplify pinning 2017-10-23 17:26:41 +02:00
Robert Jördens 7edff48b6d conda/artiq_flash: use proxy bitstream package 
fix #841
 2017-10-23 15:21:54 +02:00
Robert Jördens 22d5859876 conda: pin openocd dependency 2017-10-23 14:32:51 +02:00
Robert Jördens 3329d8990d conda/artiq: also bump openocd 2017-10-23 13:20:11 +02:00
Robert Jördens a6b45caefa conda: new openocd 
* new jtagspi protocol
* new proxy bitstreams
 2017-10-23 12:39:27 +02:00
Sebastien Bourdeauducq 375d2d587c conda: fix misoc version number 2017-10-04 09:45:32 +08:00
Robert Jördens c7de233208 Merge Sayma SAWG changes (untested) 
See #798

* sinara:
  conda: bump migen
  sayma_amc: SAWG (untested)
  sayma_rtm: make build dir
  conda: jesd204b 0.4
 2017-09-29 21:01:02 +02:00
Sebastien Bourdeauducq 0f4bc54e92 conda: fix llvmlite-artiq dependency 2017-09-30 01:32:10 +08:00
Sebastien Bourdeauducq 74dbb4c977 conda: use non-dev llvmlite-artiq 2017-09-29 21:10:28 +08:00
Sebastien Bourdeauducq 071439f9bd conda: use migen/misoc releases 2017-09-29 16:38:33 +08:00
Robert Jördens 38388d1136 conda: bump migen 2017-09-27 19:02:37 +02:00
Robert Jördens 2821f50884 conda: jesd204b 0.4 2017-09-27 17:17:04 +02:00
whitequark 7799413a41 firmware: update Rust from 1.18.0 to 1.20.0. 2017-09-24 22:51:44 +00:00
Sebastien Bourdeauducq 7fe5d737dd conda: bump migen/misoc 2017-09-06 19:21:15 +08:00
Sebastien Bourdeauducq 34ec37ac85 conda: bump misoc 2017-09-06 11:09:38 +08:00
Sebastien Bourdeauducq c5fe2799cf conda: bump misoc 2017-08-31 13:44:31 +08:00
Sebastien Bourdeauducq 5a041c24f3 conda: bump misoc 2017-08-31 12:17:52 +08:00
Sebastien Bourdeauducq e652221221 conda: bump migen and misoc 2017-08-31 11:50:32 +08:00
Robert Jördens 34ddda7a0c conda: use single-tap proxy bitstreams 2017-08-15 14:30:53 -06:00
Robert Jördens 5c66b63768 setup.py etc: update license 2017-07-18 11:31:43 +02:00
Sebastien Bourdeauducq 9045b4cc19 drtio: initial firmware support for multi-link 2017-07-18 00:40:21 +08:00
Sebastien Bourdeauducq 0253db0421 conda: fix misoc git hash 2017-07-13 19:32:03 +08:00
Sebastien Bourdeauducq 4deb5f6a45 gateware: use new MiSoC Wishbone address system 2017-07-13 19:16:49 +08:00
mntng 40ca951750 kc705: add SPI bus for memory card 
This will be useful for SPI unit tests using a SD card as victim.
 2017-07-12 00:27:44 +08:00
Robert Jördens 60809d1cb4 conda: bump misoc (migen change) 2017-07-04 11:58:12 +02:00
Florent Kermarrec 42476c64a7 conda: bump migen (Record.connect leave_out --> keep/omit) 2017-07-04 11:26:57 +02:00
Robert Jördens 5b26e5de6c conda: bump migen (reset_less cdc) 2017-07-02 15:41:58 +02:00
Robert Jördens 6fad15c532 conda: bump migen, misoc 
* reset_less Cordic
* Signal.like() inherits more
* address decoder changes
 2017-06-28 20:56:43 +02:00
Robert Jördens f4624e086a conda: bump migen 2017-06-25 21:14:52 +02:00
Sebastien Bourdeauducq 10fb6c6216 conda: set ignore_prefix_files on all board packages 2017-06-15 16:25:52 +08:00
Sebastien Bourdeauducq 5e94810e84 Revert "Revert "conda: use new noarch system for board packages as well"" 
This reverts commit 832fb139a0.
 2017-06-15 16:10:58 +08:00
Sebastien Bourdeauducq 832fb139a0 Revert "conda: use new noarch system for board packages as well" 
Never missing an opportunity to be awful, conda helps itself with the .fbi files and merrily patches the strings inside them that contain paths resembling the conda build folder, resulting of course in corrupption and CRC errors.

This reverts commit c856b22579.
 2017-06-15 16:00:00 +08:00
Sebastien Bourdeauducq ed2b27fed2 conda: fix pythonparser dependency 2017-06-14 12:39:29 +08:00
whitequark 53f7d145a4 conda: update pythonparser dependency. 2017-06-14 03:35:54 +00:00
Sebastien Bourdeauducq 70a3b66c76 conda: unbreak channel lists in environment descriptions 2017-06-06 15:57:38 +08:00
Sebastien Bourdeauducq e938b35e8e conda: fix command examples in conda environment descriptions 2017-06-06 15:26:26 +08:00
Sebastien Bourdeauducq c856b22579 conda: use new noarch system for board packages as well 2017-06-06 15:05:13 +08:00
Sebastien Bourdeauducq 5a134c82c5 conda: use new noarch system 2017-06-06 11:16:12 +08:00
Sebastien Bourdeauducq 7f2f0031d6 conda: use stock dateutil package 2017-06-05 17:57:35 +08:00
Sebastien Bourdeauducq 0b437c7645 conda: shorten git hash in strings to 8 characters instead of 12 2017-06-05 11:43:10 +08:00
Sebastien Bourdeauducq 234e41df9d bump setuptools (#705) 2017-06-05 11:39:42 +08:00
Sebastien Bourdeauducq fdb4e3f8cf jesd204: bump 2017-06-05 01:17:46 +08:00
Sebastien Bourdeauducq 8c8203ef73 require Python 3.5.3+ (#737) 2017-06-05 00:50:54 +08:00
Sebastien Bourdeauducq 9ab63920e0 Remove Pipistrello support 
Closes #658
Closes #381
 2017-05-15 17:17:44 +08:00
Robert Jördens e87b6b99f7 depend on python >=3.5.2 <3.6 2017-05-11 15:05:00 +02:00
whitequark d383145752 conda: use GIT_FULL_HASH rather than GIT_DESCRIBE_HASH. 2017-04-20 16:58:38 +00:00
whitequark c9b20a1765 Commit missing parts of 0d0ddf2e. 2017-04-20 16:53:16 +00:00
whitequark 0d0ddf2e58 conda: limit git hashes in build numbers to 8 chars exactly. 
Before this commit, a nasty edge case was possible where repositories
on different builders have had different sets of objects fetched
into them, and so git-describe selected different lengths for
abbreviating hashes.

See also https://github.com/conda/conda-build/issues/1940.
 2017-04-20 16:40:10 +00:00
whitequark af20e7ede4 conda: update rust dependency. 2017-04-19 12:53:13 +00:00
whitequark 5324a42549 conda: update rust dependency. 2017-04-19 11:18:14 +00:00
whitequark db494967c5 firmware use Rust 0.18.0. 2017-04-19 09:38:24 +00:00
Sebastien Bourdeauducq 99196986c0 conda: use conda-forge and depend on pyqtgraph 0.10.0 (#704) 2017-04-13 00:55:16 +08:00
Sebastien Bourdeauducq 6d1046cae2 conda: use python 3.5.3 2017-03-29 09:39:02 +08:00
whitequark 618942bda6 conda: bump misoc. 2017-03-14 08:35:04 +00:00
Robert Jördens 1dbfaf5ad0 Revert "conda: bump misoc (pcu/ISE fix)" 
This reverts commit d5d3e25f97.
 2017-03-08 23:15:23 +01:00
Robert Jördens 0c959ba6ea Revert "conda: actually bump misoc (pcu/ISE fix)" 
This reverts commit ccc4cf8a22.
 2017-03-08 23:15:21 +01:00
Robert Jördens ccc4cf8a22 conda: actually bump misoc (pcu/ISE fix) 2017-03-08 17:34:38 +01:00
Robert Jördens d5d3e25f97 conda: bump misoc (pcu/ISE fix) 2017-03-08 17:32:59 +01:00
whitequark 12e22823a2 conda: update misoc dependency. 2017-03-06 13:23:43 +00:00
Robert Jördens 3c50c46a81 conda: pyqt >= 5.5 2017-02-28 13:22:39 +01:00
Chris Ballance 34421ee2f4 conda: use anaconda default pyqt (fixes #670) 2017-02-28 10:38:46 +00:00
Sebastien Bourdeauducq 8da28177a4 conda: bump migen 2017-02-20 15:52:05 +08:00
Robert Jördens 3e2dad6573 misoc: bump (mor1kx pcu) 2017-02-18 14:09:12 +01:00
whitequark f4ae166a4c conda: fix syntax. 2017-02-05 16:46:11 +00:00
whitequark 52a046d0fd conda: roll cargo back to 0.11.0, then fix revision of compiler_builtins. 2017-02-05 15:25:43 +00:00
whitequark 3de19f6786 conda: use verbose misoc build. 2017-02-05 14:26:08 +00:00
whitequark 990b642461 conda: bump cargo dependency to >= 0.16.0. 
We currently have cargo ignoring and recreating the lockfile on CI,
which is probably caused by it being too old.
 2017-02-05 13:55:15 +00:00
whitequark 6d094eda32 conda: bump rust dependency. 2017-02-05 09:00:45 +00:00
whitequark b9cbedceb1 firmware: migrate last vestiges of the old runtime build system. 2017-02-03 12:59:35 +00:00
Robert Jördens 5a30536d59 doc: write section on developing with a conda env 2017-02-02 19:53:18 +01:00
Robert Jördens edab068ac9 conda: pull in openocd in artiq and artiq-dev 2017-02-02 19:53:18 +01:00
Robert Jördens e23be49208 conda: clean up dependencies 2017-02-01 22:26:12 +01:00
Robert Jördens e93f610323 conda/artiq: don't need numpy or binutils to build 2017-02-01 21:48:15 +01:00
Robert Jördens fb56c32d35 conda: use artiq-dev metapackage 2017-02-01 15:34:05 +01:00
whitequark c585784cd9 conda: bump misoc dependency. 2017-01-30 08:03:41 +00:00
Sebastien Bourdeauducq bff5f1b714 conda: update migen 2017-01-30 13:39:44 +08:00
Robert Jördens 9e92706d09 conda: pin misoc/migen package hashes 2017-01-27 14:43:24 +01:00
whitequark c529cefc89 conda: bump llvmlite-artiq dependency. 2017-01-27 11:14:53 +00:00
Robert Jördens c43adbf846 conda: add artiq-dev environment description 2017-01-26 19:55:39 +01:00
Robert Jördens 6c637537f0 doc/conda: fix conda env description syntax 2017-01-26 18:14:58 +01:00
Robert Jördens 8a13c8c195 doc: use minimal conda environment to build 2017-01-26 18:12:10 +01:00
Robert Jördens aa3af4f72d conda: fix sphinx pin 2017-01-26 00:53:43 +01:00
Robert Jördens 151b51f836 conda: pin sphinx to 1.4.8 (closes #645) 
can be reverted when https://github.com/snide/sphinx_rtd_theme/pull/346 is
released
 2017-01-26 00:51:26 +01:00
Sebastien Bourdeauducq fe53bab953 targets: kc705 -> kc705_dds 2017-01-05 18:40:56 +01:00
whitequark c45a170bb4 firmware: update for Rust 1.16.0. 2016-12-26 17:20:29 +00:00
Robert Jördens ca636ef28a conda/phaser: build-depend on numpy 2016-12-08 16:23:40 +01:00
Robert Jördens 7657cf1264 phaser: bump misoc/migen 2016-11-29 14:55:15 +01:00
Robert Jördens 41779367b5 phaser: adapt conda recipe 2016-11-24 16:04:13 +01:00
Robert Jördens 4160490e0a Merge branch 'phaser' into phaser2 
* phaser: (23 commits)
  RELEASE_NOTES: update
  pipistrello: add some inputs
  Remove last vestiges of nist_qc1.
  Fully drop AD9858 and kc705-nist_qc1 support (closes #576).
  coredevice.dds: reimplement fully in ARTIQ Python.
  compiler: unbreak casts to int32/int64.
  analyses.constness: fix false positive on x[...].
  inferencer: significantly improve the op-assignment diagnostic.
  Fix tests.
  Move mu_to_seconds, seconds_to_mu to Core.
  artiq_devtool: don't crash on invalid utf-8.
  artiq_devtool: detect a race condition during connect.
  llvm_ir_generator: handle no-op coercions.
  conda: use development version of migen/misoc
  Revert accidentally committed code.
  Revert "gateware: increase RTIO FIFO sizes for NIST_CLOCK. Closes #623"
  analyses.invariant_detection: implement (#622).
  Fix whitespace.
  coredevice.dds: work around the round(numpy.float64()) snafu.
  coredevice.dds: update from obsolete int(width=) syntax (fixes #621).
  ...
 2016-11-21 17:29:46 +01:00
Robert Jördens f7e8961ab0 Merge branch 'master' into phaser 
* master: (23 commits)
  RELEASE_NOTES: update
  pipistrello: add some inputs
  Remove last vestiges of nist_qc1.
  Fully drop AD9858 and kc705-nist_qc1 support (closes #576).
  coredevice.dds: reimplement fully in ARTIQ Python.
  compiler: unbreak casts to int32/int64.
  analyses.constness: fix false positive on x[...].
  inferencer: significantly improve the op-assignment diagnostic.
  Fix tests.
  Move mu_to_seconds, seconds_to_mu to Core.
  artiq_devtool: don't crash on invalid utf-8.
  artiq_devtool: detect a race condition during connect.
  llvm_ir_generator: handle no-op coercions.
  conda: use development version of migen/misoc
  Revert accidentally committed code.
  Revert "gateware: increase RTIO FIFO sizes for NIST_CLOCK. Closes #623"
  analyses.invariant_detection: implement (#622).
  Fix whitespace.
  coredevice.dds: work around the round(numpy.float64()) snafu.
  coredevice.dds: update from obsolete int(width=) syntax (fixes #621).
  ...
 2016-11-21 17:29:39 +01:00
whitequark 6aa5d9f6c6 Remove last vestiges of nist_qc1. 2016-11-21 15:36:22 +00:00
whitequark 5e8888d5f3 Fully drop AD9858 and kc705-nist_qc1 support (closes #576). 2016-11-21 15:14:17 +00:00
Sebastien Bourdeauducq eb18466820 conda: use development version of migen/misoc 2016-11-20 22:56:48 +08:00
Robert Jördens 7664b226f2 phaser/conda: bump jesd204b 2016-11-18 15:34:03 +01:00
Robert Jördens aedb6747f2 Merge branch 'master' into phaser 
* master: (47 commits)
  runtime: disable the Nagle algorithm entirely.
  runtime: buffer RPC send packets.
  runtime: don't print debug messages to the UART.
  runtime: print microsecond timestamps in debug messages.
  artiq_devtool: abort if build failed.
  conda: bump llvmlite-artiq dep.
  conda: bump llvmlite-artiq dep.
  llvm_ir_generator: use !{→unconditionally.}invariant.load metadata.
  artiq_devtool: more robust port forwarding.
  setup: remove paramiko dependency (optional and developer-only)
  artiq_devtool: implement.
  artiq_compile: actually disable attribute writeback.
  conda: use pythonparser 1.0.
  conda: tighten pythonparser dependency (fixes #600).
  doc: clarify kernel_invariant doc (fixes #609).
  compiler: Emit all-kernel_invariant objects as LLVM constants
  conda: update for LLVM 3.9.
  add has_dds, use config flags
  Revert "Revert "Revert "Revert "Update for LLVM 3.9.""""
  Revert "Revert "Revert "Update for LLVM 3.9."""
  ...
 2016-11-13 16:54:28 +01:00
whitequark 7c2b1155ef conda: bump llvmlite-artiq dep. 2016-11-12 13:58:00 +00:00
whitequark 5eb940deb7 conda: bump llvmlite-artiq dep. 2016-11-12 04:09:34 +00:00
whitequark 67e743d74a conda: use pythonparser 1.0. 2016-11-09 15:19:27 +00:00
whitequark 71f1d38860 conda: tighten pythonparser dependency (fixes #600). 2016-11-09 15:10:53 +00:00
whitequark 124b257e05 conda: update for LLVM 3.9. 2016-11-08 23:24:03 +00:00
whitequark ec8fe6f8bd Revert "Revert "Revert "Revert "Update for LLVM 3.9."""" 
This reverts commit 7b81ed1d18.
 2016-11-08 14:22:47 +00:00
whitequark 7b81ed1d18 Revert "Revert "Revert "Update for LLVM 3.9.""" 
This reverts commit 0d7688017b.
 2016-11-08 12:58:20 +00:00
whitequark 0d7688017b Revert "Revert "Update for LLVM 3.9."" 
This reverts commit 5f5975844a.
 2016-11-08 11:59:16 +00:00
Robert Jördens 6d07a16c62 Merge branch 'master' into phaser 
* master: (72 commits)
  gateware: extend mailbox to 3 entries.
  master/worker_db: set default value for archive
  master: keep dataset manager consistent when set_dataset is called with contradictory attributes
  master: archive input datasets. Closes #587
  master: ensure same dataset is in broadcast and local when mutating
  scheduler: default submission arguments, closes #577
  pdq2: sync with pdq2
  doc: clarify usage of pause/check_pause, closes #571
  dashboard/datasets: use scientific spinbox and increase number of decimals, closes #572
  gateware/spi: fix import
  runtime: fix use of $(realpath) in Makefile.
  test: fix printf specifier.
  llvm_ir_generator: make sure RPC allocations are not underaligned.
  runtime: use i64 for watchdog timeout, not i32.
  runtime: port ksupport to Rust.
  runtime: remove some redundant libm functions copied inline.
  language: Add "A" (ampere) as well-known unit for arguments
  conda: misoc 0.4 (csr)
  runtime: cap log level at debug.
  runtime: discard unnecessary sections.
  ...
 2016-10-28 01:40:11 +02:00
Robert Jördens 062aca2a6b conda/phaser: build-depend on jesd204b 2016-10-19 14:44:54 +02:00