From be71db59ca26565c8043944a2058a66cce242a75 Mon Sep 17 00:00:00 2001 From: Eric Kooistra <kooistra@astron.nl> Date: Tue, 23 Nov 2021 11:49:51 +0100 Subject: [PATCH] Remove unused I2C busses. Connect dual eth_clk. --- .../tb/vhdl/tb_lofar2_unb2c_sdp_station.vhd | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/tb/vhdl/tb_lofar2_unb2c_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/tb/vhdl/tb_lofar2_unb2c_sdp_station.vhd index a4546f6914..5e4731f8ef 100644 --- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/tb/vhdl/tb_lofar2_unb2c_sdp_station.vhd +++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/tb/vhdl/tb_lofar2_unb2c_sdp_station.vhd @@ -101,14 +101,10 @@ ARCHITECTURE tb OF tb_lofar2_unb2c_sdp_station IS SIGNAL INTB : STD_LOGIC; SIGNAL eth_clk : STD_LOGIC := '0'; + SIGNAL eth_clk_slv : STD_LOGIC_VECTOR(c_unb2c_board_nof_eth-1 downto 0); SIGNAL eth_txp : STD_LOGIC_VECTOR(c_unb2c_board_nof_eth-1 downto 0); SIGNAL eth_rxp : STD_LOGIC_VECTOR(c_unb2c_board_nof_eth-1 downto 0); - SIGNAL sens_scl : STD_LOGIC; - SIGNAL sens_sda : STD_LOGIC; - SIGNAL pmbus_scl : STD_LOGIC; - SIGNAL pmbus_sda : STD_LOGIC; - -- back transceivers SIGNAL JESD204B_SERIAL_DATA : STD_LOGIC_VECTOR((c_unb2c_board_tr_jesd204b.bus_w * c_unb2c_board_tr_jesd204b.nof_bus)-1 downto 0); SIGNAL JESD204B_REFCLK : STD_LOGIC := '1'; @@ -124,14 +120,11 @@ BEGIN eth_clk <= (NOT eth_clk) OR tb_end AFTER c_eth_clk_period/2; -- Ethernet ref clock (125 MHz) JESD204B_REFCLK <= (NOT JESD204B_REFCLK) OR tb_end AFTER c_bck_ref_clk_period/2; -- JESD sample clock (200MHz) + eth_clk_slv <= (OTHERS => eth_clk); + INTA <= 'H'; -- pull up INTB <= 'H'; -- pull up - sens_scl <= 'H'; -- pull up - sens_sda <= 'H'; -- pull up - pmbus_scl <= 'H'; -- pull up - pmbus_sda <= 'H'; -- pull up - -- External PPS proc_common_gen_pulse(10, c_pps_period, '1', pps_rst, ext_clk, pps); jesd204b_sysref <= pps; @@ -161,16 +154,8 @@ BEGIN ID => c_id, TESTIO => open, - -- I2C Interface to Sensors - SENS_SC => sens_scl, - SENS_SD => sens_sda, - - PMBUS_SC => pmbus_scl, - PMBUS_SD => pmbus_sda, - PMBUS_ALERT => open, - -- 1GbE Control Interface - ETH_CLK => eth_clk, + ETH_CLK => eth_clk_slv, ETH_SGIN => eth_rxp, ETH_SGOUT => eth_txp, -- GitLab