General updates:

- Added/Updated licensce headers - Updated testbench depndencies - Updated class hierarchy Signed-off-by: Istvan-Zsolt Szekely <[email protected]>
analogdevicesinc · Feb 4, 2025 · 695567d · 695567d
1 parent 6f11b38
commit 695567d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/testbenches/ip/spi_engine/waves/cfg10.wcfg b/testbenches/ip/spi_engine/waves/cfg10.wcfg
@@ -12,7 +12,7 @@
             <top_module name="ipif_pkg" />
             <top_module name="logger_pkg" />
             <top_module name="m_axi_sequencer_pkg" />
-            <top_module name="reg_accessor_pkg" />
+
             <top_module name="s_axi_sequencer_pkg" />
             <top_module name="std" />
             <top_module name="system_tb" />

diff --git a/testbenches/ip/util_axis_fifo_asym/tests/test_program.sv b/testbenches/ip/util_axis_fifo_asym/tests/test_program.sv
@@ -32,19 +32,10 @@
 //
 // ***************************************************************************
 // ***************************************************************************
-<<<<<<< HEAD
 
 `include "utils.svh"
 `include "axis_definitions.svh"
 
-=======
-//
-//
-//
-`include "utils.svh"
-`include "axis_definitions.svh"
-
->>>>>>> cc748dc (util_axis_fifo_asym: Updated after rebase)
 import logger_pkg::*;
 import test_harness_env_pkg::*;
 import environment_pkg::*;