From 17b8cb515b0dedbcf4545d18898aba46cbe9acd4 Mon Sep 17 00:00:00 2001 From: Matthew Mets Date: Thu, 16 Feb 2023 15:12:30 +0000 Subject: [PATCH] Update toolchain for raw_usb dependencies Addresses #82 --- contrib/Dockerfile | 4 ++-- doc/toolchain_setup.md | 2 +- hw/production_test/requirements.txt | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/Dockerfile b/contrib/Dockerfile index 7b6312e..329a588 100644 --- a/contrib/Dockerfile +++ b/contrib/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get -qq update -y \ libffi-dev \ libftdi-dev \ libglib2.0-dev \ - libhidapi-dev \ + libusb-1.0-0-dev \ libpixman-1-dev \ libreadline-dev \ lld \ @@ -55,7 +55,7 @@ WORKDIR / RUN rm -rf /src # 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 RUN make -j$(nproc --ignore=2) \ && make PROGRAM_PREFIX=tillitis- install diff --git a/doc/toolchain_setup.md b/doc/toolchain_setup.md index 1c61171..49a9c53 100644 --- a/doc/toolchain_setup.md +++ b/doc/toolchain_setup.md @@ -22,7 +22,7 @@ sudo apt install build-essential clang lld llvm bison flex libreadline-dev \ python3-dev libeigen3-dev \ libboost-dev libboost-filesystem-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 \ golang clang-format ``` diff --git a/hw/production_test/requirements.txt b/hw/production_test/requirements.txt index 0987a4e..c976cb5 100644 --- a/hw/production_test/requirements.txt +++ b/hw/production_test/requirements.txt @@ -1,4 +1,3 @@ -hid==1.0.5 numpy==1.23.4 pyserial==3.5 pyusb==1.2.1