Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2024-12-20 13:24:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

toolchain: pin yosys to latest tag, icestorm to recent commit, use newer nextpnr

Browse Source 
The icebram and nextpnr issues have been resolved.

Signed-off-by: Daniel Lublin <daniel@lublin.se>
This commit is contained in:
Daniel Lublin 2023-03-02 14:17:22 +01:00
parent 2991dcef68
commit fae06116dd
No known key found for this signature in database
GPG Key ID: 75BD0FEB8D3E7830
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
contrib/Dockerfile
View File

@ -51,10 +51,10 @@ FROM base as toolsbuilder
RUN git clone https://github.com/YosysHQ/icestorm /src RUN git clone https://github.com/YosysHQ/icestorm /src
WORKDIR /src WORKDIR /src
RUN git checkout 45f5e5f3889afb07907bab439cf071478ee5a2a5 \ RUN git checkout d20a5e9001f46262bf0cef220f1a6943946e421d \
&& make -j$(nproc --ignore=2) \ && make -j$(nproc --ignore=2) \
&& make install && make install
RUN git >/usr/local/repo-commit-icestorm describe --tags --always --dirty RUN git >/usr/local/repo-commit-icestorm describe --all --always --long --dirty
WORKDIR / WORKDIR /
RUN rm -rf /src RUN rm -rf /src
@ -63,39 +63,34 @@ RUN git clone -b interfaces --depth=1 https://github.com/tillitis/icestorm /src
WORKDIR /src/iceprog WORKDIR /src/iceprog
RUN make -j$(nproc --ignore=2) \ RUN make -j$(nproc --ignore=2) \
&& make PROGRAM_PREFIX=tillitis- install && make PROGRAM_PREFIX=tillitis- install
RUN git >/usr/local/repo-commit-tillitis--icestorm describe --tags --always --dirty RUN git >/usr/local/repo-commit-tillitis--icestorm describe --all --always --long --dirty
WORKDIR / WORKDIR /
RUN rm -rf /src RUN rm -rf /src
RUN git clone https://github.com/YosysHQ/yosys /src RUN git clone -b yosys-0.26 --depth=1 https://github.com/YosysHQ/yosys /src
WORKDIR /src WORKDIR /src
# Avoiding current issue with yosys & icebram, filed in: RUN make -j$(nproc --ignore=2) \
# https://github.com/YosysHQ/yosys/issues/3478
RUN git checkout 06ef3f264afaa3eaeab45cc0404d8006c15f02b1 \
&& make -j$(nproc --ignore=2) \
&& make install && make install
RUN git >/usr/local/repo-commit-yosys describe --tags --always --dirty RUN git >/usr/local/repo-commit-yosys describe --all --always --long --dirty
WORKDIR / WORKDIR /
RUN rm -rf /src RUN rm -rf /src
RUN git clone https://github.com/YosysHQ/nextpnr /src RUN git clone -b nextpnr-0.5 --depth=1 https://github.com/YosysHQ/nextpnr /src
WORKDIR /src WORKDIR /src
# Use nextpnr-0.4. Aa few commits later we got issues, like on f4e6bbd383f6c43. RUN cmake -DARCH=ice40 -DCMAKE_INSTALL_PREFIX=/usr/local . \
RUN git checkout nextpnr-0.4 \
&& cmake -DARCH=ice40 -DCMAKE_INSTALL_PREFIX=/usr/local . \
&& make -j$(nproc --ignore=2) \ && make -j$(nproc --ignore=2) \
&& make install && make install
RUN git >/usr/local/repo-commit-nextpnr describe --tags --always --dirty RUN git >/usr/local/repo-commit-nextpnr describe --all --always --long --dirty
WORKDIR / WORKDIR /
RUN rm -rf /src RUN rm -rf /src
RUN git clone --branch 1.5.0 --depth 1 https://github.com/raspberrypi/pico-sdk.git /usr/local/pico-sdk RUN git clone --branch 1.5.0 --depth 1 https://github.com/raspberrypi/pico-sdk.git /usr/local/pico-sdk
WORKDIR /usr/local/pico-sdk WORKDIR /usr/local/pico-sdk
RUN git submodule update --init RUN git submodule update --init
RUN git >/usr/local/repo-commit-picosdk describe --tags --always --dirty RUN git >/usr/local/repo-commit-picosdk describe --all --always --long --dirty
WORKDIR / WORKDIR /
FROM base FROM base
LABEL org.opencontainers.image.description="Toolchain for building TKey FPGA bitstream, firmware, apps" LABEL org.opencontainers.image.description="Toolchain for building TKey FPGA bitstream, firmware, apps, programmer firmware"
COPY --from=toolsbuilder /usr/local/ /usr/local COPY --from=toolsbuilder /usr/local/ /usr/local

9
doc/toolchain_setup.md
View File

@ -80,7 +80,7 @@ install other versions of these tools locally, they could conflict
git clone https://github.com/YosysHQ/icestorm git clone https://github.com/YosysHQ/icestorm
cd icestorm cd icestorm
git checkout 45f5e5f3889afb07907bab439cf071478ee5a2a5 git checkout d20a5e9001f46262bf0cef220f1a6943946e421d
make -j$(nproc) make -j$(nproc)
sudo make install sudo make install
cd .. cd ..
@ -96,17 +96,14 @@ install other versions of these tools locally, they could conflict
git clone https://github.com/YosysHQ/yosys git clone https://github.com/YosysHQ/yosys
cd yosys cd yosys
# Avoiding current issue with yosys & icebram, filed in: git checkout yosys-0.26
# https://github.com/YosysHQ/yosys/issues/3478
git checkout 06ef3f264afaa3eaeab45cc0404d8006c15f02b1
make -j$(nproc) make -j$(nproc)
sudo make install sudo make install
cd .. cd ..
git clone https://github.com/YosysHQ/nextpnr git clone https://github.com/YosysHQ/nextpnr
cd nextpnr cd nextpnr
# Use nextpnr-0.4. Aa few commits later we got issues, like on f4e6bbd383f6c43. git checkout nextpnr-0.5
git checkout nextpnr-0.4
cmake -DARCH=ice40 -DCMAKE_INSTALL_PREFIX=/usr/local . cmake -DARCH=ice40 -DCMAKE_INSTALL_PREFIX=/usr/local .
make -j$(nproc) make -j$(nproc)
sudo make install sudo make install