From ed31f968445d6fdda69076503f3af3ae8fb4eb15 Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Mon, 8 Jan 2018 15:42:06 +0000
Subject: [PATCH] Declared mm_file component in mm_file_pkg.vhd to avoid having
 to do it in each tb or mmm file.

---
 .../unb1_ddr3/src/vhdl/mmm_unb1_ddr3.vhd       | 18 ------------------
 .../src/vhdl/mmm_unb1_ddr3_reorder.vhd         | 18 ------------------
 .../src/vhdl/mmm_unb1_ddr3_transpose.vhd       | 18 ------------------
 .../src/vhdl/mmm_unb1_fn_terminal_db.vhd       | 18 ------------------
 .../tb/vhdl/tb_unb1_fn_terminal_db.vhd         | 17 -----------------
 .../unb1_heater/src/vhdl/mmm_unb1_heater.vhd   | 18 ------------------
 .../mmm_unb1_minimal_qsys_wo_pll.vhd           | 18 ------------------
 .../unb1_minimal/src/vhdl/mmm_unb1_minimal.vhd | 18 ------------------
 .../src/vhdl/mmm_unb1_terminal_bg_mesh_db.vhd  | 15 ---------------
 .../unb1_test/src/vhdl/mmm_unb1_test.vhd       | 17 -----------------
 10 files changed, 175 deletions(-)

diff --git a/boards/uniboard1/designs/unb1_ddr3/src/vhdl/mmm_unb1_ddr3.vhd b/boards/uniboard1/designs/unb1_ddr3/src/vhdl/mmm_unb1_ddr3.vhd
index f375d1057d..580cbfe024 100644
--- a/boards/uniboard1/designs/unb1_ddr3/src/vhdl/mmm_unb1_ddr3.vhd
+++ b/boards/uniboard1/designs/unb1_ddr3/src/vhdl/mmm_unb1_ddr3.vhd
@@ -140,24 +140,6 @@ ARCHITECTURE str OF mmm_unb1_ddr3 IS
   SIGNAL i_tse_clk       : STD_LOGIC := '1';
   SIGNAL i_cal_clk       : STD_LOGIC := '1';
 
