commit a157999d95639ff0436c553b30531d7172f0f5d3
author Michael Schaffner <msf@opentitan.org> Fri Dec 06 17:49:07 2019 -0800
committer Michael Schaffner <msf@google.com> Tue Dec 17 10:28:06 2019 -0800
tree fa777e23fc365d4fcda16d48ca3ca16af2a8b622
parent 90e142a944a5bb0428156b830b7887b79b5a6481

[fpvgen/autogen] Output FPV assertions to vip folder, update templates

Signed-off-by: Michael Schaffner <msf@opentitan.org>

hw/Makefile

diff --git a/hw/Makefile b/hw/Makefile
index 921358f..c51cb3f 100644
--- a/hw/Makefile
+++ b/hw/Makefile
@@ -55,14 +55,14 @@
 	mkdir -p ${REG_OUTPUT_DIR}
 	mkdir -p ${REG_OUTPUT_DV_DIR}
 	mkdir -p ${REG_OUTPUT_SW_DIR}
-	mkdir -p ${REG_OUTPUT_FPV_CSR_DIR}
 
 $(ips_reg): pre_reg
 	if [ -f ${PRJ_DIR}/hw/ip/$(subst _reg,,$@)/$(dir_hjson)/$(subst _reg,,$@).hjson ]; then \
 		${PRJ_DIR}/util/regtool.py -r ${PRJ_DIR}/hw/ip/$(subst _reg,,$@)/$(dir_hjson)/$(subst _reg,,$@).hjson; \
 		${PRJ_DIR}/util/regtool.py -s -t ${REG_OUTPUT_DV_DIR} \
 		  ${PRJ_DIR}/hw/ip/$(subst _reg,,$@)/$(dir_hjson)/$(subst _reg,,$@).hjson; \
-		${PRJ_DIR}/util/regtool.py -f -t ${REG_OUTPUT_FPV_CSR_DIR} \
+		mkdir -p ${PRJ_DIR}/hw/ip/$(subst _reg,,$@)/fpv/vip; \
+		${PRJ_DIR}/util/regtool.py -f -t ${PRJ_DIR}/hw/ip/$(subst _reg,,$@)/fpv/vip/ \
 		  ${PRJ_DIR}/hw/ip/$(subst _reg,,$@)/$(dir_hjson)/$(subst _reg,,$@).hjson; \
 	fi
 

util/fpvgen/bind_fpv.sv.tpl

diff --git a/util/fpvgen/bind_fpv.sv.tpl b/util/fpvgen/bind_fpv.sv.tpl
index d5ffdb4..6d098fb 100644
--- a/util/fpvgen/bind_fpv.sv.tpl
+++ b/util/fpvgen/bind_fpv.sv.tpl
@@ -28,7 +28,8 @@
     .clk_i,
     .rst_ni,
     .h2d  (tl_i),
-    .d2h  (tl_o)
+    .d2h  (tl_o),
+    .*
   );
 
   bind ${dut.name} ${dut.name}_csr_assert_fpv i_${dut.name}_csr_assert_fpv (