From: Jan Michel <j.michel@gsi.de>
Date: Fri, 5 Jun 2015 12:42:13 +0000 (+0200)
Subject: updated periph_hub for new Diamond 3.4
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0d9fa1982e20a61fa6dfe9405040594d47ee8ad7;p=trb3.git

updated periph_hub for new Diamond 3.4
---

diff --git a/hub/compile_periph_frankfurt.pl b/hub/compile_periph_frankfurt.pl
index 2c8f190..96c0a51 100755
--- a/hub/compile_periph_frankfurt.pl
+++ b/hub/compile_periph_frankfurt.pl
@@ -9,10 +9,11 @@ use strict;
 ###################################################################################
 #Settings for this project
 my $TOPNAME                      = "trb3_periph_hub";  #Name of top-level entity
-my $lattice_path                 = '/d/jspc29/lattice/diamond/3.2_x64';
-my $synplify_path                = '/d/jspc29/lattice/synplify/I-2013.09-SP1/';
-my $lm_license_file_for_synplify = "27000\@lxcad01.gsi.de";
+my $lm_license_file_for_synplify = "1702\@hadeb05.gsi.de"; #"27000\@lxcad01.gsi.de";
 my $lm_license_file_for_par      = "1702\@hadeb05.gsi.de";
+
+my $lattice_path                 = '/d/jspc29/lattice/diamond/3.4_x64';
+my $synplify_path                = '/d/jspc29/lattice/synplify/J-2014.09-SP2/';
 ###################################################################################
 
 
@@ -69,7 +70,7 @@ $fh->close;
 system("env| grep LM_");
 my $r = "";
 
-my $c="$synplify_path/bin/synplify_premier_dp -batch $TOPNAME.prj";
+my $c="$lattice_path/bin/lin64/synpwrap -fg -options -batch $TOPNAME.prj";
 $r=execute($c, "do_not_exit" );
 
 
diff --git a/hub/trb3_periph_hub.p2t b/hub/trb3_periph_hub.p2t
index 995161f..653d919 100644
--- a/hub/trb3_periph_hub.p2t
+++ b/hub/trb3_periph_hub.p2t
@@ -1,7 +1,7 @@
 -w
 -i 15
 -l 5
--n 1
+-n 2
 -y
 -s 12
 -t 11
diff --git a/hub/trb3_periph_hub.vhd b/hub/trb3_periph_hub.vhd
index 938c2b2..fc67a5a 100644
--- a/hub/trb3_periph_hub.vhd
+++ b/hub/trb3_periph_hub.vhd
@@ -257,6 +257,7 @@ begin
   THE_MAIN_PLL : pll_in200_out100
     port map(
       CLK   => CLK_GPLL_RIGHT,
+      RESET => '0',
       CLKOP => clk_100_internal,
       CLKOK => clk_200_internal,
       LOCK  => pll_lock