Merge branch 'priv-1.10'merge

14 files changed, 26 insertions, 7 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 dd5c935..f5d0ede 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,11 +23,13 @@ addons:
       - flex
       - texinfo
       - python-pexpect
+      - libusb-1.0-0-dev
+      - device-tree-compiler
 
 env:
   global:
     - RISCV="/home/travis/riscv_install"
-    - MAKEFLAGS="-j3"
+    - MAKEFLAGS="-j2"
     - PATH="/home/travis/riscv_install/bin:$PATH"
 
 before_install:
@@ -37,6 +39,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
 
@@ -46,4 +52,4 @@ install: travis_wait
 script:
   - ./build.sh
   - cd riscv-tests/build
-  - make debug-check
+  - make debug-check || (tail debug/*.log; exit 1)
diff --git a/README.md b/README.md
index 8c32c3e..98d02f6 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ This repo provides guides and references:
 
 Ubuntu packages needed:
 
-	$ sudo apt-get install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev
+	$ sudo apt-get install autoconf automake autotools-dev curl device-tree-compiler libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev
 
 
 _Note:_ This requires a compiler with C++11 support (e.g. GCC >= 4.8).
@@ -30,7 +30,7 @@ To use a compiler different than the default, use:
 
 	$ CC=gcc-5 CXX=g++-5 ./build.sh
 
-_Note for OS X:_ We recommend using [Homebrew](https://brew.sh) to install the dependencies (`gawk gnu-sed gmp mpfr libmpc isl wget`) or even to install the tools [directly](https://github.com/riscv/homebrew-riscv). This repo will build with Apple's command-line developer tools (clang) in addition to gcc.
+_Note for OS X:_ We recommend using [Homebrew](http://brew.sh) to install the dependencies (`dtc gawk gnu-sed gmp mpfr libmpc isl wget`) or even to install the tools [directly](https://github.com/riscv/homebrew-riscv). This repo will build with Apple's command-line developer tools (clang) in addition to gcc.
 
 
 # <a name="newlibman"></a>The RISC-V GCC/Newlib Toolchain Installation Manual
@@ -191,7 +191,7 @@ flex, bison, autotools, libmpc, libmpfr, and libgmp. Ubuntu distribution
 installations will require this command to be run. If you have not installed
 these things yet, then run this:
 
-	O$ sudo apt-get install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc
+	O$ sudo apt-get install autoconf automake autotools-dev curl device-tree-compiler libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc
 
 Before we start installation, we need to set the
 `$RISCV` environment variable. The variable is used throughout the
@@ -424,7 +424,7 @@ flex, bison, autotools, libmpc, libmpfr, and libgmp. Ubuntu distribution
 installations will require this command to be run. If you have not installed
 these things yet, then run this:
 
-	O$ sudo apt-get install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf
+	O$ sudo apt-get install autoconf automake autotools-dev curl device-tree-compiler libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf
 
 Before we start installation, we need to set the
 `$RISCV` environment variable. The variable is used throughout the
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-spike-pk.sh b/build-spike-pk.sh
index 00af1d5..02f3202 100755
--- a/build-spike-pk.sh
+++ b/build-spike-pk.sh
@@ -15,6 +15,6 @@ echo "Starting RISC-V Toolchain build process"
 
 build_project riscv-fesvr --prefix=$RISCV
 build_project riscv-isa-sim --prefix=$RISCV --with-fesvr=$RISCV
-CC=riscv64-unknown-elf-gcc build_project riscv-pk --prefix=$RISCV/riscv64-unknown-elf --host=riscv
+CC= CXX= build_project riscv-pk --prefix=$RISCV --host=riscv64-unknown-elf
 
 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"
diff --git a/build.sh b/build.sh
index ec5f003..eb9cf6a 100755
--- a/build.sh
+++ b/build.sh
@@ -7,6 +7,7 @@
 
 echo "Starting RISC-V Toolchain build process"
 
+build_project riscv-openocd --prefix=$RISCV --enable-remote-bitbang --enable-jtag_vpi
 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-fesvr b/riscv-fesvr
-Subproject 0b85715f43196e858cc965559914efba7561f45
+Subproject 6330e8668092e8a9c8af97f75313261d8e39b00
diff --git a/riscv-gnu-toolchain b/riscv-gnu-toolchain
-Subproject 914224e0913c9ceab49ad9531a7fedc231f65c1
+Subproject a71fc539850f8dacf232fc580743b946c376014
diff --git a/riscv-isa-sim b/riscv-isa-sim
-Subproject f38dcde0d80d2f4818b8f20067b8de5267c8ade
+Subproject b3caeee9858b3417d4110b921305c441d3c8765
diff --git a/riscv-opcodes b/riscv-opcodes
-Subproject 7650b391d47dd0b73d541d39c48041aa5351797
+Subproject e0abc2255a71afb0236032ae3d92bea26c15716
diff --git a/riscv-openocd b/riscv-openocd
new file mode 160000
+Subproject c431c0eb251bf6d02959a6f55be3baba04552b5
diff --git a/riscv-pk b/riscv-pk
-Subproject f6b2274af4a91763ecdb94600d7d54d5f7f262b
+Subproject 66701f82f88d08d3700d8b0bc5d5306abfd0044
diff --git a/riscv-tests b/riscv-tests
-Subproject 6a1a38d421fd3e24bdc179d58d33572636b903b
+Subproject 2b0193de9f7cb43d3b3c519fe8eff497ea73859