-  ----------------------------------------------------------------------------
-  -- mm_file component
-  ----------------------------------------------------------------------------
-  COMPONENT mm_file
-  GENERIC(
-    g_file_prefix       : STRING;
-    g_mm_clk_period     : TIME := c_mm_clk_period;
-    g_update_on_change  : BOOLEAN := FALSE;
-    g_mm_rd_latency     : NATURAL := 1
-  );
-  PORT (
-    mm_rst        : IN  STD_LOGIC;
-    mm_clk        : IN  STD_LOGIC;
-    mm_master_out : OUT t_mem_mosi;
-    mm_master_in  : IN  t_mem_miso 
-  );
-  END COMPONENT;
-
   CONSTANT c_dut_src_mac       : STD_LOGIC_VECTOR(c_network_eth_mac_slv'RANGE) := X"002286080001";
   SIGNAL eth_psc_access        : STD_LOGIC;
 
diff --git a/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/mmm_unb1_ddr3_reorder.vhd b/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/mmm_unb1_ddr3_reorder.vhd
index a2c70e43a2..bc69bb0c49 100644
--- a/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/mmm_unb1_ddr3_reorder.vhd
+++ b/boards/uniboard1/designs/unb1_ddr3_reorder/src/vhdl/mmm_unb1_ddr3_reorder.vhd
@@ -150,24 +150,6 @@ ARCHITECTURE str OF mmm_unb1_ddr3_reorder IS
   SIGNAL i_tse_clk                   : STD_LOGIC := '1';
   SIGNAL i_cal_clk                   : STD_LOGIC := '1';
 
-  ----------------------------------------------------------------------------
-  -- mm_file component
-  ----------------------------------------------------------------------------
-  COMPONENT mm_file
-  GENERIC(
-    g_file_prefix       : STRING;
-    g_mm_clk_period     : TIME := c_mm_clk_period;
-    g_update_on_change  : BOOLEAN := FALSE;
-    g_mm_rd_latency     : NATURAL := 1
-  );
-  PORT (
-    mm_rst        : IN  STD_LOGIC;
-    mm_clk        : IN  STD_LOGIC;
-    mm_master_out : OUT t_mem_mosi;
-    mm_master_in  : IN  t_mem_miso 
-  );
-  END COMPONENT;               
-
   CONSTANT c_dut_control_rx_en : NATURAL := 2**c_eth_mm_reg_control_bi.rx_en;
 
   SIGNAL i_eth1g_reg_mosi      : t_mem_mosi;
diff --git a/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/mmm_unb1_ddr3_transpose.vhd b/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/mmm_unb1_ddr3_transpose.vhd
index 28b71acba3..b7a80e485d 100644
--- a/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/mmm_unb1_ddr3_transpose.vhd
+++ b/boards/uniboard1/designs/unb1_ddr3_transpose/src/vhdl/mmm_unb1_ddr3_transpose.vhd
@@ -128,24 +128,6 @@ ARCHITECTURE str OF mmm_unb_ddr3_transpose IS
 
   SIGNAL i_mm_clk : STD_LOGIC := '1';
 
-  ----------------------------------------------------------------------------
-  -- mm_file component
-  ----------------------------------------------------------------------------
-  COMPONENT mm_file
-  GENERIC(
-    g_file_prefix       : STRING;
-    g_mm_clk_period     : TIME := c_mm_clk_period;
-    g_update_on_change  : BOOLEAN := FALSE;
-    g_mm_rd_latency     : NATURAL := 1
-  );
-  PORT (
-    mm_rst        : IN  STD_LOGIC;
-    mm_clk        : IN  STD_LOGIC;
-    mm_master_out : OUT t_mem_mosi;
-    mm_master_in  : IN  t_mem_miso 
-  );
-  END COMPONENT;
-
 BEGIN
 
   mm_clk <= i_mm_clk;
diff --git a/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/mmm_unb1_fn_terminal_db.vhd b/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/mmm_unb1_fn_terminal_db.vhd
index 76ebefd9d4..8d90ce298d 100644
--- a/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/mmm_unb1_fn_terminal_db.vhd
+++ b/boards/uniboard1/designs/unb1_fn_terminal_db/src/vhdl/mmm_unb1_fn_terminal_db.vhd
@@ -118,24 +118,6 @@ ARCHITECTURE str OF mmm_unb1_fn_terminal_db IS
   SIGNAL i_mm_clk  : STD_LOGIC := '1';
   SIGNAL i_tse_clk : STD_LOGIC := '1';
   
-  ----------------------------------------------------------------------------
-  -- mm_file component
-  ----------------------------------------------------------------------------
-  COMPONENT mm_file
-  GENERIC(
-    g_file_prefix       : STRING;
-    g_mm_clk_period     : TIME := c_mm_clk_period;
-    g_update_on_change  : BOOLEAN := FALSE;
-    g_mm_rd_latency     : NATURAL := 1
-  );
-  PORT (
-    mm_rst        : IN  STD_LOGIC;
-    mm_clk        : IN  STD_LOGIC;
-    mm_master_out : OUT t_mem_mosi;
-    mm_master_in  : IN  t_mem_miso 
-  );
-  END COMPONENT;               
-
   CONSTANT c_dut_src_mac           : STD_LOGIC_VECTOR(c_network_eth_mac_slv'RANGE) := X"002286080001";
   SIGNAL eth_psc_access            : STD_LOGIC;
                                    
diff --git a/boards/uniboard1/designs/unb1_fn_terminal_db/tb/vhdl/tb_unb1_fn_terminal_db.vhd b/boards/uniboard1/designs/unb1_fn_terminal_db/tb/vhdl/tb_unb1_fn_terminal_db.vhd
index 8aaf71720d..d9185ca3e9 100644
--- a/boards/uniboard1/designs/unb1_fn_terminal_db/tb/vhdl/tb_unb1_fn_terminal_db.vhd
+++ b/boards/uniboard1/designs/unb1_fn_terminal_db/tb/vhdl/tb_unb1_fn_terminal_db.vhd
@@ -194,23 +194,6 @@ ARCHITECTURE tb OF tb_mmf_node_fn_terminal_db IS
   SIGNAL fn_in_mesh_serial_4arr  : t_unb_mesh_sl_4arr;
   SIGNAL fn_out_mesh_serial_4arr : t_unb_mesh_sl_4arr;
  
-  ----------------------------------------------------------------------------
-  -- Component declaration of mm_file (many instances in this TB)
-  ----------------------------------------------------------------------------
-  COMPONENT mm_file
-  GENERIC(
-    g_file_prefix       : STRING;
-    g_mm_clk_period     : TIME := c_mm_clk_period;
-    g_update_on_change  : BOOLEAN := FALSE
-  );
-  PORT (
-    mm_rst        : IN  STD_LOGIC;
-    mm_clk        : IN  STD_LOGIC;
-    mm_master_out : OUT t_mem_mosi;
-    mm_master_in  : IN  t_mem_miso 
-  );
-  END COMPONENT;
-
 BEGIN
 
   ----------------------------------------------------------------------------
diff --git a/boards/uniboard1/designs/unb1_heater/src/vhdl/mmm_unb1_heater.vhd b/boards/uniboard1/designs/unb1_heater/src/vhdl/mmm_unb1_heater.vhd
index cc3461abb5..d770b309cb 100644
--- a/boards/uniboard1/designs/unb1_heater/src/vhdl/mmm_unb1_heater.vhd
+++ b/boards/uniboard1/designs/unb1_heater/src/vhdl/mmm_unb1_heater.vhd
@@ -115,24 +115,6 @@ ARCHITECTURE str OF mmm_unb1_heater IS
   SIGNAL i_mm_clk   : STD_LOGIC := '1';
   SIGNAL i_epcs_clk : STD_LOGIC := '1';
 
-  ----------------------------------------------------------------------------
-  -- mm_file component
-  ----------------------------------------------------------------------------
-  COMPONENT mm_file
-  GENERIC(
-    g_file_prefix       : STRING;
-    g_mm_clk_period     : TIME := c_mm_clk_period;
-    g_update_on_change  : BOOLEAN := FALSE;
-    g_mm_rd_latency     : NATURAL := 1
-  );
-  PORT (
-    mm_rst        : IN  STD_LOGIC;
-    mm_clk        : IN  STD_LOGIC;
-    mm_master_out : OUT t_mem_mosi;
-    mm_master_in  : IN  t_mem_miso 
-  );
-  END COMPONENT;
-
 BEGIN
 
   mm_clk   <= i_mm_clk;
diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/mmm_unb1_minimal_qsys_wo_pll.vhd b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/mmm_unb1_minimal_qsys_wo_pll.vhd
index 0aac10f8d2..d983de6e64 100644
--- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/mmm_unb1_minimal_qsys_wo_pll.vhd
+++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys_wo_pll/mmm_unb1_minimal_qsys_wo_pll.vhd
@@ -119,24 +119,6 @@ ARCHITECTURE str OF mmm_unb1_minimal_qsys_wo_pll IS
 
   CONSTANT c_mm_clk_period : TIME := 1000 ms / g_mm_clk_freq;
 
-  ----------------------------------------------------------------------------
-  -- mm_file component
-  ----------------------------------------------------------------------------
-  COMPONENT mm_file
-  GENERIC(
-    g_file_prefix       : STRING;
-    g_mm_clk_period     : TIME := c_mm_clk_period;
-    g_update_on_change  : BOOLEAN := FALSE;
-    g_mm_rd_latency     : NATURAL := 1
-  );
-  PORT (
-    mm_rst        : IN  STD_LOGIC;
-    mm_clk        : IN  STD_LOGIC;
-    mm_master_out : OUT t_mem_mosi;
-    mm_master_in  : IN  t_mem_miso
-  );
-  END COMPONENT;
-
 BEGIN
 
   ----------------------------------------------------------------------------
diff --git a/boards/uniboard1/designs/unb1_minimal/src/vhdl/mmm_unb1_minimal.vhd b/boards/uniboard1/designs/unb1_minimal/src/vhdl/mmm_unb1_minimal.vhd
index f939787999..36ec44d522 100644
--- a/boards/uniboard1/designs/unb1_minimal/src/vhdl/mmm_unb1_minimal.vhd
+++ b/boards/uniboard1/designs/unb1_minimal/src/vhdl/mmm_unb1_minimal.vhd
@@ -113,24 +113,6 @@ ARCHITECTURE str OF mmm_unb1_minimal IS
   SIGNAL i_mm_clk   : STD_LOGIC := '1';
   SIGNAL i_epcs_clk : STD_LOGIC := '1';
 
-  ----------------------------------------------------------------------------
-  -- mm_file component
-  ----------------------------------------------------------------------------
-  COMPONENT mm_file
-  GENERIC(
-    g_file_prefix       : STRING;
-    g_mm_clk_period     : TIME := c_mm_clk_period;
-    g_update_on_change  : BOOLEAN := FALSE;
-    g_mm_rd_latency     : NATURAL := 1
-  );
-  PORT (
-    mm_rst        : IN  STD_LOGIC;
-    mm_clk        : IN  STD_LOGIC;
-    mm_master_out : OUT t_mem_mosi;
-    mm_master_in  : IN  t_mem_miso 
-  );
-  END COMPONENT;
-
   ----------------------------------------------------------------------------
   -- MM arbiter
   -- . In the NIOS-only (plus 1GbE actually) QSYS, all devices are below 0x4000.
diff --git a/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/mmm_unb1_terminal_bg_mesh_db.vhd b/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/mmm_unb1_terminal_bg_mesh_db.vhd
index 75ac881e2f..60ac564fd3 100644
--- a/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/mmm_unb1_terminal_bg_mesh_db.vhd
+++ b/boards/uniboard1/designs/unb1_terminal_bg_mesh_db/src/vhdl/mmm_unb1_terminal_bg_mesh_db.vhd
@@ -145,21 +145,6 @@ ARCHITECTURE str OF mmm_unb1_terminal_bg_mesh_db IS
   SIGNAL mm_rst_n              : STD_LOGIC ;
   SIGNAL sim_eth1g_reg_mosi    : t_mem_mosi;
 
-  COMPONENT mm_file IS
-    GENERIC (
-      g_file_prefix      : STRING ;
-      g_mm_clk_period    : TIME    := 8 ns;
-      g_update_on_change : BOOLEAN := FALSE;
-      g_mm_rd_latency    : NATURAL := 1
-    );
-    PORT (
-      mm_rst        : IN  STD_LOGIC;
-      mm_clk        : IN  STD_LOGIC;
-      mm_master_out : OUT t_mem_mosi := c_mem_mosi_rst;
-      mm_master_in  : IN  t_mem_miso := c_mem_miso_rst
-    );
-  END COMPONENT mm_file;
-  
   COMPONENT qsys_unb1_terminal_bg_mesh_db IS
     PORT (
       reg_diag_bg_reset_export                : out std_logic;
diff --git a/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd b/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd
index 47b4396ba7..adc210b9f6 100644
--- a/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd
+++ b/boards/uniboard1/designs/unb1_test/src/vhdl/mmm_unb1_test.vhd
@@ -254,23 +254,6 @@ ARCHITECTURE str OF mmm_unb1_test IS
 
   SIGNAL i_reset_n                                       : STD_LOGIC;
 
-  ----------------------------------------------------------------------------
-  -- mm_file component
-  ----------------------------------------------------------------------------
-  COMPONENT mm_file
-  GENERIC(
-    g_file_prefix       : STRING;
-    g_update_on_change  : BOOLEAN := FALSE;
-    g_mm_rd_latency     : NATURAL := 1
-  );
-  PORT (
-    mm_rst        : IN  STD_LOGIC;
-    mm_clk        : IN  STD_LOGIC;
-    mm_master_out : OUT t_mem_mosi;
-    mm_master_in  : IN  t_mem_miso
-  );
-  END COMPONENT;
-
 BEGIN
 
   ----------------------------------------------------------------------------
-- 
GitLab