From e5f1bc71c51ef42e43b9d121d8ef3bf6bf0db0bf Mon Sep 17 00:00:00 2001 From: bglod Date: Sun, 28 Jun 2015 12:35:26 -0400 Subject: [PATCH] hdl: Fixed LMS SPI timing constraints Reduced SPI clock frequency to 20 MHz. --- .../ip/altera/nios_system/nios_system.qsys | 12 ++++- hdl/fpga/ip/nuand/spi/qsys/spi_hw.tcl | 46 +++++++++---------- .../platforms/bladerf/constraints/bladerf.sdc | 10 ++-- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/hdl/fpga/ip/altera/nios_system/nios_system.qsys b/hdl/fpga/ip/altera/nios_system/nios_system.qsys index 4964ae96..419d51ce 100755 --- a/hdl/fpga/ip/altera/nios_system/nios_system.qsys +++ b/hdl/fpga/ip/altera/nios_system/nios_system.qsys @@ -7,7 +7,7 @@ description="" tags="" categories="System" /> - - + diff --git a/hdl/fpga/ip/nuand/spi/qsys/spi_hw.tcl b/hdl/fpga/ip/nuand/spi/qsys/spi_hw.tcl index 7e30805c..e9a8ef78 100644 --- a/hdl/fpga/ip/nuand/spi/qsys/spi_hw.tcl +++ b/hdl/fpga/ip/nuand/spi/qsys/spi_hw.tcl @@ -1,23 +1,23 @@ # TCL File Generated by Component Editor 15.0 -# Mon Jun 15 20:29:37 EDT 2015 +# Thu Jun 25 21:35:08 EDT 2015 # DO NOT MODIFY -# +# # spi "spi" v1.0 -# Nuand, LLC 2015.06.15.20:29:37 +# Nuand, LLC 2015.06.25.21:35:07 # SPI Controller for LMS6002D -# +# -# +# # request TCL package from ACDS 15.0 -# +# package require -exact qsys 15.0 -# +# # module spi -# +# set_module_property DESCRIPTION "SPI Controller for LMS6002D" set_module_property NAME spi set_module_property VERSION 1.0 @@ -33,9 +33,9 @@ set_module_property ALLOW_GREYBOX_GENERATION false set_module_property REPORT_HIERARCHY false -# +# # file sets -# +# add_fileset QUARTUS_SYNTH QUARTUS_SYNTH "" "" set_fileset_property QUARTUS_SYNTH TOP_LEVEL spi set_fileset_property QUARTUS_SYNTH ENABLE_RELATIVE_INCLUDE_PATHS false @@ -43,14 +43,13 @@ set_fileset_property QUARTUS_SYNTH ENABLE_FILE_OVERWRITE_MODE false add_fileset_file spi.vhd VHDL PATH ../vhdl/spi.vhd TOP_LEVEL_FILE -# +# # parameters -# +# add_parameter CLOCK_DIV INTEGER 2 set_parameter_property CLOCK_DIV DEFAULT_VALUE 2 set_parameter_property CLOCK_DIV DISPLAY_NAME CLOCK_DIV set_parameter_property CLOCK_DIV TYPE INTEGER -set_parameter_property CLOCK_DIV ENABLED false set_parameter_property CLOCK_DIV UNITS None set_parameter_property CLOCK_DIV ALLOWED_RANGES -2147483648:2147483647 set_parameter_property CLOCK_DIV HDL_PARAMETER true @@ -72,14 +71,14 @@ set_parameter_property DATA_WIDTH ALLOWED_RANGES 1:2147483647 set_parameter_property DATA_WIDTH HDL_PARAMETER true -# +# # display items -# +# -# +# # connection point reset_sink -# +# add_interface reset_sink reset end set_interface_property reset_sink associatedClock clock_sink set_interface_property reset_sink synchronousEdges DEASSERT @@ -92,9 +91,9 @@ set_interface_property reset_sink SVD_ADDRESS_GROUP "" add_interface_port reset_sink mm_reset reset Input 1 -# +# # connection point clock_sink -# +# add_interface clock_sink clock end set_interface_property clock_sink clockRate 80000000 set_interface_property clock_sink ENABLED true @@ -106,9 +105,9 @@ set_interface_property clock_sink SVD_ADDRESS_GROUP "" add_interface_port clock_sink mm_clock clk Input 1 -# +# # connection point conduit_end -# +# add_interface conduit_end conduit end set_interface_property conduit_end associatedClock clock_sink set_interface_property conduit_end associatedReset reset_sink @@ -124,9 +123,9 @@ add_interface_port conduit_end mosi mosi Output 1 add_interface_port conduit_end cs_n ss_n Output 1 -# +# # connection point avalon_slave_0 -# +# add_interface avalon_slave_0 avalon end set_interface_property avalon_slave_0 addressUnits SYMBOLS set_interface_property avalon_slave_0 associatedClock clock_sink @@ -161,3 +160,4 @@ set_interface_assignment avalon_slave_0 embeddedsw.configuration.isFlash 0 set_interface_assignment avalon_slave_0 embeddedsw.configuration.isMemoryDevice 0 set_interface_assignment avalon_slave_0 embeddedsw.configuration.isNonVolatileStorage 0 set_interface_assignment avalon_slave_0 embeddedsw.configuration.isPrintableDevice 0 + diff --git a/hdl/fpga/platforms/bladerf/constraints/bladerf.sdc b/hdl/fpga/platforms/bladerf/constraints/bladerf.sdc index 9f455fb1..c13b56dd 100644 --- a/hdl/fpga/platforms/bladerf/constraints/bladerf.sdc +++ b/hdl/fpga/platforms/bladerf/constraints/bladerf.sdc @@ -53,7 +53,7 @@ set_input_delay -clock [get_clocks {U_pll|altpll_component|auto_generated|pll1|c # LMS SPI interface # Create SPI generated clock -create_generated_clock -name lms_sclk_reg -source [get_pins {U_pll|altpll_component|auto_generated|pll1|clk[0]}] -divide_by 2 [get_registers {*lms_spi*current.sclk}] +create_generated_clock -name lms_sclk_reg -source [get_pins {U_pll|altpll_component|auto_generated|pll1|clk[0]}] -divide_by 4 [get_registers {*lms_spi*current.sclk}] create_generated_clock -name lms_sclk_pin -source [get_registers -no_duplicates {*lms_spi*current.sclk}] [get_ports {lms_sclk}] set_input_delay -clock_fall -clock lms_sclk_pin -min 1.0 [get_ports {lms_sdo}] @@ -62,10 +62,10 @@ set_input_delay -clock_fall -clock lms_sclk_pin -max 9.0 [get_ports {lms_sdo}] set_output_delay -clock lms_sclk_pin -min 1.0 [get_ports {lms_sen lms_sdio}] set_output_delay -clock lms_sclk_pin -max 2.0 [get_ports {lms_sen lms_sdio}] -add_delay -set_multicycle_path -setup -start -from [get_clocks {U_pll*clk[0]}] -to [get_clocks lms_sclk_pin] 1 -set_multicycle_path -hold -start -from [get_clocks {U_pll*clk[0]}] -to [get_clocks lms_sclk_pin] 1 -set_multicycle_path -setup -end -from [get_clocks lms_sclk_pin] -to [get_clocks {U_pll*clk[0]}] 1 -set_multicycle_path -hold -end -from [get_clocks lms_sclk_pin] -to [get_clocks {U_pll*clk[0]}] 1 +set_multicycle_path -setup -start -from [get_clocks {U_pll*clk[0]}] -to [get_clocks lms_sclk_pin] 2 +set_multicycle_path -hold -start -from [get_clocks {U_pll*clk[0]}] -to [get_clocks lms_sclk_pin] 2 +set_multicycle_path -setup -end -from [get_clocks lms_sclk_pin] -to [get_clocks {U_pll*clk[0]}] 2 +set_multicycle_path -hold -end -from [get_clocks lms_sclk_pin] -to [get_clocks {U_pll*clk[0]}] 2 # Si5338 interface set_input_delay -clock [get_clocks U_pll*0*] -min 1.0 [get_ports {si_scl si_sda}]