From 81511feab80855b3257bbca660945b001dbc5330 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Wed, 12 Oct 2016 16:32:19 +0200 Subject: [PATCH] phaser: README: specify versions --- README_PHASER.rst | 12 ++++++------ conda/artiq-kc705-phaser/meta.yaml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README_PHASER.rst b/README_PHASER.rst index 9680ae1ee..a1527ef38 100644 --- a/README_PHASER.rst +++ b/README_PHASER.rst @@ -40,14 +40,14 @@ https://m-labs.hk/artiq/manual-release-2/index.html They are all packaged as conda packages in ``m-labs/main``. * Install the standard ARTIQ build dependencies. - They are all available as conda packages in m-labs/main at least for linux-64: + They are all available as conda packages in m-labs/main or m-labs/dev for linux-64: - - migen 0.4 - - misoc 0.3 - - llvm-or1k + - migen =0.4 + - misoc =0.4 + - llvm-or1k =3.8 - rust-core-or1k - cargo - - binutils-or1k-linux + - binutils-or1k-linux >=2.27 * Install a recent version of Vivado (tested and developed with 2016.2). * Checkout the ARTIQ phaser branch and the JESD204B core: :: @@ -76,7 +76,7 @@ Setup python -m artiq.gateware.targets.kc705 -H phaser --toolchain vivado -* Run the following OpenOCD command to flash the ARTIQ transmitter design: :: +* Run the following OpenOCD command to flash the ARTIQ phaser design: :: openocd -f board/kc705.cfg -c "init; jtagspi_init 0 bscan_spi_xc7k325t.bit; jtagspi_program misoc_phaser_kc705/gateware/top.bin 0x000000; jtagspi_program misoc_phaser_kc705/software/bios/bios.bin 0xaf0000; jtagspi_program misoc_phaser_kc705/software/runtime/runtime.fbi 0xb00000; xc7_program xc7.tap; exit" diff --git a/conda/artiq-kc705-phaser/meta.yaml b/conda/artiq-kc705-phaser/meta.yaml index 6c24032ba..febaf8b4f 100644 --- a/conda/artiq-kc705-phaser/meta.yaml +++ b/conda/artiq-kc705-phaser/meta.yaml @@ -13,7 +13,7 @@ build: requirements: build: - migen 0.4 - - misoc 0.3 + - misoc 0.4 - llvm-or1k - binutils-or1k-linux >=2.27 - rust-core-or1k