Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openocd-org/openocd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: os-fpga/openocd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
6 contributors
Loading
Showing with 1,749 additions and 13 deletions.
  1. +182 −0 .github/workflows/LinuxBuild.yml
  2. +22 −12 .github/workflows/snapshot.yml
  3. +5 −1 src/pld/Makefile.am
  4. +1,133 −0 src/pld/gemini.c
  5. +122 −0 src/pld/gemini.h
  6. +182 −0 src/pld/gemini_bit.c
  7. +69 −0 src/pld/gemini_bit.h
  8. +1 −0 src/pld/pld.c
  9. +1 −0 src/pld/pld.h
  10. +32 −0 tcl/board/gemini.cfg
182 changes: 182 additions & 0 deletions .github/workflows/LinuxBuild.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@

name: OpenOCD Linux Build

on:
pull_request:
push:
tags:
'*'

jobs:
build:
runs-on: ubuntu-latest
env:
CC: gcc
CXX: g++
# 64bit
CFALGS: -m64
steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y build-essential autoconf texinfo automake libtool libusb-1.0-0 libusb-1.0-0-dev libftdi-dev
- run: ./bootstrap
- run: ./configure --enable-remote-bitbang --enable-jlink --enable-internal-libjaylink --enable-jtag-vpi
- run: make
- run: file src/openocd | grep 64-bit
- run: ./src/openocd -v

# job to run on centos 7.9 and package it
package_linux:
runs-on: ubuntu-20.04
container:
image: centos:7
defaults:
run:
shell: bash
strategy:
fail-fast: false
env:
DL_DIR: /opt
BUILD_DIR: ../build
steps:
- name: Cancel previous
uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ github.token }}

- name: Update Git
run: |
yum install -y openssh-server openssh-clients wget
yum remove -y git*
yum install -y https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm
yum install -y git
- name: Checkout code
uses: actions/checkout@v3

- name: Install needed packages
run: |
yum update -y
yum group install -y "Development Tools"
yum install -y epel-release texinfo
curl -C - -O https://cmake.org/files/v3.15/cmake-3.15.7-Linux-x86_64.tar.gz
tar xzf cmake-3.15.7-Linux-x86_64.tar.gz
ln -s $PWD/cmake-3.15.7-Linux-x86_64/bin/cmake /usr/bin/cmake
yum install -y openssh-server openssh-clients
yum install -y centos-release-scl-rh
yum install -y devtoolset-11
yum install -y devtoolset-11-toolchain
yum install -y devtoolset-11-gcc-c++
wget https://ftp.gnu.org/gnu/autoconf/autoconf-2.70.tar.gz
tar -xvzf autoconf-2.70.tar.gz
cd autoconf-2.70 && ./configure --prefix=/usr && make && make install && cd -
wget http://ftp.gnu.org/gnu/automake/automake-1.14.tar.gz
tar -xvzf automake-1.14.tar.gz
cd automake-1.14 && ./configure --prefix=/usr && make && make install && cd -
- name: Init OpenOCD Config
run: |
git config --global --add safe.directory /__w/openocd/openocd
./bootstrap
- name: Prepare libusb1
env:
LIBUSB1_VER: 1.0.26
run: |
yum install -y libudev-devel
source /opt/rh/devtoolset-11/enable
mkdir -p $DL_DIR/libusb1 && cd $DL_DIR/libusb1
wget "https://github.com/libusb/libusb/releases/download/v${LIBUSB1_VER}/libusb-${LIBUSB1_VER}.tar.bz2"
tar -xjf libusb-${LIBUSB1_VER}.tar.bz2
cd libusb-${LIBUSB1_VER} && ./configure && make && make install
echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig" >> $GITHUB_ENV
- name: Prepare hidapi
env:
HIDAPI_VER: 0.11.2
run: |
source /opt/rh/devtoolset-11/enable
mkdir -p $DL_DIR/hidapi && cd $DL_DIR/hidapi
wget "https://github.com/libusb/hidapi/archive/hidapi-${HIDAPI_VER}.tar.gz"
tar -xzf hidapi-${HIDAPI_VER}.tar.gz
cd hidapi-hidapi-${HIDAPI_VER} && mkdir build && cd build
cmake .. && make && make install
#echo "HIDAPI_SRC=$PWD" >> $GITHUB_ENV
- name: Prepare libftdi
env:
LIBFTDI_VER: 1.5
run: |
source /opt/rh/devtoolset-11/enable
mkdir -p $DL_DIR/libftdi && cd $DL_DIR/libftdi
wget "http://www.intra2net.com/en/developer/libftdi/download/libftdi1-${LIBFTDI_VER}.tar.bz2"
tar -xjf libftdi1-${LIBFTDI_VER}.tar.bz2
cd libftdi1-${LIBFTDI_VER} && mkdir build && cd build && cmake -DEXAMPLES=OFF -DFTDI_EEPROM=OFF .. && make && make install
#echo "LIBFTDI_SRC=$PWD/libftdi1-${LIBFTDI_VER}" >> $GITHUB_ENV
- name: Prepare capstone
env:
CAPSTONE_VER: 4.0.2
run: |
mkdir -p $DL_DIR && cd $DL_DIR
CAPSTONE_NAME=${CAPSTONE_VER}
CAPSTONE_FOLDER=capstone-${CAPSTONE_VER}
wget "https://github.com/aquynh/capstone/archive/${CAPSTONE_VER}.tar.gz"
tar -xzf ${CAPSTONE_VER}.tar.gz
echo "CAPSTONE_SRC=$PWD/capstone-${CAPSTONE_VER}" >> $GITHUB_ENV
- name: Build OpenOCD for Linux x86_64
run: |
source /opt/rh/devtoolset-11/enable
gcc --version
mkdir $DL_DIR/openocd
./configure --prefix=$DL_DIR/openocd --enable-remote-bitbang --enable-jlink --enable-internal-libjaylink --enable-jtag-vpi && make -j2 && make install
#ldd -r $DL_DIR/openocd/bin/openocd
#$DL_DIR/openocd/bin/openocd -v
# check if there is tag pointing at HEAD, otherwise take the HEAD SHA-1 as OPENOCD_TAG
OPENOCD_TAG="`git tag --points-at HEAD`"
[ -z $OPENOCD_TAG ] && OPENOCD_TAG="`git rev-parse --short HEAD`"
# check if there is tag pointing at HEAD, if so the release will have the same name as the tag,
# otherwise it will be named 'latest'
#RELEASE_NAME="`git tag --points-at HEAD`"
#[ -z $RELEASE_NAME ] && RELEASE_NAME="latest"
RELEASE_NAME="latest"
[[ $RELEASE_NAME = "latest" ]] && IS_PRE_RELEASE="true" || IS_PRE_RELEASE="false"
# set env and call cross-build.sh
export OPENOCD_TAG=$OPENOCD_TAG
# prepare the artifact
ARTIFACT="openocd-linux86_64.tar.gz"
tar -czf $ARTIFACT $DL_DIR/openocd
echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV
echo "IS_PRE_RELEASE=$IS_PRE_RELEASE" >> $GITHUB_ENV
echo "ARTIFACT_PATH=$PWD/$ARTIFACT" >> $GITHUB_ENV
- name: Publish OpenOCD packaged for Linux
if: "${{ github.ref == 'refs/heads/master' }}"
uses: actions/upload-artifact@v2
with:
path: ${{ env.ARTIFACT_PATH }}

# - name: Delete 'latest' Release
# if: "${{ github.ref == 'refs/heads/master' }}"
# uses: dev-drprasad/delete-tag-and-release@v0.2.1
# with:
# delete_release: true
# tag_name: ${{ env.RELEASE_NAME }}
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create Release
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
uses: ncipollo/release-action@v1
with:
name: latest
tag: ${{ env.RELEASE_NAME }}
commit: ${{ github.sha }}
draft: false
artifacts: ${{ env.ARTIFACT_PATH }}
prerelease: ${{ env.IS_PRE_RELEASE }}
token: ${{ secrets.GITHUB_TOKEN }}
allowUpdates: true
34 changes: 22 additions & 12 deletions .github/workflows/snapshot.yml
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,11 @@

# Copyright (C) 2020 by Tarek BOUCHKATI <tarek.bouchkati@gmail.com>

on: push
on:
pull_request:
push:
tags:
'*'

name: OpenOCD Snapshot

@@ -81,13 +85,14 @@ jobs:
[ -z $OPENOCD_TAG ] && OPENOCD_TAG="`git rev-parse --short HEAD`"
# check if there is tag pointing at HEAD, if so the release will have the same name as the tag,
# otherwise it will be named 'latest'
RELEASE_NAME="`git tag --points-at HEAD`"
[ -z $RELEASE_NAME ] && RELEASE_NAME="latest"
#RELEASE_NAME="`git tag --points-at HEAD`"
#[ -z $RELEASE_NAME ] && RELEASE_NAME="latest"
RELEASE_NAME="latest"
[[ $RELEASE_NAME = "latest" ]] && IS_PRE_RELEASE="true" || IS_PRE_RELEASE="false"
# set env and call cross-build.sh
export OPENOCD_TAG=$OPENOCD_TAG
export OPENOCD_SRC=$PWD
export OPENOCD_CONFIG=""
export OPENOCD_CONFIG="--enable-remote-bitbang --enable-jlink --enable-internal-libjaylink --enable-jtag-vpi"
mkdir -p $BUILD_DIR && cd $BUILD_DIR
bash $OPENOCD_SRC/contrib/cross-build.sh $HOST
# add missing dlls
@@ -96,28 +101,33 @@ jobs:
# required by libftdi1.dll. For the gcc-mingw-10.3.x or later "libgcc_s_dw2-1.dll" will need to be copied.
cp `$HOST-gcc --print-file-name=libgcc_s_sjlj-1.dll` ./bin/
# prepare the artifact
ARTIFACT="openocd-${OPENOCD_TAG}-${HOST}.tar.gz"
ARTIFACT="openocd-${HOST}.tar.gz"
tar -czf $ARTIFACT *
echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV
echo "IS_PRE_RELEASE=$IS_PRE_RELEASE" >> $GITHUB_ENV
echo "ARTIFACT_PATH=$PWD/$ARTIFACT" >> $GITHUB_ENV
- name: Publish OpenOCD packaged for windows
if: "${{ github.ref == 'refs/heads/master' }}"
uses: actions/upload-artifact@v3
with:
path: ${{ env.ARTIFACT_PATH }}
- name: Delete 'latest' Release
uses: dev-drprasad/delete-tag-and-release@v0.2.1
with:
delete_release: true
tag_name: ${{ env.RELEASE_NAME }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# - name: Delete 'latest' Release
# if: "${{ github.ref == 'refs/heads/master' }}"
# uses: dev-drprasad/delete-tag-and-release@v0.2.1
# with:
# delete_release: true
# tag_name: ${{ env.RELEASE_NAME }}
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Create Release
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
uses: ncipollo/release-action@v1
with:
name: latest
tag: ${{ env.RELEASE_NAME }}
commit: ${{ github.sha }}
draft: false
artifacts: ${{ env.ARTIFACT_PATH }}
prerelease: ${{ env.IS_PRE_RELEASE }}
token: ${{ secrets.GITHUB_TOKEN }}
allowUpdates: true
6 changes: 5 additions & 1 deletion src/pld/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -24,4 +24,8 @@ noinst_LTLIBRARIES += %D%/libpld.la
%D%/pld.h \
%D%/raw_bit.h \
%D%/xilinx_bit.h \
%D%/virtex2.h
%D%/virtex2.h \
%D%/gemini.c \
%D%/gemini.h \
%D%/gemini_bit.c \
%D%/gemini_bit.h
Loading