2
0
mirror of https://github.com/m-labs/artiq.git synced 2024-12-19 00:16:29 +08:00
Commit Graph

388 Commits

Author SHA1 Message Date
efbe915b24 conda: support satellite in board package 2018-04-03 19:36:40 +08:00
dd1c5c61d0 conda: error out if command in build.sh fails 2018-04-03 19:36:31 +08:00
d0f6123f5c conda: bump misoc again 2018-04-03 15:55:53 +08:00
2ca3fda898 conda: bump misoc. Closes #891 2018-04-03 14:29:29 +08:00
e83863a8da conda: bump migen 2018-03-29 12:35:41 +08:00
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
44277c5b7e conda: bump migen/misoc 2018-03-11 10:11:42 +08:00
e65e2421a3 conda: bump migen/misoc 2018-03-09 22:35:40 +08:00
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
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
1de2da5644 conda: bump migen/misoc 2018-02-26 14:16:05 +01:00
a35e4fe055 conda: bump jesd204b-0.5 2018-02-26 12:48:48 +01:00
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
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
37a0d6580b spi2: add RTIO gateware and coredevice driver
1006218997
2018-02-21 13:37:36 +00:00
932fa884cc conda: add recipes for Kasli DRTIO 2018-02-21 11:15:01 +08:00
eed64a6d6b conda: fix openocd dependency 2018-02-21 10:35:31 +08:00
bfabf3c906 conda: bump migen (9c3a301) 2018-02-19 13:07:17 +00:00
6ae1cc20aa conda: bump misoc (#908) 2018-02-18 12:35:49 +08:00
41adbef9a9 conda: bump misoc 2018-02-17 17:41:16 +08:00
07a31f8d86 conda: bump openocd 2018-02-17 13:21:10 +08:00
7a5161d348 conda: bump misoc (#902) 2018-02-17 00:11:42 +08:00
df177bfd5b use new misoc identifier 2018-02-13 20:38:48 +08:00
ab5f397fea sed/fifos: use AsyncFIFOBuffered
(D)RTIO now passes timing at 150MHz on Kasli.
2018-02-13 20:02:51 +08:00
whitequark
61c64a76be gateware: use a per-variant subfolder in --output-dir. (fixes #912)
This commit also adds support for --variant and --args
to artiq-devtool.
2018-02-06 08:19:01 +00:00
4c22d64ee4 conda: sync artiq/artiq-dev dependencies 2018-01-30 08:36:55 +01:00
fb8c779b4f artiq_flash: report XADC data
* bump openocd
* only kasli, kc705, sayma rtm so far
2018-01-30 14:56:50 +08:00
whitequark
9a94482c6e conda: fix typo in 885ab409. 2018-01-28 15:18:52 +00:00
whitequark
79ea454ec1 conda: use $SP_DIR instead of $PREFIX/lib/python3.5/site-packages. (#652)
This removes the last hardcoded python3.5 reference.
2018-01-28 14:29:19 +00:00
whitequark
885ab40946 conda: split RTM and AMC packages back.
This avoids multiplying the RTM compilation time by the number
of AMC packages.
2018-01-28 14:27:55 +00:00
whitequark
11a8b84355 Merge the build trees of sayma_amc and sayma_rtm targets.
This also makes them a single artiq_flash target, and a single
conda package.
2018-01-27 19:54:31 +00:00
c9b36e3559 conda: bump misoc, close #905 2018-01-25 19:31:26 +01:00
ee14912042 conda: bump migen/misoc (vivado constraints) 2018-01-23 16:23:12 +01:00
472840f16b conda: bump migen/misoc
* kasli clock constraint
* vivado false paths
2018-01-22 20:32:18 +01:00
0d73401365 conda: bump migen+misoc 2018-01-23 01:28:10 +08:00
25f3feeda8 refactor targets 2018-01-22 18:25:10 +08:00
whitequark
b1453eb856 Revert "conda: remove openocd version constraint."
This reverts commit 3eb882b6b7.

Fixes #892.
2018-01-19 08:28:36 +00:00
whitequark
5c6276c78f conda: build artiq-$BOARD as noarch: python, like artiq itself.
Fixes #894.
2018-01-17 02:09:53 +00:00
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
d52568e254 conda: bump migen (kasli link_up) 2018-01-15 16:41:24 +01:00
fd82a1a9af conda: bump migen (kasli) 2018-01-15 16:14:58 +01:00
ef40fb93c2 conda: add artiq-kasli-opticlock 2018-01-15 15:04:46 +01:00
344ce7e294 conda: bump misoc (kasli sfp) 2018-01-15 14:17:40 +01:00
8a960c1b31 conda: bump openocd (kasli) 2018-01-15 14:17:40 +01:00
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
08dada9e16 artiq-dev: bump misoc (spi logic fold) 2018-01-03 09:14:35 +01:00
37eb73bf5c conda: bump migen 2017-12-29 10:45:46 +08:00
6f27ca81fb conda/artiq-dev: bump migen (color xilinx, colorama) 2017-12-28 23:37:28 +01:00
f26d08fed3 conda/artiq-dev: bump migen (color vivado 2017.4) 2017-12-28 22:47:25 +01:00
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
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
0681d472c7 conda: fix sayma_rtm_csr.csv location for Sayma AMC 2017-12-22 17:14:10 +08:00
44959144d8 conda: add Sayma AMC standalone board package 2017-12-22 16:44:04 +08:00
e43e14152a conda: remove BUILD_SETTINGS_FILE boilerplate 2017-12-22 09:15:22 +08:00
8adb50037f conda: remove superfluous SoC build command line arguments 2017-12-22 00:01:26 +08:00
6cad942041 conda: add Sayma RTM package 2017-12-21 23:59:14 +08:00
25022b28c3 conda: bump migen+misoc 2017-12-16 00:10:49 +08:00
569484f888 remove phaser, adapt SAWG example to Sayma 2017-12-14 18:49:27 +08:00
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
c47006b154 conda: bump migen
Relevant changes:

* Kasli
2017-12-06 16:55:27 +01:00
fcbf6fde8a conda: bump misoc again
(wrong version in previous commit)
shot at #837
2017-12-06 16:50:44 +01:00
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
5a972907f3 conda: update misoc 2017-11-02 12:27:46 +08:00
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
70e6f77d4d conda: bump openocd to simplify pinning 2017-10-23 17:26:41 +02:00
7edff48b6d conda/artiq_flash: use proxy bitstream package
fix #841
2017-10-23 15:21:54 +02:00
22d5859876 conda: pin openocd dependency 2017-10-23 14:32:51 +02:00
3329d8990d conda/artiq: also bump openocd 2017-10-23 13:20:11 +02:00
a6b45caefa conda: new openocd
* new jtagspi protocol
* new proxy bitstreams
2017-10-23 12:39:27 +02:00
375d2d587c conda: fix misoc version number 2017-10-04 09:45:32 +08:00
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
0f4bc54e92 conda: fix llvmlite-artiq dependency 2017-09-30 01:32:10 +08:00