From 0f79893e879ad2e164fc032c4389f79bb0857752 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Thu, 6 Mar 2014 10:51:47 +0100 Subject: [PATCH] added no-ctc mode for testing --- central_hub2/compile_central_frankfurt.pl | 4 ++-- central_hub2/trb3_central.p2t | 2 +- central_hub2/trb3_central.prj | 1 + central_hub2/trb3_central.vhd | 9 +++++---- central_hub2/trb3_central_constraints.lpf | 10 +++++----- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/central_hub2/compile_central_frankfurt.pl b/central_hub2/compile_central_frankfurt.pl index 543616c..9839067 100755 --- a/central_hub2/compile_central_frankfurt.pl +++ b/central_hub2/compile_central_frankfurt.pl @@ -10,8 +10,8 @@ use strict; #Settings for this project my $TOPNAME = "trb3_central"; #Name of top-level entity my $BasePath = "../base/"; #path to "base" directory -my $lattice_path = '/d/jspc29/lattice/diamond/2.2_x64'; -my $synplify_path = '/d/jspc29/lattice/synplify/F-2012.03-SP1/'; +my $lattice_path = '/d/jspc29/lattice/diamond/3.0_x64'; +my $synplify_path = '/d/jspc29/lattice/synplify/I-2013.09-SP1/'; my $lm_license_file_for_synplify = "27000\@localhost"; my $lm_license_file_for_par = "1710\@cronos.e12.physik.tu-muenchen.de"; ################################################################################### diff --git a/central_hub2/trb3_central.p2t b/central_hub2/trb3_central.p2t index c037b03..e1f3bc5 100644 --- a/central_hub2/trb3_central.p2t +++ b/central_hub2/trb3_central.p2t @@ -4,7 +4,7 @@ -n 1 -y -s 12 --t 12 +-t 13 -c 1 -e 2 -m nodelist.txt diff --git a/central_hub2/trb3_central.prj b/central_hub2/trb3_central.prj index 0f11eef..f3491cf 100644 --- a/central_hub2/trb3_central.prj +++ b/central_hub2/trb3_central.prj @@ -115,6 +115,7 @@ add_file -vhdl -lib work "../../trbnet/lattice/ecp3/trb_net_fifo_16bit_bram_dual add_file -vhdl -lib work "../../trbnet/media_interfaces/ecp3_sfp/serdes_onboard_full.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/ecp3_sfp/serdes_onboard_full_125.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/ecp3_sfp/serdes_full_ctc.vhd" +add_file -vhdl -lib work "../../trbnet/media_interfaces/ecp3_sfp/serdes_full_noctc.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/ecp3_sfp/sfp_0_200_int.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/ecp3_sfp/sfp_0_200_ctc.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/ecp3_sfp/sfp_1_125_int.vhd" diff --git a/central_hub2/trb3_central.vhd b/central_hub2/trb3_central.vhd index c76a447..db71c8e 100644 --- a/central_hub2/trb3_central.vhd +++ b/central_hub2/trb3_central.vhd @@ -294,10 +294,11 @@ gen_single : if FULL_UPLINK = c_NO generate end generate; gen_full : if FULL_UPLINK = c_YES generate - THE_MEDIA_UPLINK : trb_net16_med_ecp3_sfp_4 + THE_MEDIA_UPLINK : entity work.trb_net16_med_ecp3_sfp_4 generic map( REVERSE_ORDER => c_NO, --order of ports - FREQUENCY => 200 --run on 200 MHz clock + FREQUENCY => 200, --run on 200 MHz clock + USE_CTC => c_YES ) port map( CLK => clk_200_i, @@ -321,8 +322,8 @@ gen_full : if FULL_UPLINK = c_YES generate SD_RXD_N_IN => SFP_RX_N(8 downto 5), SD_TXD_P_OUT => SFP_TX_P(8 downto 5), SD_TXD_N_OUT => SFP_TX_N(8 downto 5), - SD_REFCLK_P_IN => open, - SD_REFCLK_N_IN => open, + SD_REFCLK_P_IN => '0', + SD_REFCLK_N_IN => '0', SD_PRSNT_N_IN => SFP_MOD0(4 downto 1), SD_LOS_IN => SFP_LOS(4 downto 1), SD_TXDIS_OUT => SFP_TXDIS(4 downto 1), diff --git a/central_hub2/trb3_central_constraints.lpf b/central_hub2/trb3_central_constraints.lpf index dd6b14a..1bf3a81 100644 --- a/central_hub2/trb3_central_constraints.lpf +++ b/central_hub2/trb3_central_constraints.lpf @@ -30,7 +30,7 @@ LOCATE COMP "THE_MEDIA_ONBOARD/gen_serdes_125_THE_SERDES/PCSD_INST" SITE "PCSC REGION "MEDIA_UPLINK" "R98C95" 17 27; REGION "MEDIA_ONBOARD" "R90C122" 25 40; -REGION "REGION_SPI" "R13C150D" 12 16 DEVSIZE; +REGION "REGION_SPI" "R2C110D" 15 15 DEVSIZE; REGION "REGION_IOBUF" "R10C43D" 88 86 DEVSIZE; LOCATE UGROUP "gen_single_THE_MEDIA_UPLINK/media_interface_group" REGION "MEDIA_UPLINK" ; @@ -38,10 +38,10 @@ LOCATE UGROUP "gen_full_THE_MEDIA_UPLINK/media_interface_group" REGION "MEDIA_UP LOCATE UGROUP "THE_MEDIA_ONBOARD/media_interface_group" REGION "MEDIA_ONBOARD" ; -LOCATE UGROUP "THE_SPI_RELOAD/THE_SPI_MASTER/SPI_group" REGION "REGION_SPI" ; -LOCATE UGROUP "THE_SPI_RELOAD/THE_SPI_MEMORY/SPI_group" REGION "REGION_SPI" ; -LOCATE UGROUP "THE_SPI_RELOAD_THE_SPI_MASTER/SPI_group" REGION "REGION_SPI" ; -LOCATE UGROUP "THE_SPI_RELOAD_THE_SPI_MEMORY/SPI_group" REGION "REGION_SPI" ; +#LOCATE UGROUP "THE_SPI_RELOAD/THE_SPI_MASTER/SPI_group" REGION "REGION_SPI" ; +#LOCATE UGROUP "THE_SPI_RELOAD/THE_SPI_MEMORY/SPI_group" REGION "REGION_SPI" ; +#LOCATE UGROUP "THE_SPI_RELOAD_THE_SPI_MASTER/SPI_group" REGION "REGION_SPI" ; +#LOCATE UGROUP "THE_SPI_RELOAD_THE_SPI_MEMORY/SPI_group" REGION "REGION_SPI" ; MULTICYCLE TO CELL "THE_MEDIA_ONBOARD/SCI_DATA_OUT*" 50 ns; -- 2.43.0