File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ oscope_top_bmb7:
19
19
20
20
oscope_top_marble :
21
21
before_script :
22
- - cd projects/oscope/marble_family && ls /non-free && apt-get update && apt-get install -y yosys
22
+ - cd projects/oscope/marble_family && ls /non-free
23
23
stage : synthesis
24
24
script :
25
25
- verilator -V && XILINX_VIVADO=$XILINX_VIVADO PATH=$XILINX_VIVADO/bin:$PATH make oscope_top.bit
Original file line number Diff line number Diff line change @@ -47,10 +47,10 @@ RUN git clone https://github.com/ldoolitt/vhd2vl && \
47
47
# Yosys
48
48
# For now we need to build yosys from source, since Debian Bullseye
49
49
# is stuck at yosys-0.9 that doesn't have the features we need.
50
- # Revisit this choice when Debian catches up, maybe in Bookworm,
51
- # and hope to get back to "apt-get install yosys" then .
50
+ # Commit 7ce5011 corresponds to yosys-0.23 2022-11-08, matching
51
+ # the version in Debian Bookworm .
52
52
# Note that the standard yosys build process used here requires
53
- # network access to download abc from https://github.com/berkeley-abc /abc.
53
+ # network access to download abc from https://github.com/YosysHQ /abc.
54
54
RUN apt-get update && \
55
55
apt-get install -y \
56
56
clang \
@@ -66,7 +66,7 @@ RUN apt-get update && \
66
66
rm -rf /var/lib/apt/lists/* && \
67
67
git clone https://github.com/cliffordwolf/yosys.git && \
68
68
cd yosys && \
69
- git checkout 40e35993af6ecb6207f15cc176455ff8d66bcc69 && \
69
+ git checkout 7ce5011c24bc4c605578bb16576cadf79373e23f && \
70
70
make config-clang && \
71
71
make -j4 && \
72
72
make install && \
You can’t perform that action at this time.
0 commit comments