Skip to content
Snippets Groups Projects
Commit 4bfb1f42 authored by Eric Kooistra's avatar Eric Kooistra
Browse files

On hardware always generate 1GbE for MM control. In simulation only use 1GbE...

On hardware always generate 1GbE for MM control. In simulation only use 1GbE for streaming DP data offload (or on load) via 1GbE.
parent c9aa70cc
No related branches found
No related tags found
No related merge requests found
...@@ -265,8 +265,6 @@ ARCHITECTURE str OF ctrl_unb2_board IS ...@@ -265,8 +265,6 @@ ARCHITECTURE str OF ctrl_unb2_board IS
SIGNAL clk50 : STD_LOGIC := '1'; SIGNAL clk50 : STD_LOGIC := '1';
SIGNAL mm_wdi : STD_LOGIC; SIGNAL mm_wdi : STD_LOGIC;
SIGNAL eth1g_st_clk : STD_LOGIC;
SIGNAL eth1g_st_rst : STD_LOGIC;
SIGNAL mm_pulse_ms : STD_LOGIC; SIGNAL mm_pulse_ms : STD_LOGIC;
SIGNAL mm_pulse_s : STD_LOGIC; SIGNAL mm_pulse_s : STD_LOGIC;
...@@ -463,7 +461,7 @@ BEGIN ...@@ -463,7 +461,7 @@ BEGIN
u_unb2_board_node_ctrl : ENTITY work.unb2_board_node_ctrl u_unb2_board_node_ctrl : ENTITY work.unb2_board_node_ctrl
GENERIC MAP ( GENERIC MAP (
g_pulse_us => g_mm_clk_freq / (10**6) -- nof system clock cycles to get us period, equal to system clock frequency / 10**6 g_pulse_us => g_mm_clk_freq / (10**6) -- nof system clock cycles to get us period, equal to system clock frequency / 10**6
) )
PORT MAP ( PORT MAP (
-- MM clock domain reset -- MM clock domain reset
...@@ -743,27 +741,24 @@ BEGIN ...@@ -743,27 +741,24 @@ BEGIN
END GENERATE; END GENERATE;
wire_udp_offload: FOR i IN 0 TO g_udp_offload_nof_streams-1 GENERATE
gen_same_clk: IF g_udp_offload=TRUE GENERATE eth1g_udp_tx_sosi_arr(i) <= udp_tx_sosi_arr(i);
eth1g_st_clk <= dp_clk_in; udp_tx_siso_arr(i) <= eth1g_udp_tx_siso_arr(i);
eth1g_st_rst <= dp_rst_in;
gen_offload_io: FOR i IN 0 TO g_udp_offload_nof_streams-1 GENERATE
eth1g_udp_tx_sosi_arr(i) <= udp_tx_sosi_arr(i);
udp_tx_siso_arr(i) <= eth1g_udp_tx_siso_arr(i);
udp_rx_sosi_arr(i) <= eth1g_udp_rx_sosi_arr(i); udp_rx_sosi_arr(i) <= eth1g_udp_rx_sosi_arr(i);
eth1g_udp_rx_siso_arr(i) <= udp_rx_siso_arr(i); eth1g_udp_rx_siso_arr(i) <= udp_rx_siso_arr(i);
END GENERATE;
END GENERATE; END GENERATE;
gen_separate_clk: IF g_udp_offload=FALSE GENERATE -- In simulation use file IO for MM control. In simulation only use 1GbE for streaming DP data offload (or on load) via 1GbE.
eth1g_st_clk <= i_mm_clk; no_eth1g : IF g_sim=TRUE AND g_udp_offload=FALSE GENERATE
eth1g_st_rst <= eth1g_mm_rst; eth1g_reg_interrupt <= '0';
eth1g_tse_miso <= c_mem_miso_rst;
eth1g_reg_miso <= c_mem_miso_rst;
eth1g_ram_miso <= c_mem_miso_rst;
END GENERATE; END GENERATE;
--On hardware always generate 1GbE for MM control. In simulation only use 1GbE for streaming DP data offload (or on load) via 1GbE.
-- gen_eth: IF g_sim = FALSE GENERATE gen_eth: IF g_sim=FALSE OR g_udp_offload=TRUE GENERATE
u_eth : ENTITY eth_lib.eth u_eth : ENTITY eth_lib.eth
GENERIC MAP ( GENERIC MAP (
g_technology => g_technology, g_technology => g_technology,
...@@ -775,8 +770,8 @@ BEGIN ...@@ -775,8 +770,8 @@ BEGIN
mm_rst => eth1g_mm_rst, -- use reset from QSYS mm_rst => eth1g_mm_rst, -- use reset from QSYS
mm_clk => i_mm_clk, -- use mm_clk direct mm_clk => i_mm_clk, -- use mm_clk direct
eth_clk => i_tse_clk, -- 125 MHz clock eth_clk => i_tse_clk, -- 125 MHz clock
st_rst => eth1g_st_rst, st_rst => dp_rst_in,
st_clk => eth1g_st_clk, st_clk => dp_clk_in,
-- UDP transmit interface -- UDP transmit interface
udp_tx_snk_in_arr => eth1g_udp_tx_sosi_arr, udp_tx_snk_in_arr => eth1g_udp_tx_sosi_arr,
...@@ -801,6 +796,6 @@ BEGIN ...@@ -801,6 +796,6 @@ BEGIN
-- LED interface -- LED interface
tse_led => eth1g_led tse_led => eth1g_led
); );
-- END GENERATE; END GENERATE;
END str; END str;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment