Skip to content
Snippets Groups Projects
Commit 6d9ae6f3 authored by Rocco Ardino's avatar Rocco Ardino :registered:
Browse files

Fix duplicated lines from rebase

parent 55d7a703
No related branches found
No related tags found
1 merge request!80Refactoring VCU128 project with "scouting pipelines" framework to allow multiple scouting sources on same board
...@@ -250,8 +250,6 @@ architecture Behavioral of bmtf_scouting_pipeline is ...@@ -250,8 +250,6 @@ architecture Behavioral of bmtf_scouting_pipeline is
signal rst_aligner : std_logic; signal rst_aligner : std_logic;
signal rst_aligner : std_logic;
signal disable_zs : std_logic := '0'; signal disable_zs : std_logic := '0';
signal disable_zs_hbm_sync : std_logic := '0'; signal disable_zs_hbm_sync : std_logic := '0';
signal disable_reshape : std_logic := '0'; signal disable_reshape : std_logic := '0';
......
...@@ -1134,9 +1134,6 @@ begin ...@@ -1134,9 +1134,6 @@ begin
---- HBM backpressure signal ---- HBM backpressure signal
HBM_almost_full => ugt_HBM_almost_full, HBM_almost_full => ugt_HBM_almost_full,
---- HBM backpressure signal
HBM_almost_full => ugt_HBM_almost_full,
---- input clocks ---- input clocks
clk_i2c => ena_clock_i2c, clk_i2c => ena_clock_i2c,
clk_ref => CLK_125MHz, clk_ref => CLK_125MHz,
...@@ -1256,9 +1253,6 @@ begin ...@@ -1256,9 +1253,6 @@ begin
---- HBM backpressure signal ---- HBM backpressure signal
HBM_almost_full => calo_HBM_almost_full, HBM_almost_full => calo_HBM_almost_full,
---- HBM backpressure signal
HBM_almost_full => calo_HBM_almost_full,
---- input clocks ---- input clocks
clk_i2c => ena_clock_i2c, clk_i2c => ena_clock_i2c,
clk_ref => CLK_125MHz, clk_ref => CLK_125MHz,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment