M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-19 16:36:29 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into new-py2llvm

Browse Source
This commit is contained in:
whitequark 2015-07-27 04:57:32 +03:00
commit ef4a06a270
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/get-toolchain.sh
View File

@ -15,7 +15,7 @@ done
for a in $archives for a in $archives
do do
wget $a wget $a
(cd packages && tar xvf ../$(basename $a)) (cd packages && tar xf ../$(basename $a))
done done
export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:$PATH export PATH=$PWD/packages/usr/local/llvm-or1k/bin:$PWD/packages/usr/local/bin:$PWD/packages/usr/bin:$PATH

2
soc/targets/artiq_pipistrello.py
View File

@ -50,7 +50,7 @@ NET "{int_clk}" TNM_NET = "GRPint_clk";
NET "sys_clk" TNM_NET = "GRPsys_clk"; NET "sys_clk" TNM_NET = "GRPsys_clk";
TIMESPEC "TSfix_ise1" = FROM "GRPint_clk" TO "GRPsys_clk" TIG; TIMESPEC "TSfix_ise1" = FROM "GRPint_clk" TO "GRPsys_clk" TIG;
TIMESPEC "TSfix_ise2" = FROM "GRPsys_clk" TO "GRPint_clk" TIG; TIMESPEC "TSfix_ise2" = FROM "GRPsys_clk" TO "GRPint_clk" TIG;
""", int_clk=rtio_internal_clk, ext_clk=rtio_external_clk) """, int_clk=rtio_internal_clk)
class NIST_QC1(BaseSoC, AMPSoC): class NIST_QC1(BaseSoC, AMPSoC):