diff --git a/tools/modelsim/set_modelsim b/tools/modelsim/set_modelsim index e480d066d5ea970fbdc621552fab2bac7a8c94ac..1af0d22e272f31e755e14e04f2d29853c899922d 100755 --- a/tools/modelsim/set_modelsim +++ b/tools/modelsim/set_modelsim @@ -37,10 +37,13 @@ if [ "${TOOLSET}" = "unb1" ]; then . ${RADIOHDL}/tools/quartus/quartus_version.sh 11.1 . ${RADIOHDL}/tools/modelsim/modelsim_version.sh 6.6c elif [ "${TOOLSET}" = "unb2" ]; then - #. ${RADIOHDL}/tools/quartus/quartus_version.sh 13.1 . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.1 . ${RADIOHDL}/tools/modelsim/modelsim_version.sh 10.4 export LD_PRELOAD=/home/software/freetype2/usr/lib/libfreetype.so +elif [ "${TOOLSET}" = "unb233" ]; then + # unb233 = toolset unb2 on dop233 + . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.1 + . ${RADIOHDL}/tools/modelsim/modelsim_version.sh 10.2c else echo "error: unknown tool setting: ${TOOLSET} (choose 'unb1' or 'unb2')" exit 1 diff --git a/tools/quartus/run_altera_simlib_comp b/tools/quartus/run_altera_simlib_comp index 1f7dde5d2b96d0182d5c9a962751295170f0e665..e07c5475fce5c410dabd16c8c188f7110c014347 100755 --- a/tools/quartus/run_altera_simlib_comp +++ b/tools/quartus/run_altera_simlib_comp @@ -31,51 +31,52 @@ # Another advantage of using this script is that it can be kept in SVN and that it avoids having to explain how to do it manually # via the GUI. # Usage: -# Assume $MODEL_TECH_ALTERA_LIB=/home/software/modelsim_altera_libs/14.0a10 +# Assume $MODEL_TECH_ALTERA_LIB=/home/software/modelsim_altera_libs/14.1 # # First run the script in some user directory that where $RADIOHDL is known. Use the output directory that will fit the # $MODEL_TECH_ALTERA_LIB that is defined in quartus_version.sh in set_quartus. # The FPGA device family library needs to be compiled separately. To compile the vhdl and verilog for the arria10 library for the # unb2 tool settings defined in set_quartus and set_modelsim do: # -# > run_altera_simlib_comp unb2 14.0a10 arria10 +# > run_altera_simlib_comp unb2 14.1 stratixiv +# > run_altera_simlib_comp unb2 14.1 arria10 # # Then use 'sudo' to move the directory to the protected central project directory that is set by $MODEL_TECH_ALTERA_LIB. # -# > sudo mv 14.0a10 /home/software/modelsim_altera_libs +# > sudo mv 14.1 /home/software/modelsim_altera_libs # # 1) General tool and project settings # - use '. <script>.sh' to have the settings apply in this shell, otherwise they get lost when <script>.sh returns -# Tool settings for selected target "", "unb1", or "unb2" (where "" defaults to target "unb1") -TARGET=${1:-} -if [ "${TARGET}" = "" ]; then - unb_error $0 "Please specify all arguments\nUsage: $0 <tool target> <compilation output directory> <FPGA device family>" +# Tool settings for selected target "", "unb1", or "unb2" (where "" defaults to "unb1") +TOOLSET=${1:-} +if [ "${TOOLSET}" = "" ]; then + unb_error $0 "Please specify all arguments\nUsage: $0 <toolset> <compilation output directory> <FPGA device family>" fi # Select output directory for the library compilation results OUTPUT_DIR=${2:-} if [ "${OUTPUT_DIR}" = "" ]; then - unb_error $0 "Please specify all arguments\nUsage: $0 <tool target> <compilation output directory> <FPGA device family>" + unb_error $0 "Please specify all arguments\nUsage: $0 <toolset> <compilation output directory> <FPGA device family>" fi # Select FPGA device family for the library compilation FAMILY=${3:-} if [ "${FAMILY}" = "" ]; then - unb_error $0 "Please specify all arguments\nUsage: $0 <tool target> <compilation output directory> <FPGA device family>" + unb_error $0 "Please specify all arguments\nUsage: $0 <toolset> <compilation output directory> <FPGA device family>" fi echo "" echo "Create Altera libraries for simulation with the following settings:" -echo " - Tool target : ${TARGET}" +echo " - Toolset target : ${TOOLSET}" echo " - Output directory : ${OUTPUT_DIR}" echo " - FPGA device family: ${FAMILY}" echo "" # Tool settings for selected target -. ${RADIOHDL}/tools/quartus/set_quartus ${TARGET} -. ${RADIOHDL}/tools/modelsim/set_modelsim ${TARGET} +. ${RADIOHDL}/tools/quartus/set_quartus ${TOOLSET} +. ${RADIOHDL}/tools/modelsim/set_modelsim ${TOOLSET} # 2) Create Modelsim .do file for compiling the Altera simulation libraries @@ -123,7 +124,7 @@ mv ../${FAMILY}_vhdl.log . # # file.txt = the file name -if [ "${TARGET}" = "unb2" ]; then +if [ "${TOOLSET}" != "unb1" ]; then sed -i 's/vlib/vlib -type directory/g' ${FAMILY}_verilog.do sed -i 's/vlib/vlib -type directory/g' ${FAMILY}_vhdl.do fi diff --git a/tools/quartus/set_quartus b/tools/quartus/set_quartus index 8dc1f4ed318c59d9cfcc45db66ad710c9b18ff25..40b16646fca2a62ee34b24503b9046905cb3cb08 100755 --- a/tools/quartus/set_quartus +++ b/tools/quartus/set_quartus @@ -37,6 +37,9 @@ if [ "${TOOLSET}" = "unb1" ]; then . ${RADIOHDL}/tools/quartus/quartus_version.sh 11.1 elif [ "${TOOLSET}" = "unb2" ]; then . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.1 +elif [ "${TOOLSET}" = "unb233" ]; then + # unb233 = toolset unb2 on dop233 + . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.1 else echo "error: unknown tool setting: ${TOOLSET} (choose 'unb1' or 'unb2')" exit 1