From 3f2f5a75a9b48e7d39457aa22281f5235178869f Mon Sep 17 00:00:00 2001 From: hadeshyp Date: Thu, 24 May 2012 13:13:00 +0000 Subject: [PATCH] *** empty log message *** --- trb3_gbe/README.txt | 11 +++++++++++ trb3_gbe/compile_central_frankfurt.pl | 9 ++++++--- trb3_gbe/trb3_central.vhd | 6 +++--- trb3_gbe/trb3_central_constraints.lpf | 15 ++++++++------- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/trb3_gbe/README.txt b/trb3_gbe/README.txt index d9bbb40..28dde06 100644 --- a/trb3_gbe/README.txt +++ b/trb3_gbe/README.txt @@ -10,3 +10,14 @@ sgmii_gbe_pcs34.ngo -> ../../../trbnet/gbe2_ecp3/ipcores_ecp3/sgmii_gbe_pcs34/sg tsmac34.ngo -> ../../../trbnet/gbe2_ecp3/ipcores_ecp3/tsmac34/tsmac34.ngo serdes_onboard_full.txt -> ../../../trbnet/media_interfaces/ecp3_sfp/serdes_onboard_full.txt + + +ln -s ../../../../trbnet/gbe2_ecp3/ipcores_ecp3/tsmac34/pmi_ram_dpEbnonessdn208256208256.ngo +ln -s ../../../../trbnet/gbe2_ecp3/ipcores_ecp3/tsmac34/pmi_ram_dpEbnonessdn96649664.ngo +ln -s ../../../../trbnet/gbe2_ecp3/ipcores_ecp3/serdes_gbe_0ch/serdes_gbe_0ch.txt +ln -s ../../../../trbnet/gbe2_ecp3/ipcores_ecp3/serdes_ch4.txt +ln -s ../../../../trbnet/media_interfaces/ecp3_sfp/sfp_0_200_int.txt +ln -s ../../../../trbnet/gbe2_ecp3/ipcores_ecp3/sgmii_gbe_pcs34/sgmii_gbe_pcs34.ngo +ln -s ../../../../trbnet/gbe2_ecp3/ipcores_ecp3/tsmac34/tsmac34.ngo +ln -s ../../../../trbnet/media_interfaces/ecp3_sfp/serdes_onboard_full.txt + diff --git a/trb3_gbe/compile_central_frankfurt.pl b/trb3_gbe/compile_central_frankfurt.pl index 3d8699c..4e8afee 100755 --- a/trb3_gbe/compile_central_frankfurt.pl +++ b/trb3_gbe/compile_central_frankfurt.pl @@ -95,7 +95,8 @@ foreach (@a) $ENV{'LM_LICENSE_FILE'}=$lm_license_file_for_par; -$c=qq| $lattice_path/ispfpga/bin/lin/edif2ngd -l $FAMILYNAME -d $DEVICENAME "$TOPNAME.edf" "$TOPNAME.ngo" |; + +$c=qq| $lattice_path/ispfpga/bin/lin/edif2ngd -path "../" -path "." -l $FAMILYNAME -d $DEVICENAME "$TOPNAME.edf" "$TOPNAME.ngo" |; execute($c); $c=qq|$lattice_path/ispfpga/bin/lin/edfupdate -t "$TOPNAME.tcy" -w "$TOPNAME.ngo" -m "$TOPNAME.ngo" "$TOPNAME.ngx"|; @@ -106,11 +107,12 @@ execute($c); my $tpmap = $TOPNAME . "_map" ; -$c=qq|$lattice_path/ispfpga/bin/lin/map -retime -split_node -a $FAMILYNAME -p $DEVICENAME -t $PACKAGE -s $SPEEDGRADE "$TOPNAME.ngd" -o "$tpmap.ncd" -mp "$TOPNAME.mrp" "$TOPNAME.lpf"|; +$c=qq|$lattice_path/ispfpga/bin/lin/map -retime -split_node -a $FAMILYNAME -p $DEVICENAME -t $PACKAGE -s $SPEEDGRADE "$TOPNAME.ngd" -pr "$TOPNAME.prf" -o "$tpmap.ncd" -mp "$TOPNAME.mrp" "$TOPNAME.lpf"|; execute($c); system("rm $TOPNAME.ncd"); + $c=qq|$lattice_path/ispfpga/bin/lin/multipar -pr "$TOPNAME.prf" -o "mpar_$TOPNAME.rpt" -log "mpar_$TOPNAME.log" -p "../$TOPNAME.p2t" "$tpmap.ncd" "$TOPNAME.ncd"|; execute($c); @@ -128,7 +130,8 @@ execute($c); $c=qq|$lattice_path/ispfpga/bin/lin/ltxt2ptxt $TOPNAME.ncd|; execute($c); -$c=qq|$lattice_path/ispfpga/bin/lin/bitgen -w "$TOPNAME.ncd" "$TOPNAME.prf"|; +$c=qq|$lattice_path/ispfpga/bin/lin/bitgen -w -g CfgMode:Disable -g RamCfg:Reset -g ES:No $TOPNAME.ncd $TOPNAME.bit $TOPNAME.prf|; +# $c=qq|$lattice_path/ispfpga/bin/lin/bitgen -w "$TOPNAME.ncd" "$TOPNAME.prf"|; execute($c); chdir ".."; diff --git a/trb3_gbe/trb3_central.vhd b/trb3_gbe/trb3_central.vhd index 826d867..6112e27 100644 --- a/trb3_gbe/trb3_central.vhd +++ b/trb3_gbe/trb3_central.vhd @@ -86,7 +86,7 @@ entity trb3_central is --Flash ROM & Reboot FLASH_CLK : out std_logic; FLASH_CS : out std_logic; - FLASH_CIN : out std_logic; + FLASH_DIN : out std_logic; FLASH_DOUT : in std_logic; PROGRAMN : out std_logic := '1'; --reboot FPGA @@ -125,7 +125,7 @@ entity trb3_central is --important signals _with_ IO-FF attribute syn_useioff of FLASH_CLK : signal is true; attribute syn_useioff of FLASH_CS : signal is true; - attribute syn_useioff of FLASH_CIN : signal is true; + attribute syn_useioff of FLASH_DIN : signal is true; attribute syn_useioff of FLASH_DOUT : signal is true; attribute syn_useioff of FPGA1_COMM : signal is true; attribute syn_useioff of FPGA2_COMM : signal is true; @@ -765,7 +765,7 @@ THE_SPI_MASTER: spi_master -- SPI connections SPI_CS_OUT => FLASH_CS, SPI_SDI_IN => FLASH_DOUT, - SPI_SDO_OUT => FLASH_CIN, + SPI_SDO_OUT => FLASH_DIN, SPI_SCK_OUT => FLASH_CLK, -- BRAM for read/write data BRAM_A_OUT => spi_bram_addr, diff --git a/trb3_gbe/trb3_central_constraints.lpf b/trb3_gbe/trb3_central_constraints.lpf index 46894e2..e1dfbae 100644 --- a/trb3_gbe/trb3_central_constraints.lpf +++ b/trb3_gbe/trb3_central_constraints.lpf @@ -6,7 +6,7 @@ BLOCK RD_DURING_WR_PATHS ; # Basic Settings ################################################################# - SYSCONFIG MCCLK_FREQ = 20; + SYSCONFIG MCCLK_FREQ = 2.5; FREQUENCY PORT CLK_PCLK_RIGHT 200 MHz; FREQUENCY PORT CLK_PCLK_LEFT 200 MHz; @@ -24,19 +24,20 @@ GSR_NET NET "GSR_N"; ################################################################# # Locate Serdes and media interfaces ################################################################# -LOCATE COMP "THE_MEDIA_UPLINK/gen_serdes_0_200_THE_SERDES/PCSD_INST" SITE "PCSA" ; -LOCATE COMP "THE_MEDIA_ONBOARD/THE_SERDES/PCSD_INST" SITE "PCSC" ; LOCATE COMP "gen_ethernet_hub_GBE/imp_gen_serdes_intclk_gen_PCS_SERDES/clk_int_SERDES_GBE/PCSD_INST" SITE "PCSB"; +LOCATE COMP "THE_MEDIA_UPLINK/gen_serdes_0_200_THE_SERDES/PCSD_INST" SITE "PCSA" ; +LOCATE COMP "THE_MEDIA_ONBOARD/gen_serdes_200_THE_SERDES/PCSD_INST" SITE "PCSC" ; +LOCATE COMP "THE_MEDIA_ONBOARD/gen_serdes_125_THE_SERDES/PCSD_INST" SITE "PCSC" ; REGION "MEDIA_UPLINK" "R98C95" 17 27; LOCATE UGROUP "THE_MEDIA_UPLINK/media_interface_group" REGION "MEDIA_UPLINK" ; -REGION "MEDIA_ONBOARD" "R90C122" 25 40; +REGION "MEDIA_ONBOARD" "R90C122" 20 40; LOCATE UGROUP "THE_MEDIA_ONBOARD/media_interface_group" REGION "MEDIA_ONBOARD" ; - - +REGION "REGION_SPI" "R13C150D" 12 16 DEVSIZE; +REGION "REGION_IOBUF" "R20C96D" 88 86 DEVSIZE; FREQUENCY NET "gen_ethernet_hub_GBE/serdes_clk_125" 125.000000 MHz ; FREQUENCY NET "gen_ethernet_hub_GBE/CLK_125_OUT_inferred_clock" 125.00 MHz ; @@ -77,6 +78,6 @@ REGION "MED0" "R75C2D" 30 28 DEVSIZE; LOCATE UGROUP "gbe_rx_tx" REGION "GBE_REGION" ; FREQUENCY NET "gen_ethernet_hub_GBE/imp_gen_serdes_intclk_gen_PCS_SERDES/un1_PCS_SERDES_1" 125.000000 MHz ; FREQUENCY NET "gen_ethernet_hub_GBE/serdes_clk_125_c" 125.000000 MHz ; -REGION "GBE_MAIN_REGION" "R74C30C" 38 31 DEVSIZE; +REGION "GBE_MAIN_REGION" "R74C30C" 38 36 DEVSIZE; LOCATE UGROUP "controllers" REGION "GBE_MAIN_REGION" ; LOCATE UGROUP "tsmac" REGION "MED0" ; \ No newline at end of file -- 2.43.0