Merge pull request #548 from trabucayre/symbiflow_write_xxx

Symbiflow write xxx
QuickLogic-Corp · Oct 20, 2021 · ec22e1c · ec22e1c
2 parents 9645d3e + 8fba881
commit ec22e1c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/quicklogic/common/toolchain_wrappers/ql_symbiflow b/quicklogic/common/toolchain_wrappers/ql_symbiflow
@@ -339,7 +339,6 @@ fi
 
 export PCF_FILE=$PCF
 export JSON=$JSON
-export TOP_F=$TOP
 export PINMAP_FILE=$PINMAPCSV
 export MAX_CRITICALITY=$MAX_CRITICALITY
 ##### Create Makefile #####
@@ -494,17 +493,17 @@ fi
 # EOS-S3 specific targets
 if [ "$DEVICE" == "ql-eos-s3" ]; then
     echo -e "\
-\${BUILDDIR}/\${TOP}_bit.h: \${BUILDDIR}/\${TOP}.bit\n\
-	cd \${BUILDDIR} && symbiflow_write_bitheader -b \${TOP}.bit >> $LOG_FILE 2>&1\n\
+\${TOP}_bit.h: \${BUILDDIR}/\${TOP}.bit\n\
+	symbiflow_write_bitheader \$^ \$@ >> $LOG_FILE 2>&1\n\
 \n\
 \${BUILDDIR}/\${TOP}.bin: \${BUILDDIR}/\${TOP}.bit\n\
 	cd \${BUILDDIR} && symbiflow_write_binary -b \${TOP}.bit >> $LOG_FILE 2>&1\n\
 \n\
-\${BUILDDIR}/\${TOP}.jlink: \${BUILDDIR}/\${TOP}.bit\n\
-	cd \${BUILDDIR} && symbiflow_write_jlink -f \${TOP}.fasm -P \${PACKAGENAME} -b \${TOP}.bit >> $LOG_FILE 2>&1\n\
+\${TOP}.jlink: \${BUILDDIR}/\${TOP}.bit\n\
+	symbiflow_write_jlink \$^ \$@ >> $LOG_FILE 2>&1\n\
 \n\
-\${BUILDDIR}/\${TOP}.openocd: \${BUILDDIR}/\${TOP}.bit\n\
-	cd \${BUILDDIR} && symbiflow_write_openocd -f \${TOP}.fasm -P \${PACKAGENAME} -b \${TOP}.bit >> $LOG_FILE 2>&1\n\
+\${TOP}.openocd: \${BUILDDIR}/\${TOP}.bit\n\
+	symbiflow_write_openocd \$^ \$@ >> $LOG_FILE 2>&1\n\
 \n\
 \${BUILDDIR}/\${TOP}_jlink.h: \${BUILDDIR}/\${TOP}.jlink >> $LOG_FILE 2>&1\n\
 	cd \${BUILDDIR} && symbiflow_write_jlinkheader\n\

diff --git a/quicklogic/common/toolchain_wrappers/symbiflow_write_bitheader b/quicklogic/common/toolchain_wrappers/symbiflow_write_bitheader
@@ -6,7 +6,7 @@ MYPATH=$(dirname "$(readlink -f "$BASH_SOURCE")")
 
 source ${MYPATH}/env
 
-JLINK2HEADER=`readlink -f ${MYPATH}/../bin/python/bitstream_to_header.py`
+BIT2HEADER=`readlink -f ${MYPATH}/../bin/python/bitstream_to_header.py`
 
 
-python3 ${JLINK2HEADER} ${TOP_F}.bit ../${TOP_F}_bit.h
+python3 ${BIT2HEADER} $@
diff --git a/quicklogic/common/toolchain_wrappers/symbiflow_write_jlink b/quicklogic/common/toolchain_wrappers/symbiflow_write_jlink
@@ -9,4 +9,4 @@ source ${MYPATH}/env
 BIT2JLINK=`readlink -f ${MYPATH}/../bin/python/bitstream_to_jlink.py`
 
 echo "Generating bit.jlink"
-python3 ${BIT2JLINK} ${TOP_F}.bit ../${TOP_F}.jlink
+python3 ${BIT2JLINK} $@
diff --git a/quicklogic/common/toolchain_wrappers/symbiflow_write_openocd b/quicklogic/common/toolchain_wrappers/symbiflow_write_openocd
@@ -9,4 +9,4 @@ source ${MYPATH}/env
 BIT2OPENOCD=`readlink -f ${MYPATH}/../bin/python/bitstream_to_openocd.py`
 
 echo "Generating bit.openocd"
-python3 ${BIT2OPENOCD} ${TOP_F}.bit ../${TOP_F}.openocd
+python3 ${BIT2OPENOCD} $@