Update modules and remove openocd.cfg riscv32-unknown-none.json

Author: dvc94ch

.gitmodules

@@ -1,16 +1,16 @@
 [submodule "llvm"]
 	path = llvm
-	url = https://github.com/dvc94ch/llvm
-	branch = llvm6-riscv-24-11-2017
+	url = https://github.com/riscv-rust/llvm
+	branch = rust-llvm-release-6-0-0-riscv
 [submodule "rust"]
 	path = rust
-	url = https://github.com/dvc94ch/rust
-	branch = riscv-rust-1b7a332
+	url = https://github.com/riscv-rust/rust
+	branch = riscv-rust-master
 [submodule "binutils"]
 	path = riscv-binutils-gdb
-	url = https://github.com/riscv/riscv-binutils-gdb
+	url = https://github.com/riscv-rust/riscv-binutils-gdb
 	branch = riscv-binutils-2.29
 [submodule "openocd"]
 	path = riscv-openocd
-	url = https://github.com/riscv/riscv-openocd
-	branch = riscv
+	url = https://github.com/riscv-rust/riscv-openocd
+	branch = riscv

env.sh

@@ -2,8 +2,8 @@
 export RISCV_RUST_TOOLCHAIN=$PWD
 
 export TOOLCHAIN=$RISCV_RUST_TOOLCHAIN/toolchain
-export PATH=$TOOLCHAIN/bin:$PATH
+export PATH=/opt/rust/bin:$TOOLCHAIN/bin:$PATH
 export RUST_TARGET_PATH=$RISCV_RUST_TOOLCHAIN
 export CARGO_HOME=$RISCV_RUST_TOOLCHAIN/build/cargo
 export XARGO_HOME=$RISCV_RUST_TOOLCHAIN/build/xargo
-export XARGO_RUST_SRC=$RISCV_RUST_TOOLCHAIN/rust/src
+export XARGO_RUST_SRC=~/repos/rust/src