tidy up

diff --git a/32PinAddOn/compile_periph_gsi.pl b/32PinAddOn/compile_periph_gsi.pl
index 7d9cd833faa7f1a75fa986867dba10dbf44625b2..82fe6c4a4a71873ec7a51c8e17f1d2fe6541bf76 100755 (executable)
--- a/32PinAddOn/compile_periph_gsi.pl
+++ b/32PinAddOn/compile_periph_gsi.pl
@@ -100,6 +100,7 @@ system("ln -sfT $lattice_path $WORKDIR/lattice-diamond");
 system("cp ../base/$TOPNAME.lpf $WORKDIR/$TOPNAME.lpf");
 system("cat currentRelease/trbnet_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
 system("cat currentRelease/tdc_constraints_64.lpf >> $WORKDIR/$TOPNAME.lpf");
+system("cat currentRelease/unimportant_lines_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
 system("cat unimportant_lines_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
 
 
@@ -252,10 +253,10 @@ if($timing==1 || $all==1){
     execute($c);
 
     # TWR Timing Report
-    $c=qq|trce -c -v 15 -o "$TOPNAME.twr.setup" "$TOPNAME.ncd" "$TOPNAME.prf"|;
+    $c=qq|trce -c -v 65 -o "$TOPNAME.twr.setup" "$TOPNAME.ncd" "$TOPNAME.prf"|;
     execute($c);
     
-    $c=qq|trce -hld -c -v 5 -o "$TOPNAME.twr.hold" "$TOPNAME.ncd" "$TOPNAME.prf"|;
+    $c=qq|trce -hld -c -v 65 -o "$TOPNAME.twr.hold" "$TOPNAME.ncd" "$TOPNAME.prf"|;
     execute($c);
     
     $c=qq|ltxt2ptxt $TOPNAME.ncd|;

diff --git a/hadesstart/trb3_periph_hadesstart.vhd b/hadesstart/trb3_periph_hadesstart.vhd
index b64c8e2373ecb35abd4beeb2dc9a17ef1522617c..70cc320236aa52e69eafcce30ab1309c155991ca 100644 (file)
--- a/hadesstart/trb3_periph_hadesstart.vhd
+++ b/hadesstart/trb3_periph_hadesstart.vhd
@@ -822,8 +822,8 @@ begin
 -- Test Connector - Logic Analyser
 ---------------------------------------------------------------------------
 
---   TEST_LINE <= logic_analyser_i;
-  TEST_LINE(15 downto 12) <= (others => '0');
+--  TEST_LINE <= logic_analyser_i;
+  TEST_LINE <= (others => '0');
 
 -------------------------------------------------------------------------------
 -- TDC

diff --git a/wasa/compile_periph_gsi.pl b/wasa/compile_periph_gsi.pl
index f84a4bdb23ac253a6e973a226a5622a112c4e03a..0ebaa096958f89763d1e43a6b76bcd96a5723d5f 100755 (executable)
--- a/wasa/compile_periph_gsi.pl
+++ b/wasa/compile_periph_gsi.pl
@@ -11,9 +11,6 @@ my $TOPNAME                      = "trb3_periph_padiwa";  #Name of top-level ent
 my $lattice_path                 = '/opt/lattice/diamond/3.0_x64/';
 my $lattice_bin_path             = "$lattice_path/bin/lin64"; # note the lin/lin64 at the end, no isfgpa needed
 my $synplify_path                = '/opt/synplicity/I-2013.09-SP1'; 
-#my $lattice_path                 = '/opt/lattice/diamond/2.01/';
-#my $lattice_bin_path             = "$lattice_path/bin/lin"; # note the lin/lin64 at the end, no isfgpa needed
-#my $synplify_path                = '/opt/synplicity/F-2012.03-SP1';
 my $lm_license_file_for_synplify = "27000\@lxcad01.gsi.de";
 my $lm_license_file_for_par      = "1702\@hadeb05.gsi.de";
 ###################################################################################
@@ -100,8 +97,10 @@ system("ln -sfT $lattice_path $WORKDIR/lattice-diamond");
 system("cp ../base/$TOPNAME.lpf $WORKDIR/$TOPNAME.lpf");
 system("cat currentRelease/trbnet_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
 system("cat currentRelease/tdc_constraints_64.lpf >> $WORKDIR/$TOPNAME.lpf");
+system("cat currentRelease/unimportant_lines_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
 system("cat unimportant_lines_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
 
+
 #generate timestamp
 my $t=time;
 my $fh = new FileHandle(">version.vhd");
@@ -251,21 +250,20 @@ if($timing==1 || $all==1){
     execute($c);
 
     # TWR Timing Report
-    $c=qq|trce -c -v 15 -o "$TOPNAME.twr.setup" "$TOPNAME.ncd" "$TOPNAME.prf"|;
-    execute($c);
-    
-    $c=qq|trce -hld -c -v 5 -o "$TOPNAME.twr.hold" "$TOPNAME.ncd" "$TOPNAME.prf"|;
+    $c=qq|trce -c -v 65 -o "$TOPNAME.twr.setup" "$TOPNAME.ncd" "$TOPNAME.prf"|;
     execute($c);
     
-    $c=qq|ltxt2ptxt $TOPNAME.ncd|;
+    $c=qq|trce -hld -c -v 65 -o "$TOPNAME.twr.hold" "$TOPNAME.ncd" "$TOPNAME.prf"|;
     execute($c);
-    
+
     my $c="cat $TOPNAME.par";
     system($c);
-
 }
-
+    
 if($bitgen==1 || $all==1){
+    $c=qq|ltxt2ptxt $TOPNAME.ncd|;
+    execute($c);
+
     $c=qq|bitgen -w -g CfgMode:Disable -g RamCfg:Reset -g ES:No $TOPNAME.ncd $TOPNAME.bit $TOPNAME.prf|;
     # $c=qq|$lattice_path/ispfpga/bin/lin/bitgen -w "$TOPNAME.ncd" "$TOPNAME.prf"|;
     execute($c);