merged with master (#131)

Usercode improvment
Signed-off-by: Alexandre CASTELLANE <alexandre.castellane@fr.ibm.com>

Author: acastellane

hardware/setup/patch_version.sh

@@ -40,8 +40,7 @@ sed -i "s/$SRC/$DST/" $1/$2
 SRC="define USERCODE 64'h.*"
 # usercode should be less than 64 bit long
 #usercode=`echo 0123456789ABCDEF`
-usercode=`echo 0000000000000000`
-DST="define USERCODE 64'h${usercode}"
+DST="define USERCODE 64'h${USERCODE}"
 sed -i "s/$SRC/$DST/" $1/$2
 
 

hardware/setup/snap_build.tcl

@@ -100,7 +100,7 @@ if { $ila_debug == "TRUE" } {
 if { ($::env(REMOVE_TMP_FILES) == "TRUE") && ($impl_step == "ALL") } {
   puts [format "%-*s%-*s%-*s%-*s"  $widthCol1 "" $widthCol2 "removing temp files" $widthCol3 "" $widthCol4 "[clock format [clock seconds] -format {%T %a %b %d %Y}]"]
   #We intentionally keep the latest dcp generated  => opt_routed_design.dcp
-  exec rm -rf $dcp_dir/synth_design.dcp
+  if { $ila_debug != "TRUE" } {exec rm -rf $dcp_dir/synth_design.dcp}
   exec rm -rf $dcp_dir/opt_design.dcp
   exec rm -rf $dcp_dir/place_design.dcp
   exec rm -rf $dcp_dir/phys_opt_design.dcp

scripts/Kconfig

@@ -890,3 +890,14 @@ config FLASH_USED
 	default "TRUE"  if ENABLE_FLASH
 	default "FALSE" if ! ENABLE_FLASH
 
+config ENABLE_USERCODE
+        bool "Enable USER CODE (code will be requested to user later on)"
+        default n 
+        help
+          This allows user to define a user code associated to the FPGA content
+          For ex user want to create 2 configuration with 2 different VIVADO versions
+
+config USERCODE
+        string "USERCODE(max64bits)"
+        depends on ENABLE_USERCODE
+        default "0000000000000000"

snap_env

@@ -307,6 +307,11 @@ while [ -z "$SETUP_DONE" ]; do
       SETUP_INFO="$SETUP_INFO\n To simulate a design with EMAC, it is recommended to use xcelium simulator (license needed) or use the Ethernet Loop-back option."
   fi
 
+  # Note: USERCODE requested
+  if [ "$ENABLE_USERCODE" == "y" ]; then
+      echo "USERCODE          has been set to : $USERCODE";
+  fi
+
 
   ####### Print warning messages and create $snap_env_sh
   echo  -e "======================================================="