minor corrections (#133)

* minor corrections
* Update Kconfig
Signed-off-by: Alexandre CASTELLANE <alexandre.castellane@fr.ibm.com>

Author: acastellane

hardware/Makefile

@@ -390,13 +390,14 @@ else
 	@cd $(BUILD_DIR) && env IMPL_STEP=ALL vivado -quiet -mode batch -source $(SETUP_DIR)/snap_build.tcl -notrace -log $(LOGS_DIR)/snap_build.log -journal $(LOGS_DIR)/snap_build.jou
 	@$(RM) -r .bitstream_name.txt
 endif
-ifeq ($(ILA_DEBUG),TRUE)
-	@echo -e "Generating ltx file for ILA debug."
-	@cd $(BUILD_DIR) && vivado -mode batch -source $(SETUP_DIR)/gen_probe_ltx.tcl -notrace  -log $(LOGS_DIR)/gen_probe_ltx.log         -journal $(LOGS_DIR)/gen_probe_ltx.jou
-	@echo -e "Generation of ltx file done."
-	@mv $(BUILD_DIR)/probe.ltx $(BUILD_DIR)/Images
-	@echo -e "Moved ltx file into Image."
-endif
+# removed temporarily the following condition since ltx files already generated in snap_build.tcl
+#ifeq ($(ILA_DEBUG),TRUE)
+#	@echo -e "Generating ltx file for ILA debug."
+#	@cd $(BUILD_DIR) && vivado -mode batch -source $(SETUP_DIR)/gen_probe_ltx.tcl -notrace  -log $(LOGS_DIR)/gen_probe_ltx.log         -journal $(LOGS_DIR)/gen_probe_ltx.jou
+#	@echo -e "Generation of ltx file done."
+#	@mv $(BUILD_DIR)/probe.ltx $(BUILD_DIR)/Images
+#	@echo -e "Moved ltx file into Image."
+#endif
 	@echo -e "[BUILD IMAGE.........] done  `date +"%T %a %b %d %Y"`"
 
 allow_%:

hardware/setup/create_framework.tcl

@@ -372,6 +372,7 @@ if { $ila_debug == "TRUE" } {
     add_files -fileset constrs_1 -norecurse $::env(ILA_SETUP_FILE)
   } else {
     puts "                        ignore \$ILA_SETUP_FILE: not provided or doesn't exist."
+    puts "                         (using by default the extra.xdc file)"
   }
 
   # Way2: Instantiate ila cores

hardware/setup/patch_version.sh

@@ -36,13 +36,14 @@ SRC="define BUILD_DATE_DAT 64'h.*"
 DST="define BUILD_DATE_DAT 64'h0000_${SNAP_BUILD_DATE}"
 sed -i "s/$SRC/$DST/" $1/$2
 
-# Manually Patching with USERCODE
-SRC="define USERCODE 64'h.*"
-# usercode should be less than 64 bit long
-#usercode=`echo 0123456789ABCDEF`
-DST="define USERCODE 64'h${USERCODE}"
-sed -i "s/$SRC/$DST/" $1/$2
-
+# Manually Patching with USERCODE if required
+if [ -z $FPGACARD ]; then
+  SRC="define USERCODE 64'h.*"
+  # usercode should be less than 64 bit long
+  #usercode=`echo 0123456789ABCDEF`
+  DST="define USERCODE 64'h${USERCODE}"
+  sed -i "s/$SRC/$DST/" $1/$2
+fi
 
 #Patch card info and sdram_size
 # SDRAM_SIZE="2000" stand for 8GB of SDRAM - 0 for IBM but will be overwritten later by HBM_AXI_IF_NB

scripts/Kconfig

@@ -501,7 +501,7 @@ config ETHERNET_USED
 
 config ETHERNET_RX_FIFO_DEPTH
         int
-        prompt "Depth of receiving FIFO for Ethernet 100G MAC in 512-bit packates (must be power of 2)"
+        prompt "Depth of receiving FIFO for Ethernet 100G MAC in 512-bit packets (must be power of 2)"
         depends on ENABLE_ETHERNET
         default 8192