From 4ee946b3a08146f36c2bdf9c0ca98a212eaaed73 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Wed, 26 Jul 2017 18:23:52 +0200 Subject: [PATCH] Update TRB3sc pulser design --- pulser/config.vhd | 2 +- pulser/config_compile_frankfurt.pl | 8 ++++---- pulser/trb3sc_pulser.prj | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pulser/config.vhd b/pulser/config.vhd index 999ee03..b4000e6 100644 --- a/pulser/config.vhd +++ b/pulser/config.vhd @@ -23,7 +23,7 @@ package config is constant BROADCAST_SPECIAL_ADDR : std_logic_vector := x"61"; --set to 0 for backplane serdes, set to 3 for front SFP serdes - constant SERDES_NUM : integer := 0; + constant SERDES_NUM : integer := 3; constant INCLUDE_UART : integer := c_YES; constant INCLUDE_SPI : integer := c_YES; diff --git a/pulser/config_compile_frankfurt.pl b/pulser/config_compile_frankfurt.pl index 2e74381..4676048 100644 --- a/pulser/config_compile_frankfurt.pl +++ b/pulser/config_compile_frankfurt.pl @@ -1,9 +1,9 @@ TOPNAME => "trb3sc_pulser", -lm_license_file_for_synplify => "1702\@hadeb05.gsi.de", #"27000\@lxcad01.gsi.de"; +lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de"; lm_license_file_for_par => "1702\@hadeb05.gsi.de", -lattice_path => '/d/jspc29/lattice/diamond/3.6_x64', -synplify_path => '/d/jspc29/lattice/synplify/J-2014.09-SP2/', -synplify_command => "/d/jspc29/lattice/diamond/3.6_x64/bin/lin64/synpwrap -fg -options", +lattice_path => '/d/jspc29/lattice/diamond/3.9_x64/', +synplify_path => '/d/jspc29/lattice/synplify/J-2015.03-SP1/', +# synplify_command => "/d/jspc29/lattice/diamond/3.6_x64/bin/lin64/synpwrap -fg -options", #synplify_command => "/d/jspc29/lattice/synplify/J-2014.09-SP2/bin/synplify_premier_dp", nodelist_file => 'nodes_frankfurt.txt', diff --git a/pulser/trb3sc_pulser.prj b/pulser/trb3sc_pulser.prj index 2677343..e350e8e 100644 --- a/pulser/trb3sc_pulser.prj +++ b/pulser/trb3sc_pulser.prj @@ -92,6 +92,7 @@ add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x256_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x512_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x1k_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x2k_oreg.vhd" +add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x8k_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_9x2k_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp2m/fifo/fifo_var_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_19x16_obuf.vhd" @@ -115,7 +116,7 @@ add_file -vhdl -lib work "../../trbnet/special/uart_trans.vhd" add_file -vhdl -lib work "../../trbnet/special/spi_ltc2600.vhd" add_file -vhdl -lib work "../../trb3sc/code/load_settings.vhd" add_file -vhdl -lib work "../../trb3sc/code/spi_master_generic.vhd" -add_file -vhdl -lib work "../../trb3/base/code/input_to_trigger_logic.vhd" +add_file -vhdl -lib work "../../trb3/base/code/input_to_trigger_logic_record.vhd" add_file -vhdl -lib work "../../trb3/base/code/input_statistics.vhd" -- 2.43.0