aboutsummaryrefslogtreecommitdiffstats
path: root/fpga-src
Commit message (Collapse)AuthorAgeFilesLines
* Merge FPGA repository back into UHD repositoryMartin Braun2020-01-281-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* images: update FPGA image packages for RFNoCBrent Stapleton2020-01-081-0/+0
| | | | | | | | Updating FPGA image packages, filesystems, and submodule pointer to include recent RFNoC changes. Note: These filesystems have compatible Linux distributions, but do require an MPM update in order to use the UHD features in this branch.
* Update branch for upcoming 3.15 releaseMartin Braun2019-10-151-0/+0
| | | | | - Update submodule pointer - Update CHANGELOG to incorporate latest changes
* manifest: Update FPGA images for N3xx, E3xxJoerg Hofrichter2019-10-071-0/+0
| | | | | | | This moves the FPGA images to the new DTS format. Also fixes 1GigE link status. Signed-off-by: Joerg Hofrichter <joerg.hofrichter@ni.com>
* rfnoc: Read cmd FIFO size from blocks & configure ctrl_ifaceMartin Braun2019-09-041-0/+0
| | | | | | | | | | This requires noc_shell compat number 6.0. It will allow sending as many command packets, but no more, than there is space. Updated FPGA images for devices: - X310/X300 - N300/N310/N320 - E310/E320
* fpga-src: Update submodule pointerMartin Braun2019-05-241-0/+0
| | | | This will include updated E310 FPGA images.
* RFNoC: Disable FC ACK packets for lossless linksMichael West2019-02-181-0/+0
| | | | | | | FC ACK packets are unnecessary on lossless links and degrade overall performance. This change disables those packets on all lossless links. Signed-off-by: Michael West <michael.west@ettus.com>
* Preparing branch for 3.14.0.0 Releasemichael-west2019-02-011-0/+0
| | | | | | | - Updated CHANGELOG - Updated fpga-src submodule - Updated version info - Updated manifest
* fpga: update images and submodule pointerBrent Stapleton2019-01-021-0/+0
| | | | | | | | - Update submodule pointer - Update X3xx, E310, E320, N3xx, B2xx, N230 images. - Remove the E320 Aurora package from the manifest. The Aurora images were added to the default E320 image package in d61848e1, but the image package was not updated until now.
* Update fpga-src submodule pointerMartin Braun2018-12-201-0/+0
|
* Update fpga-src submodule pointerMartin Braun2018-12-201-0/+0
|
* manifest: FPGA bug fixesBrent Stapleton2018-10-251-0/+0
| | | | | | | | | | | | | | Updating FPGA images for the following devices with the following bug fixes. No compat number bumps included in the changes. Also updating the submodule pointer. X3xx, N3xx, E3xx: - DDS flushing fix - Fix sequence number clearing B2xx: - Async reset from misc registers - Redistributed buffering in radio and xport
* B200: Restore asynchronous reset of AD936x.michael-west2018-10-171-0/+0
|
* cores: Update rx_frontend_gen3.v controls for 1/4-rate mixerMartin Braun2018-09-251-0/+0
| | | | | | | This tracks the changes on rx_frontend_gen3.v, which was updated to use a quarter-rate downconverter instead of a generic CORDIC. The X3x0 FPGA compat number is incremented as the rx_frontend is part of the device architecture rather than an RFNoC block.
* n3xx: Get RFNoC crossbar baseport from FPGABrent Stapleton2018-09-061-0/+0
|
* RFNoC: Convert SR_READBACK_REG_FIFOSIZE to bytesTrung N Tran2018-08-221-0/+0
| | | | | Change the RB_FIFOSIZE register to store the FIFO size in bytes instead of log2 of bytes.
* Device3: Change packet-based flow control to byte-based flow controlMartin Braun2018-07-251-0/+0
|
* rfnoc: Enabled SW flush mechanism impl'd in noc_shellAshish Chaudhari2018-07-241-0/+0
| | | | | | | | | | | - UHD will now "disconnect" the noc_block data-path from the crossbar when the block's dtor is invoked. This allows long running or slow blocks to empty out rapidly during teardown. - UHD will also attempt to flush at init time in case a block is destroyed abnormally. The goal of the flush mechanism is to not lock up the FPGA - noc_shell compat number is now 3
* 3.13.0.0 ReleaseBrent Stapleton2018-07-241-0/+0
| | | | | | | - Update Debian changelog - Update manifest.txt - Update Debian copyright file - Update fpga-src submodule
* manifest.txt: Update B200-series FPGA imagesMartin Braun2018-07-181-0/+0
| | | | Includes fixes for sc8/sc12 streaming.
* n3xx: Updated fpga-src and images for White Rabbit supportAshish Chaudhari2018-04-031-0/+0
| | | | | | Targets updated: - n3xx_n310_fpga_default and n3xx_n300_fpga_default (has new WX target) - n3xx_n310_fpga_aurora and n3xx_n300_fpga_aurora
* Update fpga-src submodule pointerMartin Braun2018-03-271-0/+0
| | | | This includes the DDS update, required by d588005f.
* Update master branch for 3.11.0.0 releaseMartin Braun2018-03-051-0/+0
| | | | | | - Updated fpga-src submodule pointer - Updated CHANGELOG - Updated Debian-related files
* x300: Fixed processor clock rate in ZPU firmwareAshish Chaudhari2018-02-231-0/+0
| | | | | - Fix for regression that was introduced after the bus_clk freq change - Firmware compat number bumped to 6.0 (was 5.2)
* rfnoc,x300: Multiple clocking changesAshish Chaudhari2018-02-211-0/+0
| | | | | | - Moved bus_clk <=> ce_clk crossing to axi_wrapper in FPGA which resulted in a noc_shell compat bump - Change x300 bus_clk frequency to 187.5 MHz
* mpm: N310 updates FPGA information on initBrent Stapleton2018-02-191-0/+0
| | | | | | | | | -Adding MboardRegsControl.get_fpga_type(), which reads the SFP info registers and determines the FPGA image type (HG, XG, AA, etc). This is a minor FPGA compat number bump. -Adding N310._update_fpga_type(), which updates the component information using the get_fpga_type() function described above. This information can then be accessed through get_component_info().
* fixup! mpm: magnesium_update_cpld.py: Add axi_bitq supportBrent Stapleton2018-02-091-0/+0
|
* usrp3: Changes for Vivado 2017.4Ashish Chaudhari2018-01-241-0/+0
| | | | | | - Bumped compat number for e3xx, n230, x3xx, n3xx - Updated images package for e3xx, n230, x3xx, n3xx - Updated fpga-src submodule
* mpm: n310: Bump compat number to 2.0Martin Braun2018-01-161-0/+0
| | | | - Updated fpga-src submodule pointer
* ddc/duc: enhance ddc/duc with new parametersRyan Marlow2017-12-201-0/+0
| | | | | | | | | | | | - NUM_HALFBANDS and CIC_MAX are no longer hard coded and are now readback regs. - both DDC and DUC use same encoding to enable halfbands (increment the number) - removed hacky hack & fixed get_output_rate/get_input_rate to include only valid rates based on NUM_HALFBANDS and CIC_MAX. - added compatibility number readback w/ warning/error messages - Updated images package to include new DDC/DUC (affects X-Series only) - Updated fpga-src submodule pointer
* uhd: Removed drivers for E100/E110Martin Braun2017-09-291-0/+0
| | | | The E1x0 series is still supported on the 3.9 LTS branch.
* x300: Updated FPGA images to include 214 MHz changeMartin Braun2016-12-131-0/+0
| | | | | - Updated submodule pointer - Updated images package
* Preparing branch for 3.10.1.0 releaseDerek Kozel2016-10-271-0/+0
| | | | | | - Updated CHANGELOG - Updated fpga-src submodule pointer - Updated images package
* Preparing branch for 3.10.1.0 releaseMartin Braun2016-10-181-0/+0
| | | | | | | - Updated CHANGELOG - Updated fpga-src submodule pointer - Updated images package - Updated version string
* Updated fpga-src submodule pointer and images packageSugandha Gupta2016-10-131-0/+0
|
* Updated fpga-src submodule pointerMartin Braun2016-08-161-0/+0
|
* Updated repository for 3.10.0.0 ReleaseMartin Braun2016-08-111-0/+0
| | | | | | | - Updated CHANGELOG - Updated fpga-src submodule - Updated version string - Updated ABI string
* Updated fpga-src submoduleMartin Braun2016-08-091-0/+0
|
* Updated images package and fpga-src to latest masterAshish Chaudhari2016-04-181-0/+0
| | | | | - Added dual-10GigE (XG) images for X3xx - Multiple fixes for B2xx, B2xxmini, E3xx, X3xx, N230
* E310: Radio reset fixmichael-west2016-03-291-0/+0
| | | | | | - Updated images - E310: Bumped compat number to 16 for radio reset fix - Update fpga-src submodule pointer
* Updated fpga-src pointerAshish Chaudhari2016-01-131-0/+0
|
* Updated fpga-src and images packageAshish Chaudhari2016-01-061-0/+0
| | | | - FPGA commit: 86e2195f52ec6b39d4f529ab693fa18de398f650
* Updated fpga-src submoduleAshish Chaudhari2015-12-231-0/+0
|
* Updated fpga-src to c98fc3bAshish Chaudhari2015-10-161-0/+0
|
* Merge branch 'maint'Martin Braun2015-09-111-0/+0
|\
| * Updated fpga-src submodule for 3.9.1 releaseMartin Braun2015-09-111-0/+0
|/
* Updated fpga-src submodule for 3.9.0 ReleaseMartin Braun2015-08-311-0/+0
|
* Updated fpga-src to match RC stateMartin Braun2015-08-181-0/+0
|
* Updated version strings + fpga-src for 3.9.0 releaseMartin Braun2015-08-181-0/+0
|
* Merge branch 'maint'Martin Braun2015-07-141-0/+0
|\ | | | | | | | | | | | | | | | | | | Conflicts: fpga-src host/CMakeLists.txt host/cmake/Modules/UHDVersion.cmake host/lib/usrp/b200/b200_impl.hpp host/lib/usrp/e300/e300_fpga_defs.hpp host/lib/usrp/x300/x300_fw_common.h
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-30 11:50:18 +0000