From: Jan Michel Date: Tue, 24 Jan 2017 17:35:10 +0000 (+0100) Subject: A bit of clean-up in the repo X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=e247d045bafaa1d6a4b87c851a00f297275061b0;p=trb3.git A bit of clean-up in the repo --- diff --git a/.gitignore b/.gitignore index 6b8589c..d7cc176 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ work licbug.txt **/*workdir **/diamond +config_compile.pl diff --git a/32PinAddOn/config_compile.pl b/32PinAddOn/config_compile.pl deleted file mode 120000 index 67b86a0..0000000 --- a/32PinAddOn/config_compile.pl +++ /dev/null @@ -1 +0,0 @@ -config_compile_gsi.pl \ No newline at end of file diff --git a/32PinAddOn/config_compile_frankfurt.pl b/32PinAddOn/config_compile_frankfurt.pl new file mode 100644 index 0000000..8bf794b --- /dev/null +++ b/32PinAddOn/config_compile_frankfurt.pl @@ -0,0 +1,21 @@ +TOPNAME => "trb3_periph_32PinAddOn", +project_path => "32PinAddOn", +lm_license_file_for_synplify => "1702\@jspc29", #"27000\@lxcad01.gsi.de"; +lm_license_file_for_par => "1702\@jspc29", +lattice_path => '/d/jspc29/lattice/diamond/3.7_x64', +synplify_path => '/d/jspc29/lattice/synplify/K-2015.09/', +# 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", +synplify_command => "ssh -p 52238 jmichel\@cerberus \"cd /home/jmichel/git/trb3/32PinAddOn/workdir; LM_LICENSE_FILE=27000\@lxcad01.gsi.de /opt/synplicity/K-2015.09/bin/synplify_premier_dp -batch ../trb3_periph_32PinAddOn.prj\" #", + + +nodelist_file => '../nodes_lxhadeb07.txt', +par_options => '../../base/trb3_periph.p2t', + +#Include only necessary lpf files +include_TDC => 1, +include_GBE => 0, + +#Report settings +firefox_open => 0, +twr_number_of_errors => 20, diff --git a/blank/config_compile_frankfurt.pl b/blank/config_compile_frankfurt.pl index 9465dc1..9f8f8e0 100644 --- a/blank/config_compile_frankfurt.pl +++ b/blank/config_compile_frankfurt.pl @@ -1,9 +1,9 @@ TOPNAME => "trb3_periph_blank", -lm_license_file_for_synplify => "1702\@jspc29", #"27000\@lxcad01.gsi.de"; +lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de"; lm_license_file_for_par => "1702\@jspc29", -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.8_x64', +synplify_path => '/d/jspc29/lattice/synplify/L-2016.09-1/', +#synplify_command => "/d/jspc29/lattice/diamond/3.6_x64/bin/bin64/synpwrap -fg -options", #synplify_command => "/d/jspc29/lattice/synplify/J-2014.09-SP2/bin/synplify_premier_dp", nodelist_file => 'nodes_frankfurt.txt', @@ -21,4 +21,4 @@ twr_number_of_errors => 20, Familyname => 'LatticeECP3', Devicename => 'LFE3-150EA', Package => 'FPBGA672', -Speedgrade => '8', \ No newline at end of file +Speedgrade => '8', diff --git a/blank/project/trb3_periph_blank.ldf b/blank/project/trb3_periph_blank.ldf index 99c006b..d4d9373 100644 --- a/blank/project/trb3_periph_blank.ldf +++ b/blank/project/trb3_periph_blank.ldf @@ -1,107 +1,299 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blank/trb3_periph_blank.prj b/blank/trb3_periph_blank.prj index 1d97dbc..a440e07 100644 --- a/blank/trb3_periph_blank.prj +++ b/blank/trb3_periph_blank.prj @@ -132,6 +132,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_19x16_obuf.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" diff --git a/trb3_gbe/config_compile.pl b/trb3_gbe/config_compile.pl deleted file mode 120000 index 4d057e6..0000000 --- a/trb3_gbe/config_compile.pl +++ /dev/null @@ -1 +0,0 @@ -./config_compile_gsi.pl \ No newline at end of file