diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc.vhd b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc.vhd index 7ea39b8512ee0fe70ff874ee345277a1ef339513..0621eaf07ad6e407e20c130b05d564de62af42fd 100644 --- a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/lofar2_unb2b_adc.vhd @@ -31,7 +31,6 @@ USE IEEE.STD_LOGIC_1164.ALL; USE IEEE.NUMERIC_STD.ALL; USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; -USE technology_lib.technology_pkg.ALL; USE unb2b_board_lib.unb2b_board_pkg.ALL; USE unb2b_board_lib.unb2b_board_peripherals_pkg.ALL; USE diag_lib.diag_pkg.ALL; @@ -43,7 +42,6 @@ ENTITY lofar2_unb2b_adc IS g_design_name : STRING := "lofar2_unb2b_adc"; g_design_note : STRING := "UNUSED"; g_jesd_freq : STRING := "200MHz"; - g_technology : NATURAL := c_tech_arria10_e1sg; g_buf_nof_data : NATURAL := 1024; g_sim : BOOLEAN := FALSE; --Overridden by TB g_sim_unb_nr : NATURAL := 0; @@ -238,7 +236,6 @@ BEGIN u_ctrl : ENTITY unb2b_board_lib.ctrl_unb2b_board GENERIC MAP ( g_sim => g_sim, - g_technology => g_technology, g_design_name => g_design_name, g_design_note => g_design_note, g_stamp_date => g_stamp_date, @@ -449,7 +446,6 @@ BEGIN u_ait: ENTITY work.node_adc_input_and_timing GENERIC MAP( - g_technology => g_technology, g_nof_streams => c_nof_streams, g_jesd_freq => g_jesd_freq, g_sim => g_sim diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/node_adc_input_and_timing.vhd b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/node_adc_input_and_timing.vhd index 77501b43b2fd78bdc0690189682e352ae11ff8c6..e66fbc7b536f208a4062cd574607b5caeb9f44dc 100644 --- a/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/node_adc_input_and_timing.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_adc/src/vhdl/node_adc_input_and_timing.vhd @@ -31,7 +31,6 @@ USE IEEE.STD_LOGIC_1164.ALL; USE IEEE.NUMERIC_STD.ALL; USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; -USE technology_lib.technology_pkg.ALL; USE unb2b_board_lib.unb2b_board_pkg.ALL; USE unb2b_board_lib.unb2b_board_peripherals_pkg.ALL; USE diag_lib.diag_pkg.ALL; @@ -41,7 +40,6 @@ USE lofar2_sdp_lib.sdp_pkg.ALL; ENTITY node_adc_input_and_timing IS GENERIC ( - g_technology : NATURAL := c_tech_arria10_e1sg; g_jesd_freq : STRING := "200MHz"; g_buf_nof_data : NATURAL := 131072; --8192; --1024; g_nof_streams : NATURAL := 12; @@ -452,7 +450,6 @@ BEGIN u_diag_data_buffer_bsn : ENTITY diag_lib.mms_diag_data_buffer GENERIC MAP ( - g_technology => g_technology, g_nof_streams => g_nof_streams, g_data_w => c_data_w, g_buf_nof_data => g_buf_nof_data, diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer.vhd b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer.vhd index fc365f01a7ca758d8e99db92dfb9e4c9ca122a11..0b134d1964ecf95b9d9b482a3de7c54dceca39c4 100644 --- a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/lofar2_unb2b_beamformer.vhd @@ -33,7 +33,6 @@ USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; USE common_lib.common_network_layers_pkg.ALL; USE common_lib.common_field_pkg.ALL; -USE technology_lib.technology_pkg.ALL; USE unb2b_board_lib.unb2b_board_pkg.ALL; USE unb2b_board_lib.unb2b_board_peripherals_pkg.ALL; USE diag_lib.diag_pkg.ALL; @@ -46,7 +45,6 @@ ENTITY lofar2_unb2b_beamformer IS GENERIC ( g_design_name : STRING := "lofar2_unb2b_beamformer"; g_design_note : STRING := "UNUSED"; - g_technology : NATURAL := c_tech_arria10_e1sg; g_buf_nof_data : NATURAL := 1024; g_sim : BOOLEAN := FALSE; --Overridden by TB g_sim_unb_nr : NATURAL := 0; @@ -404,7 +402,6 @@ BEGIN u_ctrl : ENTITY unb2b_board_lib.ctrl_unb2b_board GENERIC MAP ( g_sim => g_sim, - g_technology => g_technology, g_design_name => g_design_name, g_design_note => g_design_note, g_stamp_date => g_stamp_date, @@ -685,7 +682,6 @@ BEGIN ----------------------------------------------------------------------------- u_ait: ENTITY lofar2_unb2b_adc_lib.node_adc_input_and_timing GENERIC MAP( - g_technology => g_technology, g_nof_streams => c_sdp_S_pn, g_buf_nof_data => c_sdp_V_si_db, g_sim => g_sim @@ -957,7 +953,6 @@ BEGIN --------- u_tech_pll_xgmii_mac_clocks : ENTITY tech_pll_lib.tech_pll_xgmii_mac_clocks GENERIC MAP ( - g_technology => g_technology ) PORT MAP ( refclk_644 => SA_CLK, @@ -974,7 +969,6 @@ BEGIN --------------- u_nw_10GbE: ENTITY nw_10GbE_lib.nw_10GbE GENERIC MAP ( - g_technology => g_technology, g_sim => g_sim, g_sim_level => 1, g_nof_macs => c_nof_10GbE_offload_streams, diff --git a/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd b/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd index cc013d2f75c46079af825d5facdd4a7f7eab65d5..19aa1cc2ebfa6179eaff72afab98cf6bfed30f27 100644 --- a/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd @@ -32,7 +32,6 @@ USE IEEE.NUMERIC_STD.ALL; USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; USE common_lib.common_network_layers_pkg.ALL; -USE technology_lib.technology_pkg.ALL; USE unb2b_board_lib.unb2b_board_pkg.ALL; USE unb2b_board_lib.unb2b_board_peripherals_pkg.ALL; USE diag_lib.diag_pkg.ALL; @@ -46,7 +45,6 @@ ENTITY lofar2_unb2b_filterbank IS GENERIC ( g_design_name : STRING := "lofar2_unb2b_filterbank"; g_design_note : STRING := "UNUSED"; - g_technology : NATURAL := c_tech_arria10_e1sg; g_buf_nof_data : NATURAL := 1024; g_sim : BOOLEAN := FALSE; --Overridden by TB g_sim_unb_nr : NATURAL := 0; @@ -308,7 +306,6 @@ BEGIN u_ctrl : ENTITY unb2b_board_lib.ctrl_unb2b_board GENERIC MAP ( g_sim => g_sim, - g_technology => g_technology, g_design_name => g_design_name, g_design_note => g_design_note, g_stamp_date => g_stamp_date, @@ -583,7 +580,6 @@ BEGIN u_ait: ENTITY lofar2_unb2b_adc_lib.node_adc_input_and_timing GENERIC MAP( - g_technology => g_technology, g_nof_streams => c_sdp_S_pn, g_buf_nof_data => c_sdp_V_si_db, g_sim => g_sim diff --git a/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring.vhd b/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring.vhd index d973d94e1f5cc283462efc5533e5a15cd578eabc..61534f465ab069bcac9c59cce5b32c9c8ace3375 100644 --- a/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_ring/src/vhdl/lofar2_unb2b_ring.vhd @@ -33,7 +33,6 @@ USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; USE common_lib.common_network_layers_pkg.ALL; USE common_lib.common_field_pkg.ALL; -USE technology_lib.technology_pkg.ALL; USE unb2b_board_lib.unb2b_board_pkg.ALL; USE unb2b_board_lib.unb2b_board_peripherals_pkg.ALL; USE diag_lib.diag_pkg.ALL; @@ -49,7 +48,6 @@ ENTITY lofar2_unb2b_ring IS GENERIC ( g_design_name : STRING := "lofar2_unb2b_ring"; g_design_note : STRING := "UNUSED"; - g_technology : NATURAL := c_tech_arria10_e1sg; g_sim : BOOLEAN := FALSE; --Overridden by TB g_sim_sync_timeout : NATURAL := c_sdp_sim.sync_timeout; g_sim_unb_nr : NATURAL := c_sdp_sim.unb_nr; @@ -356,7 +354,6 @@ BEGIN u_ctrl : ENTITY unb2b_board_lib.ctrl_unb2b_board GENERIC MAP ( g_sim => g_sim, - g_technology => g_technology, g_design_name => g_design_name, g_design_note => g_design_note, g_stamp_date => g_stamp_date, @@ -952,7 +949,6 @@ BEGIN --------- u_tech_pll_xgmii_mac_clocks : ENTITY tech_pll_lib.tech_pll_xgmii_mac_clocks GENERIC MAP ( - g_technology => g_technology ) PORT MAP ( refclk_644 => SA_CLK, diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd index 3e7aea525e5bd1afc6569562ad4ed14aab8d3619..7125ea495c43d9e15914a4e8714c8b00444db0b3 100644 --- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd +++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd @@ -33,7 +33,6 @@ USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; USE common_lib.common_network_layers_pkg.ALL; USE common_lib.common_field_pkg.ALL; -USE technology_lib.technology_pkg.ALL; USE unb2b_board_lib.unb2b_board_pkg.ALL; USE unb2b_board_lib.unb2b_board_peripherals_pkg.ALL; USE diag_lib.diag_pkg.ALL; @@ -48,7 +47,6 @@ ENTITY lofar2_unb2b_sdp_station IS GENERIC ( g_design_name : STRING := "lofar2_unb2b_sdp_station"; g_design_note : STRING := "UNUSED"; - g_technology : NATURAL := c_tech_arria10_e1sg; g_sim : BOOLEAN := FALSE; --Overridden by TB g_sim_unb_nr : NATURAL := 0; g_sim_node_nr : NATURAL := 0; @@ -492,7 +490,6 @@ BEGIN u_ctrl : ENTITY unb2b_board_lib.ctrl_unb2b_board GENERIC MAP ( g_sim => g_sim, - g_technology => g_technology, g_design_name => g_design_name, g_design_note => g_design_note, g_stamp_date => g_stamp_date, @@ -806,7 +803,6 @@ BEGIN ----------------------------------------------------------------------------- u_sdp_station : ENTITY lofar2_sdp_lib.sdp_station GENERIC MAP ( - g_technology => c_tech_arria10_e1sg, g_sim => g_sim, g_wpfb => g_wpfb, g_bsn_nof_clk_per_sync => g_bsn_nof_clk_per_sync, diff --git a/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank.vhd b/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank.vhd index b27a6f16804f990a2abc76dbf98166ca1637369a..21a5bb91396650b2e045dfd88eea8f1d0db98a67 100644 --- a/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_filterbank/src/vhdl/lofar2_unb2c_filterbank.vhd @@ -31,7 +31,6 @@ USE IEEE.STD_LOGIC_1164.ALL; USE IEEE.NUMERIC_STD.ALL; USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; -USE technology_lib.technology_pkg.ALL; USE unb2c_board_lib.unb2c_board_pkg.ALL; USE unb2c_board_lib.unb2c_board_peripherals_pkg.ALL; USE diag_lib.diag_pkg.ALL; @@ -44,7 +43,6 @@ ENTITY lofar2_unb2c_filterbank IS GENERIC ( g_design_name : STRING := "lofar2_unb2c_filterbank"; g_design_note : STRING := "UNUSED"; - g_technology : NATURAL := c_tech_arria10_e2sg; g_buf_nof_data : NATURAL := 1024; g_sim : BOOLEAN := FALSE; --Overridden by TB g_sim_unb_nr : NATURAL := 0; @@ -267,7 +265,6 @@ BEGIN u_ctrl : ENTITY unb2c_board_lib.ctrl_unb2c_board GENERIC MAP ( g_sim => g_sim, - g_technology => g_technology, g_design_name => g_design_name, g_design_note => g_design_note, g_stamp_date => g_stamp_date, @@ -490,7 +487,6 @@ BEGIN u_ait: ENTITY lofar2_sdp_lib.node_adc_input_and_timing GENERIC MAP( - g_technology => g_technology, g_nof_streams => c_sdp_S_pn, g_buf_nof_data => c_sdp_ait_buf_nof_data_bsn, g_sim => g_sim diff --git a/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring.vhd b/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring.vhd index af7bae2dc1b9f67c5d5f411b80a32052b2d52260..791dc899b78f1a3f9be698c723303799ccd50453 100644 --- a/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_ring/src/vhdl/lofar2_unb2c_ring.vhd @@ -33,7 +33,6 @@ USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; USE common_lib.common_network_layers_pkg.ALL; USE common_lib.common_field_pkg.ALL; -USE technology_lib.technology_pkg.ALL; USE unb2c_board_lib.unb2c_board_pkg.ALL; USE unb2c_board_lib.unb2c_board_peripherals_pkg.ALL; USE diag_lib.diag_pkg.ALL; @@ -49,7 +48,6 @@ ENTITY lofar2_unb2c_ring IS GENERIC ( g_design_name : STRING := "lofar2_unb2c_ring"; g_design_note : STRING := "UNUSED"; - g_technology : NATURAL := c_tech_arria10_e2sg; g_sim : BOOLEAN := FALSE; --Overridden by TB g_sim_sync_timeout : NATURAL := c_sdp_sim.sync_timeout; g_sim_unb_nr : NATURAL := c_sdp_sim.unb_nr; @@ -340,7 +338,6 @@ BEGIN u_ctrl : ENTITY unb2c_board_lib.ctrl_unb2c_board GENERIC MAP ( g_sim => g_sim, - g_technology => g_technology, g_design_name => g_design_name, g_design_note => g_design_note, g_stamp_date => g_stamp_date, @@ -918,7 +915,6 @@ BEGIN --------- u_tech_pll_xgmii_mac_clocks : ENTITY tech_pll_lib.tech_pll_xgmii_mac_clocks GENERIC MAP ( - g_technology => g_technology ) PORT MAP ( refclk_644 => SA_CLK, diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd index b1aa7701e5f171c6446ab5ac22ca7631626e4ca5..10f769f2c53cd1e0047da0967e9b606b7db8aa51 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/lofar2_unb2c_sdp_station.vhd @@ -33,7 +33,6 @@ USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; USE common_lib.common_network_layers_pkg.ALL; USE common_lib.common_field_pkg.ALL; -USE technology_lib.technology_pkg.ALL; USE unb2c_board_lib.unb2c_board_pkg.ALL; USE unb2c_board_lib.unb2c_board_peripherals_pkg.ALL; USE diag_lib.diag_pkg.ALL; @@ -48,7 +47,6 @@ ENTITY lofar2_unb2c_sdp_station IS GENERIC ( g_design_name : STRING := "lofar2_unb2c_sdp_station"; g_design_note : STRING := "UNUSED"; - g_technology : NATURAL := c_tech_arria10_e2sg; g_sim : BOOLEAN := FALSE; --Overridden by TB g_sim_unb_nr : NATURAL := 0; g_sim_node_nr : NATURAL := 0; @@ -477,7 +475,6 @@ BEGIN u_ctrl : ENTITY unb2c_board_lib.ctrl_unb2c_board GENERIC MAP ( g_sim => g_sim, - g_technology => g_technology, g_design_name => g_design_name, g_design_note => g_design_note, g_stamp_date => g_stamp_date, @@ -773,7 +770,6 @@ BEGIN ----------------------------------------------------------------------------- u_sdp_station : ENTITY lofar2_sdp_lib.sdp_station GENERIC MAP ( - g_technology => g_technology, g_sim => g_sim, g_wpfb => g_wpfb, g_bsn_nof_clk_per_sync => g_bsn_nof_clk_per_sync, diff --git a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_adc_input_and_timing.vhd b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_adc_input_and_timing.vhd index 4bca947d2bf3d642596b9b977a21ca0e319f3620..3385a23efde0cc7e34935524e4677fd1f64eaac0 100644 --- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_adc_input_and_timing.vhd +++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_adc_input_and_timing.vhd @@ -31,15 +31,12 @@ USE IEEE.STD_LOGIC_1164.ALL; USE IEEE.NUMERIC_STD.ALL; USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; -USE technology_lib.technology_pkg.ALL; -USE technology_lib.technology_select_pkg.ALL; USE diag_lib.diag_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL; USE work.sdp_pkg.ALL; ENTITY node_sdp_adc_input_and_timing IS GENERIC ( - g_technology : NATURAL := c_tech_select_default; g_no_jesd : BOOLEAN := FALSE; g_buf_nof_data : NATURAL := c_sdp_V_si_db; g_bsn_nof_clk_per_sync : NATURAL := c_sdp_N_clk_per_sync; -- Default 200M, overide for short simulation @@ -437,7 +434,6 @@ BEGIN u_diag_data_buffer_bsn : ENTITY diag_lib.mms_diag_data_buffer GENERIC MAP ( - g_technology => g_technology, g_nof_streams => c_sdp_S_pn, g_data_w => c_sdp_W_adc, g_buf_nof_data => g_buf_nof_data, diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd index 66a11b4e304f6867f5a6ecc7b256b317515d3117..24a6503838c90c2394bda47eb15eaba244e5e5e9 100644 --- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd +++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_station.vhd @@ -33,7 +33,6 @@ USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; USE common_lib.common_network_layers_pkg.ALL; USE common_lib.common_field_pkg.ALL; -USE technology_lib.technology_pkg.ALL; USE diag_lib.diag_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL; USE wpfb_lib.wpfb_pkg.ALL; @@ -43,7 +42,6 @@ USE ring_lib.ring_pkg.ALL; ENTITY sdp_station IS GENERIC ( - g_technology : NATURAL := c_tech_arria10_e1sg; g_sim : BOOLEAN := FALSE; -- Overridden by TB g_sim_sdp : t_sdp_sim := c_sdp_sim; -- Used when g_sim = TRUE, otherwise use HW defaults g_sim_sync_timeout : NATURAL := 1024; @@ -603,7 +601,6 @@ BEGIN ----------------------------------------------------------------------------- u_ait: ENTITY work.node_sdp_adc_input_and_timing GENERIC MAP( - g_technology => g_technology, g_sim => g_sim, g_no_jesd => g_no_jesd, g_bsn_nof_clk_per_sync => g_bsn_nof_clk_per_sync @@ -1026,7 +1023,6 @@ BEGIN --------------- u_nw_10GbE: ENTITY nw_10GbE_lib.nw_10GbE GENERIC MAP ( - g_technology => g_technology, g_sim => g_sim, g_sim_level => 1, g_nof_macs => c_nof_10GbE_offload_streams, @@ -1319,9 +1315,6 @@ BEGIN -- PLL --------- u_tech_pll_xgmii_mac_clocks : ENTITY tech_pll_lib.tech_pll_xgmii_mac_clocks - GENERIC MAP ( - g_technology => g_technology - ) PORT MAP ( refclk_644 => SA_CLK, rst_in => mm_rst,