Merge pull request #110 from keystone-enclave/setup-fixes

Updated fast setup to new hosting for toolchains, corrected setup to …

docs/source/Getting-Started/QEMU-Setup-Repository.rst

@@ -1,9 +1,9 @@
-Setup 
+Setup
 ----------------------------
 
 In this stage, you will (1) install RISC-V toolchain, (2) checkout git submodules, and (3) Install
 SDK.
-You can either quickly setup everything (:ref:`QEMUSetupQuick`) or manually setup 
+You can either quickly setup everything (:ref:`QEMUSetupQuick`) or manually setup
 (:ref:`QEMUSetupManual`).
 
 .. _QEMUSetupQuick:
@@ -29,7 +29,7 @@ To keep environment variables, add following lines to your ``.bashrc``.
 ::
 
   export RISCV=<path/to/keystone>/riscv
-  export PATH=$PATH:$RISCV/bin 
+  export PATH=$PATH:$RISCV/bin
   export KEYSTONE_SDK_DIR=<path/to/keystone>/sdk
 
 You can also manually run ``source source.sh`` to set the environment variables.
@@ -59,7 +59,7 @@ See `riscv-gnu-toolchain <https://github.com/riscv/riscv-gnu-toolchain>`_ for de
 ::
 
   cd riscv-gnu-toolchain
-  ./configure --prefix=$(pwd)/riscv --enable-multilib
+  ./configure --prefix=$(pwd)/../riscv
   make; make linux
 
 Install the Keystone SDK and prepare Eyrie runtime source code.
@@ -84,7 +84,7 @@ To keep environment variables, add following lines to your ``.bashrc``.
 ::
 
   export RISCV=<path/to/keystone>/riscv
-  export PATH=$PATH:$RISCV/bin 
+  export PATH=$PATH:$RISCV/bin
   export KEYSTONE_SDK_DIR=<path/to/keystone>/sdk
 
-You can also manually run ``source source.sh`` to set the environment variables.
+You can also manually run ``source source.sh`` to set the environment variables.

fast-setup.sh

@@ -17,7 +17,7 @@ else
 
   export RISCV=$(pwd)/riscv
   export PATH=$PATH:$RISCV/bin
-  wget https://github.com/keystone-enclave/firesim-riscv-tools-prebuilt/archive/${TOOL_VER}.tar.gz
+  wget https://keystone-enclave.eecs.berkeley.edu/files/${TOOL_VER}.tar.gz
 
   # Check tool integrity
   echo "Verifying prebuilt toolchain integrity..."

setup.sh

@@ -13,4 +13,5 @@ cd ..
 
 # build tests in SDK
 make -C sdk
+export KEYSTONE_SDK_DIR=$(pwd)/sdk
 ./sdk/scripts/init.sh --runtime eyrie --force