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

Update toolchain for raw_usb dependencies

Browse Source 
Addresses #82
This commit is contained in:
Matthew Mets 2023-02-16 15:12:30 +00:00 committed by Michael Cardell Widerkrantz
parent 7364cd75be
commit 17b8cb515b
No known key found for this signature in database
GPG Key ID: D3DB3DDF57E704E5
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/Dockerfile
View File

@ -24,7 +24,7 @@ RUN apt-get -qq update -y \
libffi-dev \ libffi-dev \
libftdi-dev \ libftdi-dev \
libglib2.0-dev \ libglib2.0-dev \
libhidapi-dev \ libusb-1.0-0-dev \
libpixman-1-dev \ libpixman-1-dev \
libreadline-dev \ libreadline-dev \
lld \ lld \
@ -55,7 +55,7 @@ WORKDIR /
RUN rm -rf /src RUN rm -rf /src
# Custom iceprog for the RPi 2040-based programmer (will be upstreamed). # Custom iceprog for the RPi 2040-based programmer (will be upstreamed).
RUN git clone -b interfaces --depth=1 https://github.com/tillitis/icestorm /src RUN git clone -b raw_usb --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

2
doc/toolchain_setup.md
View File

@ -22,7 +22,7 @@ sudo apt install build-essential clang lld llvm bison flex libreadline-dev \
python3-dev libeigen3-dev \ python3-dev libeigen3-dev \
libboost-dev libboost-filesystem-dev \ libboost-dev libboost-filesystem-dev \
libboost-thread-dev libboost-program-options-dev \ libboost-thread-dev libboost-program-options-dev \
libboost-iostreams-dev cmake libhidapi-dev \ libboost-iostreams-dev cmake libusb-1.0-0-dev \
ninja-build libglib2.0-dev libpixman-1-dev \ ninja-build libglib2.0-dev libpixman-1-dev \
golang clang-format golang clang-format
``` ```

1
hw/production_test/requirements.txt
View File

@ -1,4 +1,3 @@
hid==1.0.5
numpy==1.23.4 numpy==1.23.4
pyserial==3.5 pyserial==3.5
pyusb==1.2.1 pyusb==1.2.1