URL
https://opencores.org/ocsvn/minsoc/minsoc/trunk
Subversion Repositories minsoc
Compare Revisions
- This comparison shows the changes necessary to convert path
/minsoc/trunk/utils
- from Rev 141 to Rev 135
- ↔ Reverse comparison
Rev 141 → Rev 135
/setup/minsoc-setup.sh
File deleted
setup/minsoc-setup.sh
Property changes :
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: setup/configure.sh
===================================================================
--- setup/configure.sh (revision 141)
+++ setup/configure.sh (nonexistent)
@@ -1,39 +0,0 @@
-. ${SCRIPT_DIR}/beautify.sh
-
-#Configuring MinSoC
-cecho "\nConfiguring MinSoC"
-execcmd "cd ${DIR_TO_INSTALL}/minsoc/backend/std"
-execcmd "Configuring MinSoC as standard board (simulatable but not synthesizable)" "./configure"
-execcmd "cd ${DIR_TO_INSTALL}"
-
-
-#Configuring Advanced Debug System to work with MinSoC
-cecho "\nConfiguring Advanced Debug System to work with MinSoC"
-execcmd "cd ${DIR_TO_INSTALL}/minsoc/rtl/verilog/adv_debug_sys/Hardware/adv_dbg_if/rtl/verilog"
-execcmd "Turning off Advanced Debug System's JSP" "sed 's%\`define DBG_JSP_SUPPORTED%//\`define DBG_JSP_SUPPORTED%' adbg_defines.v > TMPFILE && mv TMPFILE adbg_defines.v"
-
-#Compiling and moving adv_jtag_bridge debug modules for simulation
-execcmd "cd ${DIR_TO_INSTALL}/minsoc/rtl/verilog/adv_debug_sys/Software/adv_jtag_bridge/sim_lib/icarus"
-execcmd "Compiling VPI interface to connect GDB with simulation" "make"
-execcmd "cp jp-io-vpi.vpi ${DIR_TO_INSTALL}/minsoc/bench/verilog/vpi"
-
-#Patching OpenRISC Release 1 with Advanced Debug System patch for Watchpoints
-execcmd "cd ${DIR_TO_INSTALL}/minsoc/rtl/verilog/or1200/rtl/verilog"
-cecho "Patching OpenRISC for watchpoint support"
-#patch -p0 < ${DIR_TO_INSTALL}/minsoc/rtl/verilog/adv_debug_sys/Patches/OR1200v1/or1200v1_hwbkpt.patch
-patch -p0 < ${SCRIPT_DIR}/or1200v1_hwbkpt.patch
-
-
-#Precompiling firmwares
-cecho "\nPrecompiling delivered firmwares";
-execcmd "cd ${DIR_TO_INSTALL}/minsoc/sw/utils"
-execcmd "Make utils" "make"
-
-execcmd "cd ${DIR_TO_INSTALL}/minsoc/sw/support"
-execcmd "Make support tools" "make"
-
-execcmd "cd ${DIR_TO_INSTALL}/minsoc/sw/drivers"
-execcmd "Make drivers" "make"
-
-execcmd "cd ${DIR_TO_INSTALL}/minsoc/sw/uart"
-execcmd "Make UART" "make"
Index: setup/minsoc-install.sh
===================================================================
--- setup/minsoc-install.sh (revision 141)
+++ setup/minsoc-install.sh (revision 135)
@@ -1,17 +1,34 @@
#!/bin/bash
-# Author: Constantinos Xanthopoulos & Raul Fajardo
+# Author: Constantinos Xanthopoulos
# This script install MinSOC tree
# under a specific directory.
# ===== CONFIGURATIONS =====
# ==========================
-MINSOC_SVN_URL=http://opencores.org/ocsvn/minsoc/minsoc/trunk
-export SCRIPT_DIR="$( cd -P "$( dirname "$0" )" && pwd )"
-export DIR_TO_INSTALL=`pwd`
+# Where should I put the dir. minsoc?
+# ex. /home/conx/Thesis/
+DIR_TO_INSTALL=`pwd`
+
+# This variable should be set to trunk
+# or to stable.
+VERSION=""
+
+# This variable should take one of
+# the following values depending
+# to your system: linux, cygwin, freebsd
+ENV=""
+
+# !!! DO NOT EDIT BELLOW THIS LINE !!!
+# ===================================
+
+# ===== SCRIPT ======
+# ===================
+
+
# Debug ?
export DEBUG=0;
-. ${SCRIPT_DIR}/beautify.sh
+. beautify.sh
function testtool
{
@@ -85,12 +102,7 @@
if [ ! -d ${DIR_TO_INSTALL} ]
then
- cecho "Directory ${DIR_TO_INSTALL} doesn't exist."
- execcmd "Creating directory ${DIR_TO_INSTALL}" "mkdir -p ${DIR_TO_INSTALL}"
- if [ $? -ne 0 ]
- then
- errormsg "Connot create ${DIR_TO_INSTALL}";
- fi
+ errormsg "Directory doesn't exist. Please create it";
fi;
@@ -105,7 +117,7 @@
cecho "\nDownloading packages"
cd ${DIR_TO_INSTALL}
cecho "Download MinSoC"
-svn co -q ${MINSOC_SVN_URL} minsoc #user need to input password, execcmd omits command output and should be this way
+svn co -q http://opencores.org/ocsvn/minsoc/minsoc/trunk/ minsoc #user need to input password, execcmd omits command output and should be this way
execcmd "cd ${DIR_TO_INSTALL}/download"
if [ "$ENV" == "Cygwin" ]
then
@@ -181,7 +193,7 @@
execcmd "cd build"
execcmd "../configure --target=or32-elf --disable-werror --prefix=$DIR_TO_INSTALL/tools"
execcmd "Compiling GDB" "make"
-make install 1>>${SCRIPT_DIR}/progress.log 2>>${SCRIPT_DIR}/error.log #avoid Fedora failing due to missing Makeinfo
+make install 1>>${DIR_TO_INSTALL}/progress.log 2>>${DIR_TO_INSTALL}/error.log #avoid Fedora failing due to missing Makeinfo
PATH=$PATH:${DIR_TO_INSTALL}/tools/bin
@@ -232,10 +244,39 @@
execcmd "make install"
-#Configuring MinSoC, Advanced Debug System and patching OpenRISC
-bash ${SCRIPT_DIR}/configure.sh
+#Configuring MinSoC
+cecho "\nConfiguring MinSoC"
+execcmd "cd ${DIR_TO_INSTALL}/minsoc/backend/std"
+execcmd "Configuring MinSoC as standard board (simulatable but not synthesizable)" "./configure"
+execcmd "cd ${DIR_TO_INSTALL}"
+#Configuring Advanced Debug System to work with MinSoC
+cecho "\nConfiguring Advanced Debug System to work with MinSoC"
+execcmd "cd ${DIR_TO_INSTALL}/minsoc/rtl/verilog/adv_debug_sys/Hardware/adv_dbg_if/rtl/verilog"
+sed "s%\`define DBG_JSP_SUPPORTED%//\`define DBG_JSP_SUPPORTED%" adbg_defines.v > TMPFILE && mv TMPFILE adbg_defines.v
+
+#Compiling and moving adv_jtag_bridge debug modules for simulation
+execcmd "cd ${DIR_TO_INSTALL}/minsoc/rtl/verilog/adv_debug_sys/Software/adv_jtag_bridge/sim_lib/icarus"
+execcmd "make"
+execcmd "cp jp-io-vpi.vpi ${DIR_TO_INSTALL}/minsoc/bench/verilog/vpi"
+
+
+#Precompiling firmwares
+cecho "\nPrecompiling delivered firmwares";
+execcmd "cd ${DIR_TO_INSTALL}/minsoc/sw/utils"
+execcmd "Make utils" "make"
+
+execcmd "cd ${DIR_TO_INSTALL}/minsoc/sw/support"
+execcmd "Make support tools" "make"
+
+execcmd "cd ${DIR_TO_INSTALL}/minsoc/sw/drivers"
+execcmd "Make drivers" "make"
+
+execcmd "cd ${DIR_TO_INSTALL}/minsoc/sw/uart"
+execcmd "Make UART" "make"
+
+
#Setting-up new variables
cecho "\nSystem configurations"
execcmd "Adding MinSoC tools to PATH" "echo \"PATH=\\\$PATH:$DIR_TO_INSTALL/tools/bin\" >> /home/$(whoami)/.bashrc;";
/setup/beautify.sh
5,19 → 5,19
function cecho |
{ |
echo -e "\033[1m\033[33m$1\033[0m" |
echo -e "\033[1m\033[33m$1\033[0m" >> ${SCRIPT_DIR}/progress.log |
echo -e "\033[1m\033[33m$1\033[0m" >> ${DIR_TO_INSTALL}/progress.log |
} |
|
function cnecho |
{ |
echo -e -n "\033[0m\033[33m$1\033[0m" |
echo -e -n "\033[0m\033[33m$1\033[0m" >> ${SCRIPT_DIR}/progress.log |
echo -e -n "\033[0m\033[33m$1\033[0m" >> ${DIR_TO_INSTALL}/progress.log |
} |
|
function errormsg |
{ |
echo -e "\033[1m\033[31mError: $1\033[0m\n"; |
echo -e "\033[1m\033[31mError: $1\033[0m\n" >> ${SCRIPT_DIR}/error.log |
echo -e "\033[1m\033[31mError: $1\033[0m\n" >> ${DIR_TO_INSTALL}/error.log |
exit 1; |
} |
|
24,7 → 24,7
function _execcmd |
{ |
# Print Message |
echo -e "\033[35m$1...\033[0m\n" >> ${SCRIPT_DIR}/progress.log |
echo -e "\033[35m$1...\033[0m\n" >> ${DIR_TO_INSTALL}/progress.log |
if [ -n "$1" ] |
then |
echo -e -n "\033[35m$1...\033[0m" |
32,7 → 32,7
# Execute command |
if [ $DEBUG -ne 1 ]; |
then |
eval $2 1>>${SCRIPT_DIR}/progress.log 2>>${SCRIPT_DIR}/error.log; |
eval $2 1>>${DIR_TO_INSTALL}/progress.log 2>>${DIR_TO_INSTALL}/error.log; |
fi; |
# Check Execution |
if [ $? -eq 0 ] |
40,7 → 40,7
if [ -n "$1" ] |
then |
echo -e "\033[32mcomplete\033[0m"; |
echo -e "\033[32mcomplete\033[0m" >> ${SCRIPT_DIR}/progress.log |
echo -e "\033[32mcomplete\033[0m" >> ${DIR_TO_INSTALL}/progress.log |
fi |
else |
errormsg "Command: $2 Description: $1"; |
setup/required-cygwin-tools.txt
Property changes :
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property