From 3ca65023446732ef08d4b55d3778e7f09fb9dd60 Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Fri, 17 Apr 2015 09:39:54 +0000
Subject: [PATCH] Moved build_dir_sim and build_dir_synth keys from local
hdllib.cfg to central hdltool.cfg
---
libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg | 3 ---
libraries/dsp/bf/hdllib.cfg | 3 ---
libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg | 3 ---
libraries/dsp/correlator/hdllib.cfg | 3 ---
libraries/dsp/fft/hdllib.cfg | 3 ---
libraries/dsp/filter/hdllib.cfg | 3 ---
libraries/dsp/rTwoSDF/hdllib.cfg | 3 ---
libraries/dsp/st/hdllib.cfg | 3 ---
libraries/dsp/wpfb/hdllib.cfg | 6 ++----
9 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg b/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg
index bf0806a30a..aca6130321 100644
--- a/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg
+++ b/libraries/dsp/bf/designs/unb1_fn_bf/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
hdl_lib_technology = ip_stratixiv
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
synth_top_level_entity =
synth_files =
diff --git a/libraries/dsp/bf/hdllib.cfg b/libraries/dsp/bf/hdllib.cfg
index dd53999b71..29c634ce6f 100644
--- a/libraries/dsp/bf/hdllib.cfg
+++ b/libraries/dsp/bf/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
hdl_lib_technology =
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
synth_files =
src/vhdl/bf_pkg.vhd
src/vhdl/bf_unit.vhd
diff --git a/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg b/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
index 235a94993d..2ad5d02508 100644
--- a/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
+++ b/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
hdl_lib_technology = ip_stratixiv
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
synth_top_level_entity =
quartus_copy_files =
diff --git a/libraries/dsp/correlator/hdllib.cfg b/libraries/dsp/correlator/hdllib.cfg
index 7404455df5..fc1fcbc8e9 100644
--- a/libraries/dsp/correlator/hdllib.cfg
+++ b/libraries/dsp/correlator/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
hdl_lib_technology =
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
synth_files =
$SVN/RadioHDL/trunk/libraries/dsp/correlator/src/vhdl/corr_carousel.vhd
$SVN/RadioHDL/trunk/libraries/dsp/correlator/src/vhdl/corr_unfolder.vhd
diff --git a/libraries/dsp/fft/hdllib.cfg b/libraries/dsp/fft/hdllib.cfg
index e0baabae13..024002761d 100644
--- a/libraries/dsp/fft/hdllib.cfg
+++ b/libraries/dsp/fft/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
hdl_lib_technology =
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
synth_files =
$UNB/Firmware/dsp/fft/src/vhdl/fft_pkg.vhd
$UNB/Firmware/dsp/fft/src/vhdl/fft_sepa.vhd
diff --git a/libraries/dsp/filter/hdllib.cfg b/libraries/dsp/filter/hdllib.cfg
index 0c4b4c52ab..1d45a36921 100644
--- a/libraries/dsp/filter/hdllib.cfg
+++ b/libraries/dsp/filter/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
hdl_lib_technology =
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
synth_files =
$UNB/Firmware/dsp/filter/src/vhdl/fil_pkg.vhd
$UNB/Firmware/dsp/filter/src/vhdl/fil_ppf_ctrl.vhd
diff --git a/libraries/dsp/rTwoSDF/hdllib.cfg b/libraries/dsp/rTwoSDF/hdllib.cfg
index 43ab5d22fe..62c9eec519 100644
--- a/libraries/dsp/rTwoSDF/hdllib.cfg
+++ b/libraries/dsp/rTwoSDF/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
hdl_lib_technology =
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
synth_files =
src/vhdl/twiddlesPkg.vhd
src/vhdl/rTwoSDFPkg.vhd
diff --git a/libraries/dsp/st/hdllib.cfg b/libraries/dsp/st/hdllib.cfg
index 7bdbf21232..a4221e42cd 100644
--- a/libraries/dsp/st/hdllib.cfg
+++ b/libraries/dsp/st/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
hdl_lib_technology =
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
synth_files =
$UNB/Firmware/modules/Lofar/st/src/vhdl/st_acc.vhd
$UNB/Firmware/modules/Lofar/st/src/vhdl/st_ctrl.vhd
diff --git a/libraries/dsp/wpfb/hdllib.cfg b/libraries/dsp/wpfb/hdllib.cfg
index e657495e72..71911aed25 100644
--- a/libraries/dsp/wpfb/hdllib.cfg
+++ b/libraries/dsp/wpfb/hdllib.cfg
@@ -5,9 +5,6 @@ hdl_lib_uses_sim =
hdl_lib_technology =
-build_dir_sim = $HDL_BUILD_DIR
-build_dir_synth = $HDL_BUILD_DIR
-
synth_files =
src/vhdl/wpfb_pkg.vhd
src/vhdl/wpfb_unit.vhd
@@ -17,4 +14,5 @@ test_bench_files =
tb/vhdl/tb_mmf_wpfb_unit.vhd
modelsim_copy_files =
- $UNB/Firmware/dsp/filter/build/data data
+ modelsim/wave_tb_mmf_wpfb_unit.do .
+ $UNB/Firmware/dsp/filter/build/data data
--
GitLab