Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix OpenOCD build missing linuxgpiod adapter #2

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Pico SDK Tools

This repository is used to provide pre-built binaries of the SDK tools for Windows, MacOS, Raspberry Pi OS, and other Linux operating systems (builds performed on Ubuntu).
This repository is used to provide pre-built binaries of the SDK tools for Windows, macOS, Raspberry Pi OS, and other Linux operating systems (builds performed on Ubuntu).
These binaries are primarilly for use by the [pico-vscode](https://github.com/raspberrypi/pico-vscode) extension, and the release format is subject to change at any time.

The tools currently included are
* picotool
* OpenOCD
* pioasm
* Risc-V Toolchain for Raspberry Pi OS - for other OSs, the extension uses the compilers from [Core-V](https://www.embecosm.com/resources/tool-chain-downloads/#corev)
The tools currently included are:
* **picotool**
* **OpenOCD** (includes `linuxgpiod` and `cmsis-dap` adapters)
* **pioasm**
* **RISC-V Toolchain for Raspberry Pi OS** - for other OSs, the extension uses the compilers from [Core-V](https://www.embecosm.com/resources/tool-chain-downloads/#corev)
8 changes: 4 additions & 4 deletions build_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ SKIP_RISCV=${SKIP_RISCV-0}
SKIP_OPENOCD=${SKIP_OPENOCD-0}

# Install prerequisites
sudo apt install -y jq cmake libtool automake libusb-1.0-0-dev libhidapi-dev libftdi1-dev
# Risc-V prerequisites
sudo apt install -y jq cmake libtool automake libusb-1.0-0-dev libhidapi-dev libftdi1-dev libgpiod-dev
# RISC-V prerequisites
sudo apt install -y autoconf automake autotools-dev curl python3 python3-pip libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev ninja-build git cmake libglib2.0-dev libslirp-dev

repos=$(cat config/repositories.json | jq -c '.repositories[]')
Expand Down Expand Up @@ -94,11 +94,11 @@ fi
if [[ "$SKIP_RISCV" != 1 ]]; then
# Package riscv toolchain separately as well
version="14"
echo "Risc-V Toolchain version $version"
echo "RISC-V Toolchain version $version"

filename="riscv-toolchain-${version}-${suffix}.tar.gz"

echo "Saving Risc-V Toolchain package to $filename"
echo "Saving RISC-V Toolchain package to $filename"
pushd "$builddir/riscv-install/"
tar -a -cf "$topd/bin/$filename" *
popd
Expand Down