Merge branch 'master' of git.astron.nl:desp/hdl

5ae18ab0 · Eric Kooistra · 22fdbd2a · 0e5e6c64 · 5ae18ab0 · 5ae18ab0
Commit 5ae18ab0 authored 3 years ago by Eric Kooistra
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/hdllib.cfg
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/hdllib.cfg
@@ -26,7 +26,7 @@ regression_test_vhdl =
 [modelsim_project_file]
 modelsim_copy_files =
    src/data data
-#### Overwrite bf weights with sim data ensuring all weights are 1.0 by default in simulation.
+#### Overwrite hex files with sim data as hex file formatting is byte addressed in Modelsim instead of word addressed like in Quartus.
    tb/data data    

 [quartus_project_file]

--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/quartus/lofar2_unb2b_sdp_station.sdc
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/quartus/lofar2_unb2b_sdp_station.sdc
@@ -86,8 +86,8 @@ set_clock_groups -asynchronous -group [get_clocks pll_clk400]
 #set_clock_groups -asynchronous -group [get_clocks {*mac_clock*xcvr_fpll_a10_0|outclk0}]
 #set_clock_groups -asynchronous -group [get_clocks {*dp_clk*xcvr_fpll_a10_0|outclk0}]
 #set_clock_groups -asynchronous -group [get_clocks {*xcvr_fpll_a10_0|outclk1}]
-set_clock_groups -asynchronous -group [get_clocks {*xcvr_fpll_a10_0|outclk3}]
-
+set_clock_groups -asynchronous -group [get_clocks {*_board_clk125_pll|*xcvr_fpll_a10_0|outclk2}]
+set_clock_groups -asynchronous -group [get_clocks {*_board_clk125_pll|*xcvr_fpll_a10_0|outclk3}]

 set_clock_groups -asynchronous -group [get_clocks {*xcvr_native_a10_0|g_xcvr_native_insts[*]|rx_pma_clk}]


--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_0.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_0.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_1.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_1.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_2.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_2.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_3.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_3.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_4.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_4.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_5.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_ss_wide_5.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_0.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_0.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_1.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_1.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_10.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_10.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_11.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_11.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_2.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_2.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_3.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_3.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_4.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_4.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_5.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_5.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_6.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_6.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_7.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_7.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_8.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_8.hex
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_9.hex
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/data/bf_unit_weights_9.hex