Introduce OSVVM dependency as submodule

5bc55a5a · Dimitris Lampridis · ddb03954 · 5bc55a5a · 5bc55a5a · 5bc55a5a
Commit 5bc55a5a authored Jan 16, 2023 by Dimitris Lampridis
7 changed files
--- a/.gitmodules
+++ b/.gitmodules
+[submodule "testbench/osvvm/upstream"]
+	path = testbench/osvvm/upstream
+	url = https://github.com/OSVVM/OSVVM.git
--- a/testbench/axi/axi4lite32_axi4full64_bridge/Manifest.py
+++ b/testbench/axi/axi4lite32_axi4full64_bridge/Manifest.py
 action="simulation"
 sim_tool="ghdl"
 target="generic"
-ghdl_opt="--std=08 -frelaxed-rules"
+ghdl_opt="--std=08 -frelaxed-rules -Wno-hide"
 sim_top="tb_axi4lite32_axi4full64_bridge"

 files="tb_axi4lite32_axi4full64_bridge.vhd"

 modules={"local" : ["../../../",
+                    "../../osvvm/",
                    "../../../modules/wishbone",
                    "../../../modules/axi"]}

--- a/testbench/axi/axi4lite_axi4full_bridge/Manifest.py
+++ b/testbench/axi/axi4lite_axi4full_bridge/Manifest.py
 action  ="simulation"
 sim_tool="ghdl"
 target  ="generic"
-ghdl_opt="--std=08 -frelaxed-rules"
+ghdl_opt="--std=08 -frelaxed-rules -Wno-hide"
 sim_top ="tb_axi4lite_axi4full_bridge"

 files ="tb_axi4lite_axi4full_bridge.vhd"

-modules = {"local" : ["../../../",]}
+modules = {"local" : ["../../../",
+                    "../../osvvm/",
+                      ]}

--- a/testbench/axi/axi4lite_wb_bridge/Manifest.py
+++ b/testbench/axi/axi4lite_wb_bridge/Manifest.py
 action="simulation"
 sim_tool="ghdl"
 target="generic"
-ghdl_opt="--std=08 -frelaxed-rules"
+ghdl_opt="--std=08 -frelaxed-rules -Wno-hide"
 sim_top="tb_xaxi4lite_wb_bridge"

 files="tb_xaxi4lite_wb_bridge.vhd"
+
 modules={"local" : ["../../../",
+                    "../../osvvm/",
                    "../../../modules/wishbone",
                    "../../../modules/axi"]}

--- a/testbench/axi/z7_axi_gpio_expander/Manifest.py
+++ b/testbench/axi/z7_axi_gpio_expander/Manifest.py
 target     = "xilinx"
 action     = "simulation"
-sim_tool   = "ghdl" #"modelsim"
+sim_tool   = "ghdl"
 top_module = "sim_top_ps_gpio"
 syn_device = "XC7Z010"
-# This can be deleted when GHDL not used
-ghdl_opt = "--std=08 -frelaxed-rules"
+ghdl_opt = "--std=08 -frelaxed-rules -Wno-hide"

 files = [ "gpio_axi.vhd", "sim_top_ps_gpio.vhd" ]

-modules = { "local" : ["../../../"] }
+modules = { "local" : ["../../../",
+                       "../../osvvm/"] }

--- a/testbench/osvvm/Manifest.py
+++ b/testbench/osvvm/Manifest.py
+library="osvvm"
+
+files = [
+    "upstream/AlertLogPkg.vhd",
+    "upstream/CoveragePkg.vhd",
+    "upstream/MemoryGenericPkg.vhd",
+    "upstream/MemoryPkg.vhd",
+    "upstream/MemorySupportPkg.vhd",
+    "upstream/MessageListPkg.vhd",
+    "upstream/MessagePkg.vhd",
+    "upstream/NamePkg.vhd",
+    "upstream/NameStorePkg.vhd",
+    "upstream/OsvvmContext.vhd",
+    "upstream/OsvvmGlobalPkg.vhd",
+    "upstream/OsvvmTypesPkg.vhd",
+    "upstream/RandomBasePkg.vhd",
+    "upstream/RandomPkg.vhd",
+    "upstream/RandomProcedurePkg.vhd",
+    "upstream/ReportPkg.vhd",
+    "upstream/ResizePkg.vhd",
+    "upstream/ResolutionPkg.vhd",
+    "upstream/ScoreboardGenericPkg.vhd",
+    "upstream/ScoreboardPkg_int.vhd",
+    "upstream/ScoreboardPkg_slv.vhd",
+    "upstream/SortListPkg_int.vhd",
+    "upstream/TbUtilPkg.vhd",
+    "upstream/TextUtilPkg.vhd",
+    "upstream/TranscriptPkg.vhd",
+    "upstream/VendorCovApiPkg.vhd",
+]
+
--- a/upstream @ 0bced010
+++ b/upstream @ 0bced010
+Subproject commit 0bced0107438a612b8656d5ae80a6d1a32f22b81