M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

conda,travis: use new SoC build system

This commit is contained in:
Sebastien Bourdeauducq 2015-11-04 15:59:08 +08:00
parent 38740a4abe
commit 649069980a
9 changed files with 26 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -15,7 +15,6 @@ install:
- if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=none; fi - if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=none; fi
- if [ $BUILD_SOC != none ]; then ./.travis/get-xilinx.sh; fi - if [ $BUILD_SOC != none ]; then ./.travis/get-xilinx.sh; fi
- if [ $BUILD_SOC != none ]; then ./.travis/get-toolchain.sh; fi - if [ $BUILD_SOC != none ]; then ./.travis/get-toolchain.sh; fi
- if [ $BUILD_SOC != none ]; then ./.travis/get-misoc.sh; fi
- . ./.travis/get-anaconda.sh - . ./.travis/get-anaconda.sh
- source $HOME/miniconda/bin/activate py35 - source $HOME/miniconda/bin/activate py35
- conda install -q pip coverage anaconda-client cython - conda install -q pip coverage anaconda-client cython

4
.travis/get-misoc.sh
View File

@ -1,4 +0,0 @@
#!/bin/sh
git clone --recursive https://github.com/m-labs/misoc $HOME/misoc
echo "export MSCDIR=$HOME/misoc" >> $HOME/.m-labs/build_settings.sh

6
.travis/get-xilinx.sh
View File

@ -26,13 +26,13 @@ echo "$secret" | gpg --passphrase-fd 0 Xilinx.lic.gpg
mkdir -p ~/.Xilinx mkdir -p ~/.Xilinx
mv Xilinx.lic ~/.Xilinx/Xilinx.lic mv Xilinx.lic ~/.Xilinx/Xilinx.lic
git clone https://github.com/fallen/impersonate_macaddress git clone https://github.com/m-labs/impersonate_macaddress
make -C impersonate_macaddress make -C impersonate_macaddress
# Tell mibuild where Xilinx toolchains are installed # Tell mibuild where Xilinx toolchains are installed
# and feed it the mac address corresponding to the license # and feed it the mac address corresponding to the license
cat >> $HOME/.m-labs/build_settings.sh << EOF cat >> $HOME/.m-labs/build_settings.sh << EOF
MISOC_EXTRA_VIVADO_CMDLINE="-Ob vivado_path $HOME/Xilinx/Vivado" MISOC_EXTRA_ISE_CMDLINE="--gateware-toolchain-path $HOME/opt/Xilinx/"
MISOC_EXTRA_ISE_CMDLINE="-Ob ise_path $HOME/opt/Xilinx/" MISOC_EXTRA_VIVADO_CMDLINE="--gateware-toolchain-path $HOME/Xilinx/Vivado"
export MACADDR=$macaddress export MACADDR=$macaddress
export LD_PRELOAD=$PWD/impersonate_macaddress/impersonate_macaddress.so export LD_PRELOAD=$PWD/impersonate_macaddress/impersonate_macaddress.so
EOF EOF

25
conda/artiq-kc705-nist_qc1/build.sh
View File

