diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full/hdllib.cfg b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/hdllib.cfg
similarity index 96%
rename from applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full/hdllib.cfg
rename to applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/hdllib.cfg
index 3040f593820e960e6dd03db41e4d44da75331181..182cfbcd38f29fd81a6e164c675e31e12c62f2ed 100644
--- a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full/hdllib.cfg
+++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/hdllib.cfg
@@ -1,11 +1,11 @@
-hdl_lib_name = lofar2_unb2b_beamformer_full
-hdl_library_clause_name = lofar2_unb2b_beamformer_full_lib
+hdl_lib_name = lofar2_unb2b_beamformer_one_node
+hdl_library_clause_name = lofar2_unb2b_beamformer_one_node_lib
hdl_lib_uses_synth = common mm technology unb2b_board lofar2_unb2b_beamformer
hdl_lib_uses_sim =
hdl_lib_technology = ip_arria10_e1sg
synth_files =
- lofar2_unb2b_beamformer_full.vhd
+ lofar2_unb2b_beamformer_one_node.vhd
test_bench_files =
@@ -36,7 +36,7 @@ quartus_tcl_files =
quartus_vhdl_files =
quartus_qip_files =
- $RADIOHDL_BUILD_DIR/unb2b/quartus/lofar2_unb2b_beamformer_full/qsys_lofar2_unb2b_beamformer/qsys_lofar2_unb2b_beamformer.qip
+ $RADIOHDL_BUILD_DIR/unb2b/quartus/lofar2_unb2b_beamformer_one_node/qsys_lofar2_unb2b_beamformer/qsys_lofar2_unb2b_beamformer.qip
quartus_ip_files =
$RADIOHDL_BUILD_DIR/unb2b/quartus/lofar2_unb2b_beamformer/ip/qsys_lofar2_unb2b_beamformer/qsys_lofar2_unb2b_beamformer_avs_common_mm_0.ip
diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full/lofar2_unb2b_beamformer_full.vhd b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/lofar2_unb2b_beamformer_one_node.vhd
similarity index 90%
rename from applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full/lofar2_unb2b_beamformer_full.vhd
rename to applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/lofar2_unb2b_beamformer_one_node.vhd
index 97cb263164bf78388e4bbb3554047c06452ba1ba..d1e04a698ce4bcbee592cde4a04cfd68fe45efd4 100644
--- a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full/lofar2_unb2b_beamformer_full.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/lofar2_unb2b_beamformer_one_node.vhd
@@ -20,10 +20,10 @@
-- Author : R. van der Walle
-- Purpose:
--- Wrapper for full filterbank test design
+-- Wrapper for one node beamformer test design
-- Description:
-- Unb2b version for lab testing
--- Contains complete AIT input stage with 12 ADC streams and FSUB
+-- Contains complete AIT input stage with 12 ADC streams, FSUB and BF
LIBRARY IEEE, common_lib, unb2b_board_lib, technology_lib, diag_lib, dp_lib, tech_jesd204b_lib, lofar2_unb2b_beamformer_lib;
@@ -36,10 +36,10 @@ USE unb2b_board_lib.unb2b_board_pkg.ALL;
USE diag_lib.diag_pkg.ALL;
USE dp_lib.dp_stream_pkg.ALL;
-ENTITY lofar2_unb2b_beamformer_full IS
+ENTITY lofar2_unb2b_beamformer_one_node IS
GENERIC (
- g_design_name : STRING := "lofar2_unb2b_beamformer_full";
- g_design_note : STRING := "Lofar2 filterbank with all streams";
+ g_design_name : STRING := "lofar2_unb2b_beamformer_one_node";
+ g_design_note : STRING := "Lofar2 beamformer one node design with all streams";
g_sim : BOOLEAN := FALSE; --Overridden by TB
g_sim_unb_nr : NATURAL := 0;
g_sim_node_nr : NATURAL := 0;
@@ -91,9 +91,9 @@ ENTITY lofar2_unb2b_beamformer_full IS
JESD204B_SYSREF : IN STD_LOGIC;
JESD204B_SYNC_N : OUT STD_LOGIC_VECTOR(c_unb2b_board_nof_sync_jesd204b-1 DOWNTO 0)
);
-END lofar2_unb2b_beamformer_full;
+END lofar2_unb2b_beamformer_one_node;
-ARCHITECTURE str OF lofar2_unb2b_beamformer_full IS
+ARCHITECTURE str OF lofar2_unb2b_beamformer_one_node IS
SIGNAL JESD204B_SERIAL_DATA : STD_LOGIC_VECTOR((c_unb2b_board_tr_jesd204b.bus_w*c_unb2b_board_tr_jesd204b.nof_bus)-1 downto 0);
SIGNAL jesd204b_sync_n_arr : STD_LOGIC_VECTOR((c_unb2b_board_tr_jesd204b.bus_w*c_unb2b_board_tr_jesd204b.nof_bus)-1 downto 0);
diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full_256MHz/hdllib.cfg b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/hdllib.cfg
similarity index 96%
rename from applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full_256MHz/hdllib.cfg
rename to applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/hdllib.cfg
index 8c9c75f66ec7d253a43ac8543daf45bca861e65f..ec80c5e3efe70ae766c3ee9cd1791a224ee86a2c 100644
--- a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full_256MHz/hdllib.cfg
+++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/hdllib.cfg
@@ -1,11 +1,11 @@
-hdl_lib_name = lofar2_unb2b_beamformer_full_256MHz
-hdl_library_clause_name = lofar2_unb2b_beamformer_full_256MHz_lib
+hdl_lib_name = lofar2_unb2b_beamformer_one_node_256MHz
+hdl_library_clause_name = lofar2_unb2b_beamformer_one_node_256MHz_lib
hdl_lib_uses_synth = common mm technology unb2b_board lofar2_unb2b_beamformer
hdl_lib_uses_sim =
hdl_lib_technology = ip_arria10_e1sg
synth_files =
- lofar2_unb2b_beamformer_full_256MHz.vhd
+ lofar2_unb2b_beamformer_one_node_256MHz.vhd
test_bench_files =
@@ -36,7 +36,7 @@ quartus_tcl_files =
quartus_vhdl_files =
quartus_qip_files =
- $RADIOHDL_BUILD_DIR/unb2b/quartus/lofar2_unb2b_beamformer_full_256MHz/qsys_lofar2_unb2b_beamformer/qsys_lofar2_unb2b_beamformer.qip
+ $RADIOHDL_BUILD_DIR/unb2b/quartus/lofar2_unb2b_beamformer_one_node_256MHz/qsys_lofar2_unb2b_beamformer/qsys_lofar2_unb2b_beamformer.qip
quartus_ip_files =
$RADIOHDL_BUILD_DIR/unb2b/quartus/lofar2_unb2b_beamformer/ip/qsys_lofar2_unb2b_beamformer/qsys_lofar2_unb2b_beamformer_avs_common_mm_0.ip
diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full_256MHz/lofar2_unb2b_beamformer_full_256MHz.vhd b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/lofar2_unb2b_beamformer_one_node_256MHz.vhd
similarity index 90%
rename from applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full_256MHz/lofar2_unb2b_beamformer_full_256MHz.vhd
rename to applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/lofar2_unb2b_beamformer_one_node_256MHz.vhd
index 82e5c487b76fab35fc3f5f5da8099c95b78ea46c..f71e3bc47ae99291e402634751d1410167a3e742 100644
--- a/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full_256MHz/lofar2_unb2b_beamformer_full_256MHz.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/lofar2_unb2b_beamformer_one_node_256MHz.vhd
@@ -20,10 +20,10 @@
-- Author : R. van der Walle
-- Purpose:
--- Wrapper for full filterbank test design
+-- Wrapper for one node beamformer test design
-- Description:
-- Unb2b version for lab testing
--- Contains complete AIT input stage with 12 ADC streams and FSUB
+-- Contains complete AIT input stage with 12 ADC streams, FSUB and BF with a DP_clk of 256MHz
LIBRARY IEEE, common_lib, unb2b_board_lib, technology_lib, diag_lib, dp_lib, tech_jesd204b_lib, lofar2_unb2b_beamformer_lib;
@@ -36,10 +36,10 @@ USE unb2b_board_lib.unb2b_board_pkg.ALL;
USE diag_lib.diag_pkg.ALL;
USE dp_lib.dp_stream_pkg.ALL;
-ENTITY lofar2_unb2b_beamformer_full_256MHz IS
+ENTITY lofar2_unb2b_beamformer_one_node_256MHz IS
GENERIC (
- g_design_name : STRING := "lofar2_unb2b_beamformer_full_256MHz";
- g_design_note : STRING := "Lofar2 filterbank with all streams on 256MHz ext clk";
+ g_design_name : STRING := "lofar2_unb2b_beamformer_one_node_256MHz";
+ g_design_note : STRING := "Lofar2 one node beamformer design with all streams on 256MHz ext clk";
g_sim : BOOLEAN := FALSE; --Overridden by TB
g_sim_unb_nr : NATURAL := 0;
g_sim_node_nr : NATURAL := 0;
@@ -91,9 +91,9 @@ ENTITY lofar2_unb2b_beamformer_full_256MHz IS
JESD204B_SYSREF : IN STD_LOGIC;
JESD204B_SYNC_N : OUT STD_LOGIC_VECTOR(c_unb2b_board_nof_sync_jesd204b-1 DOWNTO 0)
);
-END lofar2_unb2b_beamformer_full_256MHz;
+END lofar2_unb2b_beamformer_one_node_256MHz;
-ARCHITECTURE str OF lofar2_unb2b_beamformer_full_256MHz IS
+ARCHITECTURE str OF lofar2_unb2b_beamformer_one_node_256MHz IS
SIGNAL JESD204B_SERIAL_DATA : STD_LOGIC_VECTOR((c_unb2b_board_tr_jesd204b.bus_w*c_unb2b_board_tr_jesd204b.nof_bus)-1 downto 0);
SIGNAL jesd204b_sync_n_arr : STD_LOGIC_VECTOR((c_unb2b_board_tr_jesd204b.bus_w*c_unb2b_board_tr_jesd204b.nof_bus)-1 downto 0);
diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer_pkg.vhd b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer_pkg.vhd
index 2d38a27d4c240422dba66bfb52a4f500f78c9907..427214677fbb4d95a33ff798ba3627caac4a5fac 100644
--- a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer_pkg.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer_pkg.vhd
@@ -39,8 +39,8 @@ PACKAGE lofar2_unb2b_beamformer_pkg IS
END RECORD;
-- nofjesd, nofdb, nofinput
- CONSTANT c_full : t_lofar2_unb2b_beamformer_config := ( 12, 2, 12, c_unb2b_board_ext_clk_freq_200M );
- CONSTANT c_full_256MHz : t_lofar2_unb2b_beamformer_config := ( 12, 2, 12, c_unb2b_board_ext_clk_freq_256M );
+ CONSTANT c_one_node : t_lofar2_unb2b_beamformer_config := ( 12, 2, 12, c_unb2b_board_ext_clk_freq_200M );
+ CONSTANT c_one_node_256MHz : t_lofar2_unb2b_beamformer_config := ( 12, 2, 12, c_unb2b_board_ext_clk_freq_256M );
-- Function to select the revision configuration.
FUNCTION func_sel_revision_rec(g_design_name : STRING) RETURN t_lofar2_unb2b_beamformer_config;
@@ -53,9 +53,9 @@ PACKAGE BODY lofar2_unb2b_beamformer_pkg IS
FUNCTION func_sel_revision_rec(g_design_name : STRING) RETURN t_lofar2_unb2b_beamformer_config IS
BEGIN
- IF g_design_name = "lofar2_unb2b_beamformer_full" THEN RETURN c_full;
- ELSIF g_design_name = "lofar2_unb2b_beamformer_full_256MHz" THEN RETURN c_full_256MHz;
- ELSE RETURN c_full;
+ IF g_design_name = "lofar2_unb2b_beamformer_one_node" THEN RETURN c_one_node;
+ ELSIF g_design_name = "lofar2_unb2b_beamformer_one_node_256MHz" THEN RETURN c_one_node_256MHz;
+ ELSE RETURN c_one_node;
END IF;
END;