From 8ffcf3a13f669932a290ef90bb621abbae604f80 Mon Sep 17 00:00:00 2001 From: donker <donker@astron.nl> Date: Thu, 31 Oct 2019 13:27:41 +0100 Subject: [PATCH] changed SIM_DIR variable --- boards/uniboard1/designs/unb1_ddr3/doc/README | 2 +- boards/uniboard1/designs/unb1_ddr3_reorder/doc/README | 2 +- boards/uniboard1/designs/unb1_heater/doc/README | 2 +- boards/uniboard1/designs/unb1_minimal/doc/README | 2 +- boards/uniboard1/designs/unb1_test/doc/README | 2 +- boards/uniboard2/designs/unb2_minimal/doc/README | 2 +- boards/uniboard2/designs/unb2_test/doc/README | 2 +- boards/uniboard2a/designs/unb2a_heater/doc/README.txt | 2 +- boards/uniboard2a/designs/unb2a_minimal/doc/README.txt | 2 +- boards/uniboard2a/designs/unb2a_test/doc/README.txt | 2 +- boards/uniboard2b/designs/unb2b_heater/doc/README.txt | 2 +- boards/uniboard2b/designs/unb2b_jesd/doc/README | 2 +- boards/uniboard2b/designs/unb2b_minimal/doc/README | 2 +- boards/uniboard2b/designs/unb2b_test/doc/README.txt | 2 +- boards/uniboard2c/designs/unb2c_heater/doc/README.txt | 2 +- boards/uniboard2c/designs/unb2c_jesd/doc/README | 2 +- boards/uniboard2c/designs/unb2c_minimal/doc/README | 2 +- boards/uniboard2c/designs/unb2c_test/doc/README.txt | 2 +- libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/boards/uniboard1/designs/unb1_ddr3/doc/README b/boards/uniboard1/designs/unb1_ddr3/doc/README index 245bf3a6d1..dcc27dd233 100644 --- a/boards/uniboard1/designs/unb1_ddr3/doc/README +++ b/boards/uniboard1/designs/unb1_ddr3/doc/README @@ -14,7 +14,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb1 # in Modelsim do: diff --git a/boards/uniboard1/designs/unb1_ddr3_reorder/doc/README b/boards/uniboard1/designs/unb1_ddr3_reorder/doc/README index 752cd16ede..43dcd7791d 100644 --- a/boards/uniboard1/designs/unb1_ddr3_reorder/doc/README +++ b/boards/uniboard1/designs/unb1_ddr3_reorder/doc/README @@ -14,7 +14,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb1 # in Modelsim do: diff --git a/boards/uniboard1/designs/unb1_heater/doc/README b/boards/uniboard1/designs/unb1_heater/doc/README index 594a16f0a2..4b3e99c67c 100644 --- a/boards/uniboard1/designs/unb1_heater/doc/README +++ b/boards/uniboard1/designs/unb1_heater/doc/README @@ -16,7 +16,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb1 # in Modelsim do: diff --git a/boards/uniboard1/designs/unb1_minimal/doc/README b/boards/uniboard1/designs/unb1_minimal/doc/README index ded73efee2..a0085f2f59 100644 --- a/boards/uniboard1/designs/unb1_minimal/doc/README +++ b/boards/uniboard1/designs/unb1_minimal/doc/README @@ -18,7 +18,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb1 # in Modelsim do: diff --git a/boards/uniboard1/designs/unb1_test/doc/README b/boards/uniboard1/designs/unb1_test/doc/README index 75278e69b1..e2fdce7144 100644 --- a/boards/uniboard1/designs/unb1_test/doc/README +++ b/boards/uniboard1/designs/unb1_test/doc/README @@ -46,7 +46,7 @@ The following revisions are available for unb1_test (see the directories in ../r Simulation ---------- # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb1 Further Modelsim instructions: see the README file in the ../revisions/* directories diff --git a/boards/uniboard2/designs/unb2_minimal/doc/README b/boards/uniboard2/designs/unb2_minimal/doc/README index f4204c933d..037b0a8df8 100644 --- a/boards/uniboard2/designs/unb2_minimal/doc/README +++ b/boards/uniboard2/designs/unb2_minimal/doc/README @@ -26,7 +26,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2 # in Modelsim do: diff --git a/boards/uniboard2/designs/unb2_test/doc/README b/boards/uniboard2/designs/unb2_test/doc/README index aa1962e9b7..0dff5ebf0a 100644 --- a/boards/uniboard2/designs/unb2_test/doc/README +++ b/boards/uniboard2/designs/unb2_test/doc/README @@ -54,7 +54,7 @@ The following revisions are available for unb2_test (see the directories in ../r Simulation ---------- # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2 Further Modelsim instructions: see the README file in the ../revisions/* directories diff --git a/boards/uniboard2a/designs/unb2a_heater/doc/README.txt b/boards/uniboard2a/designs/unb2a_heater/doc/README.txt index 45784227e7..8788e379fa 100644 --- a/boards/uniboard2a/designs/unb2a_heater/doc/README.txt +++ b/boards/uniboard2a/designs/unb2a_heater/doc/README.txt @@ -26,7 +26,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2a # in Modelsim do: diff --git a/boards/uniboard2a/designs/unb2a_minimal/doc/README.txt b/boards/uniboard2a/designs/unb2a_minimal/doc/README.txt index 2f15b2b532..37859f9f84 100644 --- a/boards/uniboard2a/designs/unb2a_minimal/doc/README.txt +++ b/boards/uniboard2a/designs/unb2a_minimal/doc/README.txt @@ -28,7 +28,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2a # in Modelsim do: diff --git a/boards/uniboard2a/designs/unb2a_test/doc/README.txt b/boards/uniboard2a/designs/unb2a_test/doc/README.txt index c0cbdbec17..ce1710cbd2 100644 --- a/boards/uniboard2a/designs/unb2a_test/doc/README.txt +++ b/boards/uniboard2a/designs/unb2a_test/doc/README.txt @@ -53,7 +53,7 @@ The following revisions are available for unb2a_test (see the directories in ../ Simulation ---------- # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2a Further Modelsim instructions: see the README file in the ../revisions/* directories diff --git a/boards/uniboard2b/designs/unb2b_heater/doc/README.txt b/boards/uniboard2b/designs/unb2b_heater/doc/README.txt index 986591f6bd..b2f7defb7b 100644 --- a/boards/uniboard2b/designs/unb2b_heater/doc/README.txt +++ b/boards/uniboard2b/designs/unb2b_heater/doc/README.txt @@ -26,7 +26,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2b # in Modelsim do: diff --git a/boards/uniboard2b/designs/unb2b_jesd/doc/README b/boards/uniboard2b/designs/unb2b_jesd/doc/README index 2ad1b66249..4548387ac8 100644 --- a/boards/uniboard2b/designs/unb2b_jesd/doc/README +++ b/boards/uniboard2b/designs/unb2b_jesd/doc/README @@ -37,7 +37,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2b # in Modelsim do: diff --git a/boards/uniboard2b/designs/unb2b_minimal/doc/README b/boards/uniboard2b/designs/unb2b_minimal/doc/README index e503e227fe..eb5cae66ce 100644 --- a/boards/uniboard2b/designs/unb2b_minimal/doc/README +++ b/boards/uniboard2b/designs/unb2b_minimal/doc/README @@ -28,7 +28,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2b # in Modelsim do: diff --git a/boards/uniboard2b/designs/unb2b_test/doc/README.txt b/boards/uniboard2b/designs/unb2b_test/doc/README.txt index f704e92177..31575a05f4 100644 --- a/boards/uniboard2b/designs/unb2b_test/doc/README.txt +++ b/boards/uniboard2b/designs/unb2b_test/doc/README.txt @@ -53,7 +53,7 @@ The following revisions are available for unb2b_test (see the directories in ../ Simulation ---------- # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2b Further Modelsim instructions: see the README file in the ../revisions/* directories diff --git a/boards/uniboard2c/designs/unb2c_heater/doc/README.txt b/boards/uniboard2c/designs/unb2c_heater/doc/README.txt index d906ab22d9..58454429a6 100644 --- a/boards/uniboard2c/designs/unb2c_heater/doc/README.txt +++ b/boards/uniboard2c/designs/unb2c_heater/doc/README.txt @@ -26,7 +26,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2c # in Modelsim do: diff --git a/boards/uniboard2c/designs/unb2c_jesd/doc/README b/boards/uniboard2c/designs/unb2c_jesd/doc/README index 40f1369f26..f25a57e155 100644 --- a/boards/uniboard2c/designs/unb2c_jesd/doc/README +++ b/boards/uniboard2c/designs/unb2c_jesd/doc/README @@ -37,7 +37,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2c # in Modelsim do: diff --git a/boards/uniboard2c/designs/unb2c_minimal/doc/README b/boards/uniboard2c/designs/unb2c_minimal/doc/README index e07a7e4060..10c3150b6c 100644 --- a/boards/uniboard2c/designs/unb2c_minimal/doc/README +++ b/boards/uniboard2c/designs/unb2c_minimal/doc/README @@ -28,7 +28,7 @@ Simulation ---------- Modelsim instructions: # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2c # in Modelsim do: diff --git a/boards/uniboard2c/designs/unb2c_test/doc/README.txt b/boards/uniboard2c/designs/unb2c_test/doc/README.txt index 7721fb02fb..bf6717f045 100644 --- a/boards/uniboard2c/designs/unb2c_test/doc/README.txt +++ b/boards/uniboard2c/designs/unb2c_test/doc/README.txt @@ -53,7 +53,7 @@ The following revisions are available for unb2c_test (see the directories in ../ Simulation ---------- # in bash do: - rm $SIM_DIR/* # (optional) + rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional) run_modelsim unb2c Further Modelsim instructions: see the README file in the ../revisions/* directories diff --git a/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd b/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd index 7653a297db..f46490feb4 100644 --- a/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd +++ b/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd @@ -37,7 +37,7 @@ PACKAGE mm_file_unb_pkg IS CONSTANT c_mmf_unb_nof_pn : NATURAL := c_mmf_unb_nof_fn + c_mmf_unb_nof_bn; -- = 8 -- use fixed central directory to ease use of Python test case with Modelsim - CONSTANT c_mmf_unb_file_path : STRING := "$SIM_DIR/"; + CONSTANT c_mmf_unb_file_path : STRING := "$HDL_IOFILE_SIM_DIR/"; -- create mmf file prefix that is unique per slave FUNCTION mmf_unb_file_prefix(sys: t_c_mmf_unb_sys; node: NATURAL) RETURN STRING; -- GitLab