@ -3,24 +3,13 @@
BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE [ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705 SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-qc1
mkdir -p $SOC_PREFIX/nist_qc1 mkdir -p $SOC_PREFIX
SOC_ROOT=$PWD/soc $PYTHON -m artiq.gateware.targets.kc705 -H qc1 $MISOC_EXTRA_ISE_CMDLINE
cp misoc_nist_qc1_kc705/gateware/top.bit $SOC_PREFIX
cp misoc_nist_qc1_kc705/software/bios/bios.bin $SOC_PREFIX
cp misoc_nist_qc1_kc705/software/runtime/runtime.fbi $SOC_PREFIX
# build bitstream
(cd $MSCDIR; $PYTHON make.py -X $SOC_ROOT -t artiq_kc705 $MISOC_EXTRA_VIVADO_CMDLINE build-bitstream)
cp $MSCDIR/build/artiq_kc705-nist_qc1-kc705.bit $SOC_PREFIX/
wget http://sionneau.net/artiq/binaries/kc705/flash_proxy/bscan_spi_kc705.bit wget http://sionneau.net/artiq/binaries/kc705/flash_proxy/bscan_spi_kc705.bit
mv bscan_spi_kc705.bit $SOC_PREFIX/ mv bscan_spi_kc705.bit $SOC_PREFIX
# build BIOS
(cd $MSCDIR; $PYTHON make.py -X $SOC_ROOT -t artiq_kc705 build-headers build-bios)
cp $MSCDIR/software/bios/bios.bin $SOC_PREFIX/
# build runtime
make -C soc/runtime clean runtime.fbi
cp soc/runtime/runtime.fbi $SOC_PREFIX/nist_qc1/

1
conda/artiq-kc705-nist_qc1/meta.yaml
View File

@ -16,6 +16,7 @@ requirements:
# We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies. # We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies.
- artiq 0.0 - artiq 0.0
- migen 0.0 - migen 0.0
- misoc 0.0
- llvm-or1k - llvm-or1k
- binutils-or1k-linux - binutils-or1k-linux
run: run:

25
conda/artiq-kc705-nist_qc2/build.sh
View File

@ -3,24 +3,13 @@
BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE [ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705 SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-qc2
mkdir -p $SOC_PREFIX/nist_qc2 mkdir -p $SOC_PREFIX
SOC_ROOT=$PWD/soc $PYTHON -m artiq.gateware.targets.kc705 -H qc2 $MISOC_EXTRA_ISE_CMDLINE
cp misoc_nist_qc2_kc705/gateware/top.bit $SOC_PREFIX
cp misoc_nist_qc2_kc705/software/bios/bios.bin $SOC_PREFIX
cp misoc_nist_qc2_kc705/software/runtime/runtime.fbi $SOC_PREFIX
# build bitstream
(cd $MSCDIR; $PYTHON make.py -X $SOC_ROOT -t artiq_kc705 -s NIST_QC2 $MISOC_EXTRA_VIVADO_CMDLINE build-bitstream)
cp $MSCDIR/build/artiq_kc705-nist_qc2-kc705.bit $SOC_PREFIX/
wget http://sionneau.net/artiq/binaries/kc705/flash_proxy/bscan_spi_kc705.bit wget http://sionneau.net/artiq/binaries/kc705/flash_proxy/bscan_spi_kc705.bit
mv bscan_spi_kc705.bit $SOC_PREFIX/ mv bscan_spi_kc705.bit $SOC_PREFIX
# build BIOS
(cd $MSCDIR; $PYTHON make.py -X $SOC_ROOT -t artiq_kc705 -s NIST_QC2 build-headers build-bios)
cp $MSCDIR/software/bios/bios.bin $SOC_PREFIX/
# build runtime
make -C soc/runtime clean runtime.fbi
cp soc/runtime/runtime.fbi $SOC_PREFIX/nist_qc2/

1
conda/artiq-kc705-nist_qc2/meta.yaml
View File

@ -16,6 +16,7 @@ requirements:
# We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies. # We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies.
- artiq 0.0 - artiq 0.0
- migen 0.0 - migen 0.0
- misoc 0.0
- llvm-or1k - llvm-or1k
- binutils-or1k-linux - binutils-or1k-linux
run: run:

23
conda/artiq-pipistrello-nist_qc1/build.sh
View File

@ -3,24 +3,13 @@
BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh BUILD_SETTINGS_FILE=$HOME/.m-labs/build_settings.sh
[ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE [ -f $BUILD_SETTINGS_FILE ] && . $BUILD_SETTINGS_FILE
SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/pipistrello SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/pipistrello-qc1
mkdir -p $SOC_PREFIX mkdir -p $SOC_PREFIX
SOC_ROOT=$PWD/soc $PYTHON -m artiq.gateware.targets.pipistrello $MISOC_EXTRA_ISE_CMDLINE
cp misoc_nist_qc1_pipistrello/gateware/top.bit $SOC_PREFIX
cp misoc_nist_qc1_pipistrello/software/bios/bios.bin $SOC_PREFIX
cp misoc_nist_qc1_pipistrello/software/runtime/runtime.fbi $SOC_PREFIX
# build bitstream
(cd $MSCDIR; $PYTHON make.py -X $SOC_ROOT -t artiq_pipistrello $MISOC_EXTRA_ISE_CMDLINE build-bitstream)
cp $MSCDIR/build/artiq_pipistrello-nist_qc1-pipistrello.bit $SOC_PREFIX/
wget https://people.phys.ethz.ch/~robertjo/bscan_spi_lx45_csg324.bit wget https://people.phys.ethz.ch/~robertjo/bscan_spi_lx45_csg324.bit
mv bscan_spi_lx45_csg324.bit $SOC_PREFIX/ mv bscan_spi_lx45_csg324.bit $SOC_PREFIX
# build BIOS
(cd $MSCDIR; $PYTHON make.py -X $SOC_ROOT -t artiq_pipistrello build-headers build-bios)
cp $MSCDIR/software/bios/bios.bin $SOC_PREFIX/
# build runtime
make -C soc/runtime clean runtime.fbi
cp soc/runtime/runtime.fbi $SOC_PREFIX/

1
conda/artiq-pipistrello-nist_qc1/meta.yaml
View File

@ -16,6 +16,7 @@ requirements:
# We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies. # We don't get meaningful GIT_DESCRIBE_* values until before conda installs build dependencies.
- artiq 0.0 - artiq 0.0
- migen 0.0 - migen 0.0
- misoc 0.0
- llvm-or1k - llvm-or1k
- binutils-or1k-linux - binutils-or1k-linux
run: run: