diff options
| author | Tim Newsome <tim@sifive.com> | 2023-03-16 17:52:48 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2023-03-16 18:02:35 -0700 |
| commit | 868ebdd89ca75a73bffe335395aa1ed522dda660 (patch) | |
| tree | 95ead6f4982b85a6cc90d5832712523a8ee7b77a /.travis.yml | |
| parent | 3387015af01f18cc350c4764fbd533068ed15f3d (diff) | |
| parent | 1293ddd65713d6551775b67169387622ada477c1 (diff) | |
| download | riscv-openocd-868ebdd89ca75a73bffe335395aa1ed522dda660.zip riscv-openocd-868ebdd89ca75a73bffe335395aa1ed522dda660.tar.gz riscv-openocd-868ebdd89ca75a73bffe335395aa1ed522dda660.tar.bz2 | |
Merge commit '1293ddd65713d6551775b67169387622ada477c1' into from_upstream
This includes
https://sourceforge.net/p/openocd/mailman/message/37710818/, which
should fix #814.
Conflicts:
.travis.yml
contrib/loaders/flash/stm32/stm32f1x.S
contrib/loaders/flash/stm32/stm32f2x.S
doc/openocd.texi
src/rtos/FreeRTOS.c
src/server/gdb_server.c
src/target/riscv/riscv-013.c
src/target/riscv/riscv.c
src/target/riscv/riscv.h
src/target/riscv/riscv_semihosting.c
tcl/target/esp_common.cfg
tcl/target/gd32vf103.cfg
tools/scripts/checkpatch.pl
Change-Id: I1986c13298ca0dafbe3aecaf1b0b35626525e4eb
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index d0bc8f2..e5ebe4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,32 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright Marek Vasut <marex@denx.de> + +# OpenOCD on Travis CI - https://travis-ci.org/ + +sudo: required +dist: bionic + +arch: + - amd64 + - arm64 + - ppc64le + - s390x + +addons: + apt: + sources: + - sourceline: 'ppa:ubuntu-toolchain-r/test' + - sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + packages: + - libftdi-dev + - libhidapi-dev + - libjaylink-dev + +env: + - CC=gcc-9 + - CC=clang-9 + language: c dist: trusty |