From a369f61d8281f336a31334fe34bb21fc68a59123 Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Wed, 4 Feb 2015 09:48:05 +0000
Subject: [PATCH] Use modelsim_copy_files key to copy the data files to mpf
directory data/.
---
libraries/base/diag/hdllib.cfg | 8 ++++----
libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd | 2 +-
libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd | 2 +-
libraries/base/diag/tb/vhdl/tb_mms_diag_block_gen.vhd | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libraries/base/diag/hdllib.cfg b/libraries/base/diag/hdllib.cfg
index 18df3bdaa6..9c2da2f578 100644
--- a/libraries/base/diag/hdllib.cfg
+++ b/libraries/base/diag/hdllib.cfg
@@ -33,16 +33,16 @@ synth_files =
test_bench_files =
$UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_wg.vhd
$UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_wg_wideband.vhd
- $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_block_gen.vhd
$UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_tx_seq.vhd
$UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_rx_seq.vhd
$UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_tx_frm.vhd
$UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_frm_generator.vhd
$UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_diag_frm_monitor.vhd
$UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_mms_diag_seq.vhd
- $UNB/Firmware/modules/Lofar/diag/tb/vhdl/tb_mms_diag_block_gen.vhd
+ tb/vhdl/tb_diag_block_gen.vhd
+ tb/vhdl/tb_mms_diag_block_gen.vhd
tb/vhdl/tb_diag_regression.vhd
modelsim_copy_files =
- $UNB/Firmware/modules/Lofar/diag/src/data/bf_in_data.dat .
- $UNB/Firmware/modules/Lofar/diag/src/data/diag_block.hex .
\ No newline at end of file
+ $UNB/Firmware/modules/Lofar/diag/src/data data
+
\ No newline at end of file
diff --git a/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd b/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
index 19640ccb71..47e66fdee3 100644
--- a/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
+++ b/libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
@@ -48,7 +48,7 @@ ENTITY mms_diag_block_gen IS
g_buf_dat_w : POSITIVE := 32;
g_buf_addr_w : POSITIVE := 7; -- Waveform buffer size 2**g_buf_addr_w nof samples
g_file_index_arr : t_nat_natural_arr := array_init(0, 128, 1); -- default use the instance index as file index 0, 1, 2, 3, 4 ...
- g_file_name_prefix : STRING := "../../data/bf_in_data"; -- Relative path to the hex files that contain the initial data for the memories
+ g_file_name_prefix : STRING := "data/bf_in_data"; -- Path to the hex files that contain the initial data for the memories
-- The sequence number and ".hex" are added within the entity.
g_diag_block_gen_rst : t_diag_block_gen := c_diag_block_gen_rst
);
diff --git a/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd b/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd
index 9c7d3d5353..9338804f34 100644
--- a/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd
+++ b/libraries/base/diag/tb/vhdl/tb_diag_block_gen.vhd
@@ -56,7 +56,7 @@ ARCHITECTURE tb OF tb_diag_block_gen IS
nof_dat => 2**g_buf_adr_w, -- = 2**adr_w
init_sl => '0');
- CONSTANT c_buf_file : STRING := sel_a_b(c_buf.adr_w=7 AND c_buf.dat_w=32, "diag_block.hex", "UNUSED");
+ CONSTANT c_buf_file : STRING := sel_a_b(c_buf.adr_w=7 AND c_buf.dat_w=32, "data/diag_block.hex", "UNUSED");
CONSTANT c_cntr_init : INTEGER := 0;
CONSTANT c_cntr_incr : INTEGER := 1;
diff --git a/libraries/base/diag/tb/vhdl/tb_mms_diag_block_gen.vhd b/libraries/base/diag/tb/vhdl/tb_mms_diag_block_gen.vhd
index 4dacecd947..a7400b622d 100644
--- a/libraries/base/diag/tb/vhdl/tb_mms_diag_block_gen.vhd
+++ b/libraries/base/diag/tb/vhdl/tb_mms_diag_block_gen.vhd
@@ -46,7 +46,7 @@ ENTITY tb_mms_diag_block_gen IS
g_nof_streams : NATURAL := 16;
g_buf_dat_w : NATURAL := 32;
g_buf_addr_w : NATURAL := 7;
- g_file_name_prefix : STRING := "bf_in_data";
+ g_file_name_prefix : STRING := "data/bf_in_data";
g_sim : BOOLEAN := TRUE
);
END tb_mms_diag_block_gen;
--
GitLab