[dv] reorg flash_ctrl bind & add CSR asserts
Signed-off-by: Srikrishna Iyer <sriyer@google.com>
diff --git a/hw/ip/flash_ctrl/dv/flash_ctrl_sim.core b/hw/ip/flash_ctrl/dv/flash_ctrl_sim.core
index 01d044e..dc2f017 100644
--- a/hw/ip/flash_ctrl/dv/flash_ctrl_sim.core
+++ b/hw/ip/flash_ctrl/dv/flash_ctrl_sim.core
@@ -13,12 +13,12 @@
- lowrisc:ip:flash_ctrl:0.1
files:
- tb/flash_ctrl_wrapper.sv
- - tb/flash_ctrl_bind.sv
file_type: systemVerilogSource
files_dv:
depend:
- lowrisc:dv:flash_ctrl_test
+ - lowrisc:dv:flash_ctrl_sva
files:
- tb/tb.sv
file_type: systemVerilogSource
diff --git a/hw/ip/flash_ctrl/dv/sva/flash_ctrl_bind.sv b/hw/ip/flash_ctrl/dv/sva/flash_ctrl_bind.sv
new file mode 100644
index 0000000..0f59ecf
--- /dev/null
+++ b/hw/ip/flash_ctrl/dv/sva/flash_ctrl_bind.sv
@@ -0,0 +1,26 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+
+module flash_ctrl_bind;
+
+ bind flash_ctrl tlul_assert #(
+ .EndpointType("Device")
+ ) tlul_assert_device (
+ .clk_i,
+ .rst_ni,
+ .h2d (tl_i),
+ .d2h (tl_o)
+ );
+
+ // import flash_ctrl_reg_pkg::*;
+ // bind flash_ctrl flash_ctrl_csr_assert_fpv flash_ctrl_csr_assert (
+ // .clk_i,
+ // .rst_ni,
+ // .h2d (tl_i),
+ // .d2h (tl_o),
+ // .reg2hw (reg2hw),
+ // .hw2reg (hw2reg)
+ // );
+
+endmodule
diff --git a/hw/ip/flash_ctrl/dv/sva/flash_ctrl_sva.core b/hw/ip/flash_ctrl/dv/sva/flash_ctrl_sva.core
new file mode 100644
index 0000000..63a52a4
--- /dev/null
+++ b/hw/ip/flash_ctrl/dv/sva/flash_ctrl_sva.core
@@ -0,0 +1,28 @@
+CAPI=2:
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+name: "lowrisc:dv:flash_ctrl_sva:0.1"
+description: "FLASH_CTRL assertion modules and bind file."
+filesets:
+ files_dv:
+ depend:
+ - lowrisc:tlul:headers
+ - lowrisc:fpv:csr_assert_gen
+ files:
+ - flash_ctrl_bind.sv
+ file_type: systemVerilogSource
+
+generate:
+ csr_assert_gen:
+ generator: csr_assert_gen
+ parameters:
+ spec: ../../data/flash_ctrl.hjson
+ depend: lowrisc:ip:flash_ctrl
+
+targets:
+ default:
+ filesets:
+ - files_dv
+ generate:
+ - csr_assert_gen
diff --git a/hw/ip/flash_ctrl/dv/tb/flash_ctrl_bind.sv b/hw/ip/flash_ctrl/dv/tb/flash_ctrl_bind.sv
deleted file mode 100644
index 2482c04..0000000
--- a/hw/ip/flash_ctrl/dv/tb/flash_ctrl_bind.sv
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-
-module flash_ctrl_bind;
-
- bind flash_ctrl tlul_assert #(
- .EndpointType("Device")
- ) tlul_assert_device (
- .clk_i,
- .rst_ni,
- .h2d (tl_i),
- .d2h (tl_o)
- );
-
-endmodule
