1 files changed, 19 insertions, 10 deletions
diff --git a/decoder/tests/perf-test-scripts/perf-setup-env.bash b/decoder/tests/perf-test-scripts/perf-setup-env.bash
index 09431a7fd410f..95bfdc8aaacd1 100755
--- a/decoder/tests/perf-test-scripts/perf-setup-env.bash
+++ b/decoder/tests/perf-test-scripts/perf-setup-env.bash
@@ -5,35 +5,44 @@
 #
 # to use this script:-
 #
+# 1) for perf exec env only
 # source perf-setup-env.bash
 #
+# 2) for perf build and exec env
+# source perf-setup-env.bash buildenv
+#
 
 #------ User Edits Start -------
 # Edit as required for user system.
 
 # Root of the opencsd library project as cloned from github
-export OPENCSD_ROOT=~/OpenCSD/opencsd-github/opencsd
+export OPENCSD_ROOT=~/work/opencsd-master
 
 # the opencsd build library directory to use.
-export OCSD_LIB_DIR=lib/linux64/rel
+export OCSD_LIB_DIR=lib/builddir
 
 # the root of the perf branch / perf dev-tree as checked out
-export PERF_ROOT=~/work2/perf-opencsd/mp-4.7-rc4/coresight
+export PERF_ROOT=~/work/kernel-dev
 
 # the arm x-compiler toolchain path
-export XTOOLS_PATH=~/work2/toolchain-aarch64/gcc-linaro-4.9-2015.05-1-rc1-x86_64_aarch64-linux-gnu/bin/
+export XTOOLS_PATH=~/work/gcc-x-aarch64-6.2/bin
 
 #------ User Edits End -------
 
 # path to source/include root dir - used by perf build to 
 # include Opencsd decoder.
-export CSTRACE_PATH=${OPENCSD_ROOT}/decoder
 
-# add library to lib path
-if [ "${LD_LIBRARY_PATH}" == ""  ]; then 
-    export LD_LIBRARY_PATH=${CSTRACE_PATH}/${OCSD_LIB_DIR}
-else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CSTRACE_PATH}/${OCSD_LIB_DIR}
+if [ "$1" == "buildenv" ]; then
+   export CSTRACE_PATH=${OPENCSD_ROOT}/decoder
+   export CSLIBS=${CSTRACE_PATH}/${OCSD_LIB_DIR}
+   export CSINCLUDES=${CSTRACE_PATH}/include
+
+   # add library to lib path
+   if [ "${LD_LIBRARY_PATH}" == ""  ]; then 
+       export LD_LIBRARY_PATH=${CSLIBS}
+   else
+       export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CSLIBS}
+   fi
 fi
 
 # perf script defines