From: Jan Michel <j.michel@gsi.de>
Date: Tue, 26 Jul 2016 14:34:59 +0000 (+0200)
Subject: change media interface clocks for non-synchronous clock w.r.t uplink
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=26f87c600b841cd0c3cd69f6d16f6b8dbc308bb4;p=dirich.git

change media interface clocks for non-synchronous clock w.r.t uplink
---

diff --git a/combiner/combiner.vhd b/combiner/combiner.vhd
index 68be4c0..6493c44 100644
--- a/combiner/combiner.vhd
+++ b/combiner/combiner.vhd
@@ -217,7 +217,7 @@ THE_MEDIA_4_DOWN_A : entity work.med_ecp3_sfp_sync_4
     IS_USED         => (c_YES,c_YES,c_YES,c_YES)
     )
   port map(
-    CLK_REF_FULL       => med2int(0).clk_full,
+    CLK_REF_FULL       => clk_full_osc, --med2int(0).clk_full,
     CLK_INTERNAL_FULL  => clk_full_osc,
     SYSCLK             => clk_sys,
     RESET              => reset_i,
@@ -269,7 +269,7 @@ THE_MEDIA_4_DOWN_B : entity work.med_ecp3_sfp_sync_4
     IS_USED         => (c_YES,c_YES,c_YES,c_YES)
     )
   port map(
-    CLK_REF_FULL       => med2int(0).clk_full,
+    CLK_REF_FULL       => clk_full_osc, --med2int(0).clk_full,
     CLK_INTERNAL_FULL  => clk_full_osc,
     SYSCLK             => clk_sys,
     RESET              => reset_i,
@@ -321,7 +321,7 @@ THE_MEDIA_4_DOWN_D : entity work.med_ecp3_sfp_sync_4
     IS_USED         => (c_YES,c_YES,c_YES,c_YES)
     )
   port map(
-    CLK_REF_FULL       => med2int(0).clk_full,
+    CLK_REF_FULL       => clk_full_osc, --med2int(0).clk_full,
     CLK_INTERNAL_FULL  => clk_full_osc,
     SYSCLK             => clk_sys,
     RESET              => reset_i,
@@ -549,6 +549,7 @@ end generate;
 
   TRIGGER_SEL_OUT <= trigger_select_i;
   BACK_LDO_EN <= enable_ldo_i;
+  BACK_SPARE <= (others => '1'); --this is programn on dirich!
   
 ---------------------------------------------------------------------------
 -- LCD Data to display
diff --git a/combiner/config_compile_frankfurt.pl b/combiner/config_compile_frankfurt.pl
index b0817b7..8e9c749 100644
--- a/combiner/config_compile_frankfurt.pl
+++ b/combiner/config_compile_frankfurt.pl
@@ -1,9 +1,9 @@
 TOPNAME                      => "combiner",
-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.7_x64',
 synplify_path                => '/d/jspc29/lattice/synplify/K-2015.09/',
-synplify_command             => "/d/jspc29/lattice/diamond/3.7_x64/bin/lin64/synpwrap -fg -options",
+# synplify_command             => "/d/jspc29/lattice/diamond/3.7_x64/bin/lin64/synpwrap -fg -options",
 #synplify_command             => "/d/jspc29/lattice/synplify/J-2014.09-SP2/bin/synplify_premier_dp",
 
 nodelist_file                => 'nodelist_frankfurt.txt',