Skip to content
Snippets Groups Projects
Commit d8bf977e authored by Reinier van der Walle's avatar Reinier van der Walle
Browse files

changed full revision to one_node revision

parent 30a4d6db
Branches
No related tags found
2 merge requests!100Removed text for XSub that is now written in Confluence Subband correlator...,!61Resolve L2SDP-174 & L2SDP-173
Show whitespace changes
Inline Side-by-side
Showing
with 27 additions and 27 deletions
applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full/hdllib.cfg → applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/hdllib.cfg
+ 4
− 4
View file @ d8bf977e
hdl_lib_name = lofar2_unb2b_beamformer_full hdl_lib_name = lofar2_unb2b_beamformer_one_node
hdl_library_clause_name = lofar2_unb2b_beamformer_full_lib 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_synth = common mm technology unb2b_board lofar2_unb2b_beamformer
hdl_lib_uses_sim = hdl_lib_uses_sim =
hdl_lib_technology = ip_arria10_e1sg hdl_lib_technology = ip_arria10_e1sg
synth_files = synth_files =
lofar2_unb2b_beamformer_full.vhd lofar2_unb2b_beamformer_one_node.vhd
test_bench_files = test_bench_files =
...@@ -36,7 +36,7 @@ quartus_tcl_files = ...@@ -36,7 +36,7 @@ quartus_tcl_files =
quartus_vhdl_files = quartus_vhdl_files =
quartus_qip_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 = 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 $RADIOHDL_BUILD_DIR/unb2b/quartus/lofar2_unb2b_beamformer/ip/qsys_lofar2_unb2b_beamformer/qsys_lofar2_unb2b_beamformer_avs_common_mm_0.ip
......
applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full/lofar2_unb2b_beamformer_full.vhd → applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node/lofar2_unb2b_beamformer_one_node.vhd
+ 7
− 7
View file @ d8bf977e
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
-- Author : R. van der Walle -- Author : R. van der Walle
-- Purpose: -- Purpose:
-- Wrapper for full filterbank test design -- Wrapper for one node beamformer test design
-- Description: -- Description:
-- Unb2b version for lab testing -- 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; 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; ...@@ -36,10 +36,10 @@ USE unb2b_board_lib.unb2b_board_pkg.ALL;
USE diag_lib.diag_pkg.ALL; USE diag_lib.diag_pkg.ALL;
USE dp_lib.dp_stream_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL;
ENTITY lofar2_unb2b_beamformer_full IS ENTITY lofar2_unb2b_beamformer_one_node IS
GENERIC ( GENERIC (
g_design_name : STRING := "lofar2_unb2b_beamformer_full"; g_design_name : STRING := "lofar2_unb2b_beamformer_one_node";
g_design_note : STRING := "Lofar2 filterbank with all streams"; g_design_note : STRING := "Lofar2 beamformer one node design with all streams";
g_sim : BOOLEAN := FALSE; --Overridden by TB g_sim : BOOLEAN := FALSE; --Overridden by TB
g_sim_unb_nr : NATURAL := 0; g_sim_unb_nr : NATURAL := 0;
g_sim_node_nr : NATURAL := 0; g_sim_node_nr : NATURAL := 0;
...@@ -91,9 +91,9 @@ ENTITY lofar2_unb2b_beamformer_full IS ...@@ -91,9 +91,9 @@ ENTITY lofar2_unb2b_beamformer_full IS
JESD204B_SYSREF : IN STD_LOGIC; JESD204B_SYSREF : IN STD_LOGIC;
JESD204B_SYNC_N : OUT STD_LOGIC_VECTOR(c_unb2b_board_nof_sync_jesd204b-1 DOWNTO 0) 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_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); 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);
......
applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full_256MHz/hdllib.cfg → applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/hdllib.cfg
+ 4
− 4
View file @ d8bf977e
hdl_lib_name = lofar2_unb2b_beamformer_full_256MHz hdl_lib_name = lofar2_unb2b_beamformer_one_node_256MHz
hdl_library_clause_name = lofar2_unb2b_beamformer_full_256MHz_lib 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_synth = common mm technology unb2b_board lofar2_unb2b_beamformer
hdl_lib_uses_sim = hdl_lib_uses_sim =
hdl_lib_technology = ip_arria10_e1sg hdl_lib_technology = ip_arria10_e1sg
synth_files = synth_files =
lofar2_unb2b_beamformer_full_256MHz.vhd lofar2_unb2b_beamformer_one_node_256MHz.vhd
test_bench_files = test_bench_files =
...@@ -36,7 +36,7 @@ quartus_tcl_files = ...@@ -36,7 +36,7 @@ quartus_tcl_files =
quartus_vhdl_files = quartus_vhdl_files =
quartus_qip_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 = 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 $RADIOHDL_BUILD_DIR/unb2b/quartus/lofar2_unb2b_beamformer/ip/qsys_lofar2_unb2b_beamformer/qsys_lofar2_unb2b_beamformer_avs_common_mm_0.ip
......
applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_full_256MHz/lofar2_unb2b_beamformer_full_256MHz.vhd → applications/lofar2/designs/lofar2_unb2b_beamformer/revisions/lofar2_unb2b_beamformer_one_node_256MHz/lofar2_unb2b_beamformer_one_node_256MHz.vhd
+ 7
− 7
View file @ d8bf977e
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
-- Author : R. van der Walle -- Author : R. van der Walle
-- Purpose: -- Purpose:
-- Wrapper for full filterbank test design -- Wrapper for one node beamformer test design
-- Description: -- Description:
-- Unb2b version for lab testing -- 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; 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; ...@@ -36,10 +36,10 @@ USE unb2b_board_lib.unb2b_board_pkg.ALL;
USE diag_lib.diag_pkg.ALL; USE diag_lib.diag_pkg.ALL;
USE dp_lib.dp_stream_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 ( GENERIC (
g_design_name : STRING := "lofar2_unb2b_beamformer_full_256MHz"; g_design_name : STRING := "lofar2_unb2b_beamformer_one_node_256MHz";
g_design_note : STRING := "Lofar2 filterbank with all streams on 256MHz ext clk"; 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 : BOOLEAN := FALSE; --Overridden by TB
g_sim_unb_nr : NATURAL := 0; g_sim_unb_nr : NATURAL := 0;
g_sim_node_nr : NATURAL := 0; g_sim_node_nr : NATURAL := 0;
...@@ -91,9 +91,9 @@ ENTITY lofar2_unb2b_beamformer_full_256MHz IS ...@@ -91,9 +91,9 @@ ENTITY lofar2_unb2b_beamformer_full_256MHz IS
JESD204B_SYSREF : IN STD_LOGIC; JESD204B_SYSREF : IN STD_LOGIC;
JESD204B_SYNC_N : OUT STD_LOGIC_VECTOR(c_unb2b_board_nof_sync_jesd204b-1 DOWNTO 0) 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_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); 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);
......
applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer_pkg.vhd
+ 5
− 5
View file @ d8bf977e
...@@ -39,8 +39,8 @@ PACKAGE lofar2_unb2b_beamformer_pkg IS ...@@ -39,8 +39,8 @@ PACKAGE lofar2_unb2b_beamformer_pkg IS
END RECORD; END RECORD;
-- nofjesd, nofdb, nofinput -- nofjesd, nofdb, nofinput
CONSTANT c_full : t_lofar2_unb2b_beamformer_config := ( 12, 2, 12, c_unb2b_board_ext_clk_freq_200M ); CONSTANT c_one_node : 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_256MHz : t_lofar2_unb2b_beamformer_config := ( 12, 2, 12, c_unb2b_board_ext_clk_freq_256M );
-- Function to select the revision configuration. -- Function to select the revision configuration.
FUNCTION func_sel_revision_rec(g_design_name : STRING) RETURN t_lofar2_unb2b_beamformer_config; 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 ...@@ -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 FUNCTION func_sel_revision_rec(g_design_name : STRING) RETURN t_lofar2_unb2b_beamformer_config IS
BEGIN BEGIN
IF g_design_name = "lofar2_unb2b_beamformer_full" THEN RETURN c_full; IF g_design_name = "lofar2_unb2b_beamformer_one_node" THEN RETURN c_one_node;
ELSIF g_design_name = "lofar2_unb2b_beamformer_full_256MHz" THEN RETURN c_full_256MHz; ELSIF g_design_name = "lofar2_unb2b_beamformer_one_node_256MHz" THEN RETURN c_one_node_256MHz;
ELSE RETURN c_full; ELSE RETURN c_one_node;
END IF; END IF;
END; END;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment