+18









Martin Braun
Alex Williams
Andrej Rode
Ashish Chaudhari
Ben Hilburn
Ciro Nishiguchi
Daniel Jepson
Derek Kozel
EJ Kreinar
Humberto Jimenez
Ian Buckley
Jörg Hofrichter
Jon Kiser
Josh Blum
Jonathon Pendlum
Matt Ettus
Michael West
Moritz Fischer
Nick Foster
Nicolas Cuervo
Paul Butler
Paul David
Ryan Marlow
Sugandha Gupta
Sylvain Munaut
Trung Tran
Vidush Vishwanath
Wade Fife
6b67702ad7
The FPGA codebase was removed from the UHD repository in 2014 to reduce the size of the repository. However, over the last half-decade, the split between the repositories has proven more burdensome than it has been helpful. By merging the FPGA code back, it will be possible to create atomic commits that touch both FPGA and UHD codebases. Continuous integration testing is also simplified by merging the repositories, because it was previously difficult to automatically derive the correct UHD branch when testing a feature branch on the FPGA repository. This commit also updates the license files and paths therein. We are therefore merging the repositories again. Future development for FPGA code will happen in the same repository as the UHD host code and MPM code. == Original Codebase and Rebasing == The original FPGA repository will be hosted for the foreseeable future at its original local location: https://github.com/EttusResearch/fpga/ It can be used for bisecting, reference, and a more detailed history. The final commit from said repository to be merged here is 05003794e2da61cabf64dd278c45685a7abad7ec. This commit is tagged as v4.0.0.0-pre-uhd-merge. If you have changes in the FPGA repository that you want to rebase onto the UHD repository, simply run the following commands: - Create a directory to store patches (this should be an empty directory): mkdir ~/patches - Now make sure that your FPGA codebase is based on the same state as the code that was merged: cd src/fpga # Or wherever your FPGA code is stored git rebase v4.0.0.0-pre-uhd-merge Note: The rebase command may look slightly different depending on what exactly you're trying to rebase. - Create a patch set for your changes versus v4.0.0.0-pre-uhd-merge: git format-patch v4.0.0.0-pre-uhd-merge -o ~/patches Note: Make sure that only patches are stored in your output directory. It should otherwise be empty. Make sure that you picked the correct range of commits, and only commits you wanted to rebase were exported as patch files. - Go to the UHD repository and apply the patches: cd src/uhd # Or wherever your UHD repository is stored git am --directory fpga ~/patches/* rm -rf ~/patches # This is for cleanup == Contributors == The following people have contributed mainly to these files (this list is not complete): Co-authored-by: Alex Williams <alex.williams@ni.com> Co-authored-by: Andrej Rode <andrej.rode@ettus.com> Co-authored-by: Ashish Chaudhari <ashish@ettus.com> Co-authored-by: Ben Hilburn <ben.hilburn@ettus.com> Co-authored-by: Ciro Nishiguchi <ciro.nishiguchi@ni.com> Co-authored-by: Daniel Jepson <daniel.jepson@ni.com> Co-authored-by: Derek Kozel <derek.kozel@ettus.com> Co-authored-by: EJ Kreinar <ej@he360.com> Co-authored-by: Humberto Jimenez <humberto.jimenez@ni.com> Co-authored-by: Ian Buckley <ian.buckley@gmail.com> Co-authored-by: Jörg Hofrichter <joerg.hofrichter@ni.com> Co-authored-by: Jon Kiser <jon.kiser@ni.com> Co-authored-by: Josh Blum <josh@joshknows.com> Co-authored-by: Jonathon Pendlum <jonathan.pendlum@ettus.com> Co-authored-by: Martin Braun <martin.braun@ettus.com> Co-authored-by: Matt Ettus <matt@ettus.com> Co-authored-by: Michael West <michael.west@ettus.com> Co-authored-by: Moritz Fischer <moritz.fischer@ettus.com> Co-authored-by: Nick Foster <nick@ettus.com> Co-authored-by: Nicolas Cuervo <nicolas.cuervo@ettus.com> Co-authored-by: Paul Butler <paul.butler@ni.com> Co-authored-by: Paul David <paul.david@ettus.com> Co-authored-by: Ryan Marlow <ryan.marlow@ettus.com> Co-authored-by: Sugandha Gupta <sugandha.gupta@ettus.com> Co-authored-by: Sylvain Munaut <tnt@246tNt.com> Co-authored-by: Trung Tran <trung.tran@ettus.com> Co-authored-by: Vidush Vishwanath <vidush.vishwanath@ettus.com> Co-authored-by: Wade Fife <wade.fife@ettus.com> Original-commit: bafa9d95453387814ef25e6b6256ba8db2df612f
214 lines
6.9 KiB
Plaintext
214 lines
6.9 KiB
Plaintext
##############################################################
|
|
#
|
|
# Xilinx Core Generator version 14.4
|
|
# Date: Fri Jan 25 19:58:19 2013
|
|
#
|
|
##############################################################
|
|
#
|
|
# This file contains the customisation parameters for a
|
|
# Xilinx CORE Generator IP GUI. It is strongly recommended
|
|
# that you do not manually alter this file as it may cause
|
|
# unexpected and unsupported behavior.
|
|
#
|
|
##############################################################
|
|
#
|
|
# Generated from component: xilinx.com:ip:fifo_generator:9.3
|
|
#
|
|
##############################################################
|
|
#
|
|
# BEGIN Project Options
|
|
SET addpads = false
|
|
SET asysymbol = true
|
|
SET busformat = BusFormatAngleBracketNotRipped
|
|
SET createndf = false
|
|
SET designentry = Verilog
|
|
SET device = xc6slx75
|
|
SET devicefamily = spartan6
|
|
SET flowvendor = Other
|
|
SET formalverification = false
|
|
SET foundationsym = false
|
|
SET implementationfiletype = Ngc
|
|
SET package = csg484
|
|
SET removerpms = false
|
|
SET simulationfiles = Behavioral
|
|
SET speedgrade = -2
|
|
SET verilogsim = true
|
|
SET vhdlsim = false
|
|
# END Project Options
|
|
# BEGIN Select
|
|
SELECT FIFO_Generator xilinx.com:ip:fifo_generator:9.3
|
|
# END Select
|
|
# BEGIN Parameters
|
|
CSET add_ngc_constraint_axi=false
|
|
CSET almost_empty_flag=false
|
|
CSET almost_full_flag=false
|
|
CSET aruser_width=1
|
|
CSET awuser_width=1
|
|
CSET axi_address_width=32
|
|
CSET axi_data_width=64
|
|
CSET axi_type=AXI4_Stream
|
|
CSET axis_type=FIFO
|
|
CSET buser_width=1
|
|
CSET clock_enable_type=Slave_Interface_Clock_Enable
|
|
CSET clock_type_axi=Common_Clock
|
|
CSET component_name=fifo_4k_2clk
|
|
CSET data_count=false
|
|
CSET data_count_width=9
|
|
CSET disable_timing_violations=false
|
|
CSET disable_timing_violations_axi=false
|
|
CSET dout_reset_value=0
|
|
CSET empty_threshold_assert_value=4
|
|
CSET empty_threshold_assert_value_axis=1022
|
|
CSET empty_threshold_assert_value_rach=1022
|
|
CSET empty_threshold_assert_value_rdch=1022
|
|
CSET empty_threshold_assert_value_wach=1022
|
|
CSET empty_threshold_assert_value_wdch=1022
|
|
CSET empty_threshold_assert_value_wrch=1022
|
|
CSET empty_threshold_negate_value=5
|
|
CSET enable_aruser=false
|
|
CSET enable_awuser=false
|
|
CSET enable_buser=false
|
|
CSET enable_common_overflow=false
|
|
CSET enable_common_underflow=false
|
|
CSET enable_data_counts_axis=false
|
|
CSET enable_data_counts_rach=false
|
|
CSET enable_data_counts_rdch=false
|
|
CSET enable_data_counts_wach=false
|
|
CSET enable_data_counts_wdch=false
|
|
CSET enable_data_counts_wrch=false
|
|
CSET enable_ecc=false
|
|
CSET enable_ecc_axis=false
|
|
CSET enable_ecc_rach=false
|
|
CSET enable_ecc_rdch=false
|
|
CSET enable_ecc_wach=false
|
|
CSET enable_ecc_wdch=false
|
|
CSET enable_ecc_wrch=false
|
|
CSET enable_read_channel=false
|
|
CSET enable_read_pointer_increment_by2=false
|
|
CSET enable_reset_synchronization=true
|
|
CSET enable_ruser=false
|
|
CSET enable_tdata=false
|
|
CSET enable_tdest=false
|
|
CSET enable_tid=false
|
|
CSET enable_tkeep=false
|
|
CSET enable_tlast=false
|
|
CSET enable_tready=true
|
|
CSET enable_tstrobe=false
|
|
CSET enable_tuser=false
|
|
CSET enable_write_channel=false
|
|
CSET enable_wuser=false
|
|
CSET fifo_application_type_axis=Data_FIFO
|
|
CSET fifo_application_type_rach=Data_FIFO
|
|
CSET fifo_application_type_rdch=Data_FIFO
|
|
CSET fifo_application_type_wach=Data_FIFO
|
|
CSET fifo_application_type_wdch=Data_FIFO
|
|
CSET fifo_application_type_wrch=Data_FIFO
|
|
CSET fifo_implementation=Independent_Clocks_Block_RAM
|
|
CSET fifo_implementation_axis=Common_Clock_Block_RAM
|
|
CSET fifo_implementation_rach=Common_Clock_Block_RAM
|
|
CSET fifo_implementation_rdch=Common_Clock_Block_RAM
|
|
CSET fifo_implementation_wach=Common_Clock_Block_RAM
|
|
CSET fifo_implementation_wdch=Common_Clock_Block_RAM
|
|
CSET fifo_implementation_wrch=Common_Clock_Block_RAM
|
|
CSET full_flags_reset_value=1
|
|
CSET full_threshold_assert_value=511
|
|
CSET full_threshold_assert_value_axis=1023
|
|
CSET full_threshold_assert_value_rach=1023
|
|
CSET full_threshold_assert_value_rdch=1023
|
|
CSET full_threshold_assert_value_wach=1023
|
|
CSET full_threshold_assert_value_wdch=1023
|
|
CSET full_threshold_assert_value_wrch=1023
|
|
CSET full_threshold_negate_value=510
|
|
CSET id_width=4
|
|
CSET inject_dbit_error=false
|
|
CSET inject_dbit_error_axis=false
|
|
CSET inject_dbit_error_rach=false
|
|
CSET inject_dbit_error_rdch=false
|
|
CSET inject_dbit_error_wach=false
|
|
CSET inject_dbit_error_wdch=false
|
|
CSET inject_dbit_error_wrch=false
|
|
CSET inject_sbit_error=false
|
|
CSET inject_sbit_error_axis=false
|
|
CSET inject_sbit_error_rach=false
|
|
CSET inject_sbit_error_rdch=false
|
|
CSET inject_sbit_error_wach=false
|
|
CSET inject_sbit_error_wdch=false
|
|
CSET inject_sbit_error_wrch=false
|
|
CSET input_data_width=72
|
|
CSET input_depth=512
|
|
CSET input_depth_axis=1024
|
|
CSET input_depth_rach=16
|
|
CSET input_depth_rdch=1024
|
|
CSET input_depth_wach=16
|
|
CSET input_depth_wdch=1024
|
|
CSET input_depth_wrch=16
|
|
CSET interface_type=Native
|
|
CSET output_data_width=72
|
|
CSET output_depth=512
|
|
CSET overflow_flag=false
|
|
CSET overflow_flag_axi=false
|
|
CSET overflow_sense=Active_High
|
|
CSET overflow_sense_axi=Active_High
|
|
CSET performance_options=First_Word_Fall_Through
|
|
CSET programmable_empty_type=No_Programmable_Empty_Threshold
|
|
CSET programmable_empty_type_axis=No_Programmable_Empty_Threshold
|
|
CSET programmable_empty_type_rach=No_Programmable_Empty_Threshold
|
|
CSET programmable_empty_type_rdch=No_Programmable_Empty_Threshold
|
|
CSET programmable_empty_type_wach=No_Programmable_Empty_Threshold
|
|
CSET programmable_empty_type_wdch=No_Programmable_Empty_Threshold
|
|
CSET programmable_empty_type_wrch=No_Programmable_Empty_Threshold
|
|
CSET programmable_full_type=No_Programmable_Full_Threshold
|
|
CSET programmable_full_type_axis=No_Programmable_Full_Threshold
|
|
CSET programmable_full_type_rach=No_Programmable_Full_Threshold
|
|
CSET programmable_full_type_rdch=No_Programmable_Full_Threshold
|
|
CSET programmable_full_type_wach=No_Programmable_Full_Threshold
|
|
CSET programmable_full_type_wdch=No_Programmable_Full_Threshold
|
|
CSET programmable_full_type_wrch=No_Programmable_Full_Threshold
|
|
CSET rach_type=FIFO
|
|
CSET rdch_type=FIFO
|
|
CSET read_clock_frequency=1
|
|
CSET read_data_count=true
|
|
CSET read_data_count_width=10
|
|
CSET register_slice_mode_axis=Fully_Registered
|
|
CSET register_slice_mode_rach=Fully_Registered
|
|
CSET register_slice_mode_rdch=Fully_Registered
|
|
CSET register_slice_mode_wach=Fully_Registered
|
|
CSET register_slice_mode_wdch=Fully_Registered
|
|
CSET register_slice_mode_wrch=Fully_Registered
|
|
CSET reset_pin=true
|
|
CSET reset_type=Asynchronous_Reset
|
|
CSET ruser_width=1
|
|
CSET synchronization_stages=2
|
|
CSET synchronization_stages_axi=2
|
|
CSET tdata_width=64
|
|
CSET tdest_width=4
|
|
CSET tid_width=8
|
|
CSET tkeep_width=4
|
|
CSET tstrb_width=4
|
|
CSET tuser_width=4
|
|
CSET underflow_flag=false
|
|
CSET underflow_flag_axi=false
|
|
CSET underflow_sense=Active_High
|
|
CSET underflow_sense_axi=Active_High
|
|
CSET use_clock_enable=false
|
|
CSET use_dout_reset=true
|
|
CSET use_embedded_registers=false
|
|
CSET use_extra_logic=true
|
|
CSET valid_flag=false
|
|
CSET valid_sense=Active_High
|
|
CSET wach_type=FIFO
|
|
CSET wdch_type=FIFO
|
|
CSET wrch_type=FIFO
|
|
CSET write_acknowledge_flag=false
|
|
CSET write_acknowledge_sense=Active_High
|
|
CSET write_clock_frequency=1
|
|
CSET write_data_count=true
|
|
CSET write_data_count_width=10
|
|
CSET wuser_width=1
|
|
# END Parameters
|
|
# BEGIN Extra information
|
|
MISC pkg_timestamp=2012-11-19T12:39:56Z
|
|
# END Extra information
|
|
GENERATE
|
|
# CRC: 372c204f
|