compiles now, serdes and slow controll is working, APV does not sync

diff --git a/Makefile b/Makefile
index 3827320005e66f47f82de77e0fe2eb3fc27ddd87..8ba9ccbb17c02b15f6d4a1f0448c645b932e6122 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,13 +60,6 @@ workdir/$(TARGET).ncd: workdir/$(TARGET)_map.ncd
        cd workdir && \
         par -f ../$(TARGET).p2t $(TARGET)_map.ncd $(TARGET).dir $(TARGET).prf
        cp workdir/$(TARGET).dir/*.ncd workdir/$(TARGET).ncd
-       #
-       # Multipar geht gerade nicht
-       #par $(TARGET)_map.ncd $(TARGET).prf
-       #mv $(TARGET).prf.ncd $(TARGET).ncd
-       # par -f ../$(TARGET).p2t $(TARGET)_map.ncd $(TARGET).dir $(TARGET).prf
-       #cp workdir/$(TARGET).dir/*.ncd workdir/$(TARGET).ncd
-
 
 # Mapper
 workdir/$(TARGET)_map.ncd: workdir/$(TARGET).ngd $(TARGET).lpf
@@ -75,9 +68,9 @@ workdir/$(TARGET)_map.ncd: workdir/$(TARGET).ngd $(TARGET).lpf
        @echo "-------------- Mapper ------------------------------------------------"
        @echo "----------------------------------------------------------------------"
        cd workdir && \
-        map  -retime -split_node -a $(FAMILYNAME) -p $(DEVICENAME) \
-             -t $(PACKAGE) -s $(SPEEDGRADE) $(TARGET).ngd  -pr $(TARGET).prf \
-             -o $(TARGET)_map.ncd  -mp $(TARGET).mrp $(TARGET).lpf
+        map  -noinferGSR -a $(FAMILYNAME) -p $(DEVICENAME) \
+             -t $(PACKAGE) -s $(SPEEDGRADE) $(TARGET).ngd  -o $(TARGET)_map.ncd \
+              -mp $(TARGET).mrp $(TARGET).lpf
 
 # EDIF 2 NGD
 workdir/$(TARGET).ngd: workdir/$(TARGET).edf
@@ -111,8 +104,6 @@ workdir/$(TARGET).edf:
 
        $(SYNPLIFY)/bin/synplify_premier_dp -batch $(TARGET).prj || \
         (grep "@E" workdir/$(TARGET).srr && exit 2)
-       #synpwrap -prj $(TARGET).prj || \
-        #(grep "@E" workdir/$(TARGET).srr && exit 2)
 
 # ------------------------------------------------------------------------------------
 
@@ -151,6 +142,7 @@ workdir:
        cp $(TARGET).lpf workdir/$(TARGET).lpf
        cat $(TARGET)_constraints.lpf >> workdir/$(TARGET).lpf
        cp nodelist.txt workdir/ 
+       cp -a ../trbnet/media_interfaces/ecp2m_sfp/serdes_gbe_2.txt workdir/
 
 # Timing Report
 .PHONY: report

diff --git a/adcmv3.prj b/adcmv3.prj
index e1e9928652af700edff088a768538996c1b0a2dc..7e04b0a80081d6cf5452df4d8d55de151f93b6d0 100755 (executable)
--- a/adcmv3.prj
+++ b/adcmv3.prj
@@ -77,6 +77,13 @@ add_file -vhdl -lib work "design/pll_40m.vhd"
 
 # TrbNet design files
 add_file -vhdl -lib work "../trbnet/lattice/ecp2m/spi_dpram_32_to_8.vhd"
+add_file -vhdl -lib work "../trbnet/lattice/ecp2m/lattice_ecp2m_fifo_18x1k.vhd"
+add_file -vhdl -lib work "../trbnet/lattice/ecp2m/trb_net16_fifo_arch.vhd"
+add_file -vhdl -lib work "../trbnet/lattice/ecp2m/lattice_ecp2m_fifo_16bit_dualport.vhd"
+add_file -vhdl -lib work "../trbnet/lattice/ecp2m/trb_net_fifo_16bit_bram_dualport.vhd"
+add_file -vhdl -lib work "../trbnet/media_interfaces/ecp2m_sfp/serdes_gbe_2.vhd"
+add_file -vhdl -lib work "../trbnet/lattice/ecp2m/fifo/fifo_19x16_obuf.vhd"
+
 add_file -vhdl -lib work "../trbnet/special/spi_databus_memory.vhd"
 add_file -vhdl -lib work "../trbnet/special/spi_slim.vhd"
 add_file -vhdl -lib work "../trbnet/special/spi_master.vhd"
@@ -95,8 +102,6 @@ add_file -vhdl -lib work "../trbnet/basics/ram_16x16_dp.vhd"
 add_file -vhdl -lib work "../trbnet/trb_net16_addresses.vhd"
 add_file -vhdl -lib work "../trbnet/trb_net_pattern_gen.vhd"
 add_file -vhdl -lib work "../trbnet/trb_net16_regIO.vhd"
-add_file -vhdl -lib work "../trbnet/lattice/ecp2m/lattice_ecp2m_fifo_18x1k.vhd"
-add_file -vhdl -lib work "../trbnet/lattice/ecp2m/trb_net16_fifo_arch.vhd"
 add_file -vhdl -lib work "../trbnet/trb_net16_api_base.vhd"
 add_file -vhdl -lib work "../trbnet/trb_net_CRC.vhd"
 add_file -vhdl -lib work "../trbnet/trb_net16_obuf.vhd"
@@ -107,13 +112,9 @@ add_file -vhdl -lib work "../trbnet/trb_net16_term_buf.vhd"
 add_file -vhdl -lib work "../trbnet/trb_net16_ipudata.vhd"
 add_file -vhdl -lib work "../trbnet/trb_net16_trigger.vhd"
 add_file -vhdl -lib work "../trbnet/trb_net16_endpoint_hades_full.vhd"
-add_file -vhdl -lib work "../trbnet/lattice/ecp2m/lattice_ecp2m_fifo_16bit_dualport.vhd"
-add_file -vhdl -lib work "../trbnet/lattice/ecp2m/trb_net_fifo_16bit_bram_dualport.vhd"
-add_file -vhdl -lib work "../trbnet/media_interfaces/ecp2m_sfp/serdes_gbe_2.vhd"
 add_file -vhdl -lib work "../trbnet/media_interfaces/trb_net16_lsm_sfp.vhd"
 add_file -vhdl -lib work "../trbnet/basics/signal_sync.vhd"
 add_file -vhdl -lib work "../trbnet/media_interfaces/trb_net16_med_ecp_sfp_gbe.vhd"
-add_file -vhdl -lib work "../trbnet/lattice/ecp2m/fifo/fifo_19x16_obuf.vhd"
 
 # add_file -vhdl -lib work "../trbnet/lattice/ecp2m/fifo/fifo_18x16_media_interface.vhd"
 # add_file -vhdl -lib work "design/sfp_rx_handler.vhd"

diff --git a/adcmv3_constraints.lpf b/adcmv3_constraints.lpf
index 47f1fbaf5d3bd2aeff475ff08b76523b248f85c2..c3130a57785b34671ca55d22a11d174d88786d33 100755 (executable)
--- a/adcmv3_constraints.lpf
+++ b/adcmv3_constraints.lpf
@@ -80,3 +80,8 @@ LOCATE UGROUP "THE_ADC1_HANDLER/THE_ADC_6_7_CH/TWOCHANNELS_group" REGION "ADC1_R
 # SerDes\r
 ######################################################################\r
 LOCATE COMP "THE_RICH_TRB/THE_MEDIA_INTERFACE/gen_serdes_2_THE_SERDES/PCSC_INST" SITE "URPCS" ;\r
+\r
+#LOCATE UGROUP "THE_RICH_TRB/THE_UNIFIED_ENDPOINT/genbuffers.3.geniobuf.gen_api.DAT_PASSIVE_API/FIFO_TO_APL/fifo/pdp_ram_0_0_0" REGION "LARGE_LUT" ;\r
+#LOCATE UGROUP "THE_RICH_TRB/THE_UNIFIED_ENDPOINT/genbuffers.3.geniobuf.gen_api.DAT_PASSIVE_API/GEN_FIFO_TO_INT.FIFO_TO_INT/fifo/pdp_ram_0_0_0" REGION "LARGE_LUT" ;\r
+\r
+\r

diff --git a/stdout.log b/stdout.log
index 9b9518ac3716730a07b8aad0c1fd079938cf95f7..392deb208be14350777dbcd65d01615c51972096 100644 (file)
--- a/stdout.log
+++ b/stdout.log
@@ -1,7 +1,7 @@
 
 Starting:    /opt/synplicity/I-2013.09-SP1/linux_a_64/mbin/synbatch_orig
 Install:     /opt/synplicity/I-2013.09-SP1
-Date:        Mon Sep  7 00:19:53 2015
+Date:        Tue Sep  8 16:09:24 2015
 Version:     I-2013.09-SP1 
 
 Arguments:   -product synplify_premier_dp -batch adcmv3.prj
@@ -19,7 +19,7 @@ Generating DM database...
 
 compile_dm Completed
 Return Code: 0
-Run Time:00h:00m:00s
+Run Time:00h:00m:01s
 
 
 log file: "/home/hadaq/lmaier/ADCM/adcm/workdir/adcmv3.srr"
@@ -43,7 +43,7 @@ Copied /home/hadaq/lmaier/ADCM/adcm/workdir/synwork/adcmv3_comp.srs to /home/had
 
 compiler Completed
 Return Code: 0
-Run Time:00h:00m:15s
+Run Time:00h:00m:16s
 
 
 Complete: Compile HDL/EDIF on adcmv3|workdir
@@ -53,7 +53,7 @@ Running: Premap on adcmv3|workdir
 
 premap Completed with warnings
 Return Code: 1
-Run Time:00h:00m:05s
+Run Time:00h:00m:04s
 
 
 Complete: Compile on adcmv3|workdir
@@ -66,7 +66,7 @@ Running: Map & Optimize on adcmv3|workdir
 
 fpga_mapper Completed with warnings
 Return Code: 1
-Run Time:00h:02m:33s
+Run Time:00h:03m:27s
 
 
 Complete: Map on adcmv3|workdir