diff options
| author | Palmer Dabbelt <palmer@dabbelt.com> | 2017-05-03 17:35:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 17:35:38 -0700 |
| commit | 8089bd3167ea205e0f7e27c6a9fe6877150b0fa9 (patch) | |
| tree | 3ae314f306e3336abea5d05cd5bffaea79201963 | |
| parent | 25bb7e1305d9220dddfbded12c087e8f1372b952 (diff) | |
| parent | de3f9239356b6486552831a6605baa07b39348bd (diff) | |
| download | riscv-tools-8089bd3167ea205e0f7e27c6a9fe6877150b0fa9.zip riscv-tools-8089bd3167ea205e0f7e27c6a9fe6877150b0fa9.tar.gz riscv-tools-8089bd3167ea205e0f7e27c6a9fe6877150b0fa9.tar.bz2 | |
Merge pull request #65 from riscv/openocd
Add OpenOCD
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | build-rv32ima.sh | 1 | ||||
| -rw-r--r-- | build.common | 8 | ||||
| -rwxr-xr-x | build.sh | 1 | ||||
| m--------- | riscv-gnu-toolchain | 0 | ||||
| m--------- | riscv-openocd | 0 |
7 files changed, 18 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 2c44816..0ea42ca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "riscv-gnu-toolchain"] path = riscv-gnu-toolchain url = https://github.com/riscv/riscv-gnu-toolchain.git +[submodule "riscv-openocd"] + path = riscv-openocd + url = https://github.com/riscv/riscv-openocd.git diff --git a/.travis.yml b/.travis.yml index 9ade992..3100a4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ addons: - flex - texinfo - python-pexpect + - libusb-1.0-0-dev env: global: @@ -37,6 +38,10 @@ before_install: - cd riscv-tests - git submodule update --init - cd .. + # openocd also needs submodules + - cd riscv-openocd + - git submodule update --init + - cd .. # actually use new gcc - export CXX=g++-4.8 CC=gcc-4.8 diff --git a/build-rv32ima.sh b/build-rv32ima.sh index 65e93ae..eaa0bb8 100755 --- a/build-rv32ima.sh +++ b/build-rv32ima.sh @@ -11,5 +11,6 @@ build_project riscv-fesvr --prefix=$RISCV build_project riscv-isa-sim --prefix=$RISCV --with-fesvr=$RISCV --with-isa=rv32ima build_project riscv-gnu-toolchain --prefix=$RISCV --with-arch=rv32ima --with-abi=ilp32 CC= CXX= build_project riscv-pk --prefix=$RISCV --host=riscv32-unknown-elf +build_project riscv-openocd --prefix=$RISCV --enable-remote-bitbang echo -e "\\nRISC-V Toolchain installation completed!" diff --git a/build.common b/build.common index 3b6a1c4..fadf6ef 100644 --- a/build.common +++ b/build.common @@ -24,6 +24,14 @@ function build_project { echo "Removing existing $PROJECT/build directory" rm -rf "$PROJECT/build" fi + if [ ! -e "$PROJECT/configure" ] + then + ( + cd "$PROJECT" + find . -iname configure.ac | sed s/configure.ac/m4/ | xargs mkdir -p + autoreconf -i + ) + fi mkdir -p "$PROJECT/build" cd "$PROJECT/build" echo "Configuring project $PROJECT" @@ -7,6 +7,7 @@ echo "Starting RISC-V Toolchain build process" +build_project riscv-openocd --prefix=$RISCV --enable-remote-bitbang build_project riscv-fesvr --prefix=$RISCV build_project riscv-isa-sim --prefix=$RISCV --with-fesvr=$RISCV build_project riscv-gnu-toolchain --prefix=$RISCV diff --git a/riscv-gnu-toolchain b/riscv-gnu-toolchain -Subproject 8b16c6123d3dc9642ceeaa6ad371f494d597087 +Subproject 9f1f1971208d898705cb19e353e3da28c9f8c4a diff --git a/riscv-openocd b/riscv-openocd new file mode 160000 +Subproject ba3a56937bc921a72b672d666a60ea4292cff44 |