From: Jan Michel Date: Fri, 27 Nov 2015 10:27:16 +0000 (+0100) Subject: Updating backplane master design, increasing region size for main media interface X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7162f6fab53d0c263c3c82792a61162937036467;p=trb3sc.git Updating backplane master design, increasing region size for main media interface --- diff --git a/backplanemaster/config.vhd b/backplanemaster/config.vhd index a01e403..eb775b4 100644 --- a/backplanemaster/config.vhd +++ b/backplanemaster/config.vhd @@ -51,8 +51,10 @@ package config is x"54", x"72", x"62", x"33", x"73", x"63", x"0a", x"0a", x"41", x"64", x"64", x"72", x"65", x"73", x"73", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"80", x"0a", + x"55", x"49", x"44", x"20", x"20", x"89", x"88", x"87", x"86", x"0a", x"43", x"6f", x"6d", x"70", x"69", x"6c", x"65", x"54", x"69", x"6d", x"65", x"20", x"20", x"84", x"83", x"0a", x"54", x"69", x"6d", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"20", x"82", x"81", x"0a", + x"54", x"65", x"6d", x"70", x"65", x"72", x"61", x"74", x"75", x"72", x"65", x"20", x"20", x"20", x"20", x"20", x"20", x"85", x"0a", others => x"00"); diff --git a/backplanemaster/config_compile_frankfurt.pl b/backplanemaster/config_compile_frankfurt.pl index 6f2c88f..1527acf 100644 --- a/backplanemaster/config_compile_frankfurt.pl +++ b/backplanemaster/config_compile_frankfurt.pl @@ -1,9 +1,9 @@ TOPNAME => "trb3sc_master", lm_license_file_for_synplify => "1702\@hadeb05.gsi.de", #"27000\@lxcad01.gsi.de"; lm_license_file_for_par => "1702\@hadeb05.gsi.de", -lattice_path => '/d/jspc29/lattice/diamond/3.5_x64', +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.5_x64/bin/lin64/synpwrap -fg -options", +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", nodelist_file => 'nodelist_frankfurt.txt', @@ -12,7 +12,7 @@ nodelist_file => 'nodelist_frankfurt.txt', #Include only necessary lpf files #pinout_file => '', #name of pin-out file, if not equal TOPNAME include_TDC => 0, -include_GBE => 0, +include_GBE => 1, #Report settings firefox_open => 0, diff --git a/backplanemaster/config_compile_gsi.pl b/backplanemaster/config_compile_gsi.pl index 29d7ee3..3a8db8d 100644 --- a/backplanemaster/config_compile_gsi.pl +++ b/backplanemaster/config_compile_gsi.pl @@ -1,7 +1,7 @@ -TOPNAME => "trb3sc_basic", +TOPNAME => "trb3sc_master", lm_license_file_for_synplify => "27000\@lxcad01.gsi.de", lm_license_file_for_par => "1702\@hadeb05.gsi.de", -lattice_path => '/opt/lattice/diamond/3.4_x64/', +lattice_path => '/opt/lattice/diamond/3.6_x64/', synplify_path => '/opt/synplicity/J-2014.09-SP2', #synplify_command => "/opt/lattice/diamond/3.4_x64/bin/lin64/synpwrap -fg -options", synplify_command => "/opt/synplicity/K-2015.09/bin/synplify_premier_dp", @@ -10,4 +10,8 @@ nodelist_file => 'nodelist_gsi_template.txt', firefox_open => 0, +include_GBE => 1, +#Report settings +firefox_open => 0, +twr_number_of_errors => 20, \ No newline at end of file diff --git a/backplanemaster/trb3sc_master.vhd b/backplanemaster/trb3sc_master.vhd index 22b2f49..0adf5fd 100644 --- a/backplanemaster/trb3sc_master.vhd +++ b/backplanemaster/trb3sc_master.vhd @@ -634,7 +634,10 @@ end generate; lcd_data(15 downto 0) <= timer.network_address; lcd_data(47 downto 16) <= timer.microsecond; lcd_data(79 downto 48) <= std_logic_vector(to_unsigned(VERSION_NUMBER_TIME,32)); - lcd_data(511 downto 80) <= (others => '0'); + lcd_data(91 downto 80) <= timer.temperature; + lcd_data(95 downto 92) <= x"0"; + lcd_data(159 downto 96) <= mc_unique_id; + lcd_data(511 downto 160) <= (others => '0'); --------------------------------------------------------------------------- -- Backplane diff --git a/pinout/basic_constraints.lpf b/pinout/basic_constraints.lpf index 8783dea..2bc77d8 100644 --- a/pinout/basic_constraints.lpf +++ b/pinout/basic_constraints.lpf @@ -48,7 +48,7 @@ FREQUENCY NET "THE_MEDIA_INTERFACE/clk_tx_full" 200 MHz; # HOLD_MARGIN 500 ps LOCATE COMP "THE_MEDIA_INTERFACE/gen_pcs0.THE_SERDES/PCSD_INST" SITE "PCSA" ; LOCATE COMP "THE_MEDIA_INTERFACE/gen_pcs3.THE_SERDES/PCSD_INST" SITE "PCSB" ; -REGION "MEDIA_UPLINK" "R96C107D" 19 24; +REGION "MEDIA_UPLINK" "R95C50D" 20 70; LOCATE UGROUP "THE_MEDIA_INTERFACE/media_interface_group" REGION "MEDIA_UPLINK" ; BLOCK PATH TO PORT "LED*";