CTS: Adapted more to Frankfurt compile script...previous settings generated broken...

diff --git a/cts/compile_central_gsi.pl b/cts/compile_central_gsi.pl
index 664ad7085f5e1654d7e1bd5e02eeabf04732b1a5..b41d9e8d4bed56b0165a901a8cf922c1053b5752 100755 (executable)
--- a/cts/compile_central_gsi.pl
+++ b/cts/compile_central_gsi.pl
@@ -10,7 +10,7 @@ use FileHandle;
 ###################################################################################
 #Settings for this project
 my $TOPNAME                      = "trb3_central";  #Name of top-level entity
-my $lattice_path                 = '/opt/lattice/diamond/2.2_x64';
+my $lattice_path                 = '/opt/lattice/diamond/2.1_x64';
 my $lattice_bin_path             = "$lattice_path/bin/lin64"; # 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';
@@ -45,6 +45,7 @@ my $SPEEDGRADE="8";
 my $WORKDIR = "workdir";
 unless(-d $WORKDIR) {
   mkdir $WORKDIR or die "can't create workdir '$WORKDIR': $!";
+  system ("cd workdir; ../../base/linkdesignfiles.sh; cd ..;");
 }
 
 system("ln -sfT $lattice_path $WORKDIR/lattice-diamond");

diff --git a/cts/config_mainz_a2.vhd b/cts/config_mainz_a2.vhd
index 12b5bdfb8a553308ce86cbf0a05ac1f45048b9ec..96a10b297779ca90b27bf53a6bfebf82d09e7e2e 100644 (file)
--- a/cts/config_mainz_a2.vhd
+++ b/cts/config_mainz_a2.vhd
@@ -30,6 +30,18 @@ package config is
 
 
 
+   
+--Ports:
+--        LVL1/IPU       SCtrl
+--  0     FPGA 1         FPGA 1
+--  1     FPGA 2         FPGA 2
+--  2     FPGA 3         FPGA 3
+--  3     FPGA 4         FPGA 4
+--  4     opt. link      opt. link
+--  5-7   SFP 2-4
+--  5(8)  CTS read-out   internal         0 1 -   X X O   --downlink only
+--  6(9)  CTS TRG        Sctrl GbE        2 3 4   X X X   --uplink only
+
 
     
  
@@ -40,8 +52,8 @@ package config is
     type hub_mii_t is array(0 to 1) of integer;    
     type hub_ct    is array(0 to 16) of integer;
     type hub_cfg_t is array(0 to 1) of hub_ct;    
-    type hw_info_t is array(0 to 1) of std_logic_vector(31 downto 0);    
-
+    type hw_info_t is array(0 to 1) of std_logic_vector(31 downto 0);
+    
   --this is used to select the proper configuration in the main code    
     constant CFG_MODE : integer;
     
@@ -51,19 +63,19 @@ package config is
     constant INTERNAL_NUM_ARR     : hub_mii_t := (5,5);
     constant INTERFACE_NUM_ARR    : hub_mii_t := (5,8);
     constant IS_UPLINK_ARR        : hub_cfg_t := ((0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0),
-                                                  (0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0));
+                                                  (0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0));
     constant IS_DOWNLINK_ARR      : hub_cfg_t := ((1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0),
-                                                  (1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0));
+                                                  (1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0));
     constant IS_UPLINK_ONLY_ARR   : hub_cfg_t := ((0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0),
-                                                  (0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0)); 
-    constant HARDWARE_INFO_ARR    : hw_info_t := (x"9000CEE0",x"9000CEE2");                           
+                                                  (0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0)); 
+    constant HARDWARE_INFO_ARR    : hw_info_t := (x"9000CEE0",x"9000CEE2");
                           
     constant INTERNAL_NUM         : integer;
     constant INTERFACE_NUM        : integer;
     constant IS_UPLINK            : hub_ct;
     constant IS_DOWNLINK          : hub_ct;
     constant IS_UPLINK_ONLY       : hub_ct;
-    constant HARDWARE_INFO        : std_logic_vector(31 downto 0);    
+    constant HARDWARE_INFO        : std_logic_vector(31 downto 0);
     
     -- MII_NUMBER        => 5, --(8)
     -- INT_NUMBER        => 5,