Skip to content
Snippets Groups Projects
Commit 2be2aef1 authored by Daniel van der Schuur's avatar Daniel van der Schuur
Browse files

-Re-committed working versions (Rev. 16485) of these files as they were broken

 in rev. 16486.
parent 58c7882f
No related branches found
No related tags found
No related merge requests found
......@@ -695,9 +695,9 @@ def expand_file_path_name(fpn, dir_path=''):
"""
filePathName = os.path.expandvars(fpn) # support using environment variables in the file path
if os.path.isabs(filePathName):
return filePathName.replace('\\','/') # use absolute path to file
return filePathName # use absolute path to file
else:
return os.path.join(dir_path, filePathName).replace('\\','/') # derive path to file from the directory path and a directory path to the file
return os.path.join(dir_path, filePathName) # derive path to file from the directory path and a directory path to the file
def remove_from_list_string(list_str, item_str, sep=' '):
"""Treat the string list_str as a list of items that are separated by sep and then
......
......@@ -159,7 +159,7 @@ class CommonDictFile:
paths = []
for root, _, files in os.walk(rootDir):
if self.fileName in files:
paths.append(root.replace('\\','/'))
paths.append(root)
return paths
def read_all_dict_files(self, filePathNames=None):
......
......@@ -405,7 +405,7 @@ class HdlConfig:
build_dirs = []
for lib_dict in cm.listify(lib_dicts):
lib_name = lib_dict['hdl_lib_name']
build_dirs.append(os.path.join(build_maindir, build_toolset_dir, build_tooldir, lib_name).replace('\\','/')) # central build main directory with subdirectory per library
build_dirs.append(os.path.join(build_maindir, build_toolset_dir, build_tooldir, lib_name)) # central build main directory with subdirectory per library
return cm.unlistify(build_dirs)
......
......@@ -21,7 +21,6 @@
###############################################################################
echo "Run quartus_generic.sh"
. ${RADIOHDL}/tools/quartus/generic.sh
# Derive generic Quartus tool version related paths from $QUARTUS_DIR that gets defined in quartus_version.sh
# Quartus, SOPC, Nios
......@@ -43,4 +42,4 @@ export ALTERA_HW_TCL_KEEP_TEMP_FILES=1
# User synthesis timestamp in FPGA image
export UNB_COMPILE_STAMPS=1
export RADIOHDL_SVN_REVISION=`svn info $(cygpath $RADIOHDL) | grep Revision`
export RADIOHDL_SVN_REVISION=`svn info ${RADIOHDL} | grep Revision`
......@@ -115,11 +115,11 @@ echo "Bitstream_compression=on" > ${HOME}/.run_rbf_temp_options_file
unb_info $0 "Converting ${quartusdir}/${project_rev}.sof to compressed Raw Binary File"
if [ -z "${arg_unb2_factory}" ]; then
unb_exec $0 quartus_cpf -c --option=$(<${HOME}/.run_rbf_temp_options_file) ${quartusdir}/${project_rev}.sof ${quartusdir}/${project_rev}.rbf
unb_exec $0 quartus_cpf -c --option=${HOME}/.run_rbf_temp_options_file ${quartusdir}/${project_rev}.sof ${quartusdir}/${project_rev}.rbf
else
unb_info $0 "-> This is a factory image for Uniboard2: Convert .SOF -> .POF -> .HEXOUT -> .RBF"
# for more info see: $RADIOHDL/libraries/io/epcs/doc/README.txt
unb_exec $0 quartus_cpf -d EPCQL1024 -m ASx4 --option=$(<${HOME}/.run_rbf_temp_options_file) -c ${quartusdir}/${project_rev}.sof ${quartusdir}/${project_rev}.pof
unb_exec $0 quartus_cpf -d EPCQL1024 -m ASx4 --option=${HOME}/.run_rbf_temp_options_file -c ${quartusdir}/${project_rev}.sof ${quartusdir}/${project_rev}.pof
unb_exec $0 quartus_cpf -c ${quartusdir}/${project_rev}.pof ${quartusdir}/${project_rev}.hexout
unb_exec $0 nios2-elf-objcopy -I ihex -O binary ${quartusdir}/${project_rev}.hexout ${quartusdir}/${project_rev}.rbf
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment