From ccf2dd7502218aa4a23184cefc28f5e285f1b567 Mon Sep 17 00:00:00 2001 From: Pepping <pepping> Date: Thu, 30 Apr 2015 14:40:06 +0000 Subject: [PATCH] Added OR to c_ena_transpose --- .../src/vhdl/apertif_unb1_fn_beamformer.vhd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/apertif_unb1_fn_beamformer.vhd b/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/apertif_unb1_fn_beamformer.vhd index bcf03fb810..fc0aee58c5 100644 --- a/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/apertif_unb1_fn_beamformer.vhd +++ b/applications/apertif/designs/apertif_unb1_fn_beamformer/src/vhdl/apertif_unb1_fn_beamformer.vhd @@ -113,7 +113,7 @@ END apertif_unb1_fn_beamformer; ARCHITECTURE str OF apertif_unb1_fn_beamformer IS - CONSTANT c_use_transpose : BOOLEAN := g_design_name="apertif_unb1_fn_beamformer_trans"; -- Also use DDR3 + CONSTANT c_use_transpose : BOOLEAN := g_design_name="apertif_unb1_fn_beamformer_trans" OR g_design_name="apertif_unb1_fn_beamformer_tp_bg"; -- Also use DDR3 CONSTANT c_use_bg : BOOLEAN := g_design_name="apertif_unb1_fn_beamformer_tp_bg"; -- Also use DDR3, but no mesh terminals CONSTANT c_use_phy : t_c_unb1_board_use_phy := (1, 1, sel_a_b(c_use_bg, 0, 1), 0, sel_a_b(c_use_transpose, 1, 0), 0, 0, 1); CONSTANT c_fw_version : t_unb1_board_fw_version := (3, 4); -- firmware version x.y @@ -389,7 +389,8 @@ BEGIN -- Node function ----------------------------------------------------------------------------- u_node_fn_beamformer : ENTITY work.node_apertif_unb1_fn_beamformer - GENERIC MAP( + GENERIC MAP( + g_sim => g_sim, g_use_block_gen => c_use_bg, -- TRUE overrides terminal output and feeds BG output to the BF instead. g_use_bf => g_use_bf ) -- GitLab