From bafa9d95453387814ef25e6b6256ba8db2df612f Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 23 Jan 2020 16:10:22 -0800 Subject: Merge FPGA repository back into UHD repository MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Co-authored-by: Andrej Rode Co-authored-by: Ashish Chaudhari Co-authored-by: Ben Hilburn Co-authored-by: Ciro Nishiguchi Co-authored-by: Daniel Jepson Co-authored-by: Derek Kozel Co-authored-by: EJ Kreinar Co-authored-by: Humberto Jimenez Co-authored-by: Ian Buckley Co-authored-by: Jörg Hofrichter Co-authored-by: Jon Kiser Co-authored-by: Josh Blum Co-authored-by: Jonathon Pendlum Co-authored-by: Martin Braun Co-authored-by: Matt Ettus Co-authored-by: Michael West Co-authored-by: Moritz Fischer Co-authored-by: Nick Foster Co-authored-by: Nicolas Cuervo Co-authored-by: Paul Butler Co-authored-by: Paul David Co-authored-by: Ryan Marlow Co-authored-by: Sugandha Gupta Co-authored-by: Sylvain Munaut Co-authored-by: Trung Tran Co-authored-by: Vidush Vishwanath Co-authored-by: Wade Fife --- fpga/usrp1/rbf/.gitignore | 4 ++++ fpga/usrp1/rbf/Makefile.am | 22 ++++++++++++++++++++++ fpga/usrp1/rbf/rev2/.gitignore | 2 ++ fpga/usrp1/rbf/rev2/Makefile.am | 31 +++++++++++++++++++++++++++++++ fpga/usrp1/rbf/rev2/inband_1rxhb_1tx.rbf | Bin 0 -> 161180 bytes fpga/usrp1/rbf/rev2/inband_2rxhb_2tx.rbf | Bin 0 -> 191849 bytes fpga/usrp1/rbf/rev2/multi_2rxhb_2tx.rbf | Bin 0 -> 180809 bytes fpga/usrp1/rbf/rev2/multi_4rx_0tx.rbf | Bin 0 -> 180537 bytes fpga/usrp1/rbf/rev2/std_2rxhb_2tx.rbf | Bin 0 -> 181588 bytes fpga/usrp1/rbf/rev2/std_4rx_0tx.rbf | Bin 0 -> 183046 bytes fpga/usrp1/rbf/rev4/.gitignore | 2 ++ fpga/usrp1/rbf/rev4/Makefile.am | 31 +++++++++++++++++++++++++++++++ fpga/usrp1/rbf/rev4/inband_1rxhb_1tx.rbf | Bin 0 -> 161180 bytes fpga/usrp1/rbf/rev4/inband_2rxhb_2tx.rbf | Bin 0 -> 191849 bytes fpga/usrp1/rbf/rev4/multi_2rxhb_2tx.rbf | Bin 0 -> 180809 bytes fpga/usrp1/rbf/rev4/multi_4rx_0tx.rbf | Bin 0 -> 180537 bytes fpga/usrp1/rbf/rev4/std_2rxhb_2tx.rbf | Bin 0 -> 181588 bytes fpga/usrp1/rbf/rev4/std_4rx_0tx.rbf | Bin 0 -> 183046 bytes 18 files changed, 92 insertions(+) create mode 100644 fpga/usrp1/rbf/.gitignore create mode 100644 fpga/usrp1/rbf/Makefile.am create mode 100644 fpga/usrp1/rbf/rev2/.gitignore create mode 100644 fpga/usrp1/rbf/rev2/Makefile.am create mode 100755 fpga/usrp1/rbf/rev2/inband_1rxhb_1tx.rbf create mode 100755 fpga/usrp1/rbf/rev2/inband_2rxhb_2tx.rbf create mode 100755 fpga/usrp1/rbf/rev2/multi_2rxhb_2tx.rbf create mode 100755 fpga/usrp1/rbf/rev2/multi_4rx_0tx.rbf create mode 100755 fpga/usrp1/rbf/rev2/std_2rxhb_2tx.rbf create mode 100755 fpga/usrp1/rbf/rev2/std_4rx_0tx.rbf create mode 100644 fpga/usrp1/rbf/rev4/.gitignore create mode 100644 fpga/usrp1/rbf/rev4/Makefile.am create mode 100755 fpga/usrp1/rbf/rev4/inband_1rxhb_1tx.rbf create mode 100755 fpga/usrp1/rbf/rev4/inband_2rxhb_2tx.rbf create mode 100755 fpga/usrp1/rbf/rev4/multi_2rxhb_2tx.rbf create mode 100755 fpga/usrp1/rbf/rev4/multi_4rx_0tx.rbf create mode 100755 fpga/usrp1/rbf/rev4/std_2rxhb_2tx.rbf create mode 100755 fpga/usrp1/rbf/rev4/std_4rx_0tx.rbf (limited to 'fpga/usrp1/rbf') diff --git a/fpga/usrp1/rbf/.gitignore b/fpga/usrp1/rbf/.gitignore new file mode 100644 index 000000000..eb58a95f5 --- /dev/null +++ b/fpga/usrp1/rbf/.gitignore @@ -0,0 +1,4 @@ +/Makefile +/Makefile.in +/usrp_fpga_rev1.rbf +/usrp_fpga_rev2.rbf diff --git a/fpga/usrp1/rbf/Makefile.am b/fpga/usrp1/rbf/Makefile.am new file mode 100644 index 000000000..7bce77d5f --- /dev/null +++ b/fpga/usrp1/rbf/Makefile.am @@ -0,0 +1,22 @@ +# +# Copyright 2005,2006,2009 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +SUBDIRS = rev2 rev4 diff --git a/fpga/usrp1/rbf/rev2/.gitignore b/fpga/usrp1/rbf/rev2/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/fpga/usrp1/rbf/rev2/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/fpga/usrp1/rbf/rev2/Makefile.am b/fpga/usrp1/rbf/rev2/Makefile.am new file mode 100644 index 000000000..487650e18 --- /dev/null +++ b/fpga/usrp1/rbf/rev2/Makefile.am @@ -0,0 +1,31 @@ +# +# Copyright 2009 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/Makefile.common + +rbf2datadir = $(prefix)/share/usrp/rev2 + +dist_rbf2data_DATA = \ + std_2rxhb_2tx.rbf \ + std_4rx_0tx.rbf \ + inband_1rxhb_1tx.rbf \ + inband_2rxhb_2tx.rbf \ + multi_2rxhb_2tx.rbf diff --git a/fpga/usrp1/rbf/rev2/inband_1rxhb_1tx.rbf b/fpga/usrp1/rbf/rev2/inband_1rxhb_1tx.rbf new file mode 100755 index 000000000..c1c9af2ce Binary files /dev/null and b/fpga/usrp1/rbf/rev2/inband_1rxhb_1tx.rbf differ diff --git a/fpga/usrp1/rbf/rev2/inband_2rxhb_2tx.rbf b/fpga/usrp1/rbf/rev2/inband_2rxhb_2tx.rbf new file mode 100755 index 000000000..ca1a0f92b Binary files /dev/null and b/fpga/usrp1/rbf/rev2/inband_2rxhb_2tx.rbf differ diff --git a/fpga/usrp1/rbf/rev2/multi_2rxhb_2tx.rbf b/fpga/usrp1/rbf/rev2/multi_2rxhb_2tx.rbf new file mode 100755 index 000000000..2683d8641 Binary files /dev/null and b/fpga/usrp1/rbf/rev2/multi_2rxhb_2tx.rbf differ diff --git a/fpga/usrp1/rbf/rev2/multi_4rx_0tx.rbf b/fpga/usrp1/rbf/rev2/multi_4rx_0tx.rbf new file mode 100755 index 000000000..b7e4eb393 Binary files /dev/null and b/fpga/usrp1/rbf/rev2/multi_4rx_0tx.rbf differ diff --git a/fpga/usrp1/rbf/rev2/std_2rxhb_2tx.rbf b/fpga/usrp1/rbf/rev2/std_2rxhb_2tx.rbf new file mode 100755 index 000000000..ee3c30d66 Binary files /dev/null and b/fpga/usrp1/rbf/rev2/std_2rxhb_2tx.rbf differ diff --git a/fpga/usrp1/rbf/rev2/std_4rx_0tx.rbf b/fpga/usrp1/rbf/rev2/std_4rx_0tx.rbf new file mode 100755 index 000000000..1deca9517 Binary files /dev/null and b/fpga/usrp1/rbf/rev2/std_4rx_0tx.rbf differ diff --git a/fpga/usrp1/rbf/rev4/.gitignore b/fpga/usrp1/rbf/rev4/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/fpga/usrp1/rbf/rev4/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/fpga/usrp1/rbf/rev4/Makefile.am b/fpga/usrp1/rbf/rev4/Makefile.am new file mode 100644 index 000000000..54de9b818 --- /dev/null +++ b/fpga/usrp1/rbf/rev4/Makefile.am @@ -0,0 +1,31 @@ +# +# Copyright 2009 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/Makefile.common + +rbf4datadir = $(prefix)/share/usrp/rev4 + +dist_rbf4data_DATA = \ + std_2rxhb_2tx.rbf \ + std_4rx_0tx.rbf \ + inband_1rxhb_1tx.rbf \ + inband_2rxhb_2tx.rbf \ + multi_2rxhb_2tx.rbf diff --git a/fpga/usrp1/rbf/rev4/inband_1rxhb_1tx.rbf b/fpga/usrp1/rbf/rev4/inband_1rxhb_1tx.rbf new file mode 100755 index 000000000..c1c9af2ce Binary files /dev/null and b/fpga/usrp1/rbf/rev4/inband_1rxhb_1tx.rbf differ diff --git a/fpga/usrp1/rbf/rev4/inband_2rxhb_2tx.rbf b/fpga/usrp1/rbf/rev4/inband_2rxhb_2tx.rbf new file mode 100755 index 000000000..ca1a0f92b Binary files /dev/null and b/fpga/usrp1/rbf/rev4/inband_2rxhb_2tx.rbf differ diff --git a/fpga/usrp1/rbf/rev4/multi_2rxhb_2tx.rbf b/fpga/usrp1/rbf/rev4/multi_2rxhb_2tx.rbf new file mode 100755 index 000000000..2683d8641 Binary files /dev/null and b/fpga/usrp1/rbf/rev4/multi_2rxhb_2tx.rbf differ diff --git a/fpga/usrp1/rbf/rev4/multi_4rx_0tx.rbf b/fpga/usrp1/rbf/rev4/multi_4rx_0tx.rbf new file mode 100755 index 000000000..b7e4eb393 Binary files /dev/null and b/fpga/usrp1/rbf/rev4/multi_4rx_0tx.rbf differ diff --git a/fpga/usrp1/rbf/rev4/std_2rxhb_2tx.rbf b/fpga/usrp1/rbf/rev4/std_2rxhb_2tx.rbf new file mode 100755 index 000000000..ee3c30d66 Binary files /dev/null and b/fpga/usrp1/rbf/rev4/std_2rxhb_2tx.rbf differ diff --git a/fpga/usrp1/rbf/rev4/std_4rx_0tx.rbf b/fpga/usrp1/rbf/rev4/std_4rx_0tx.rbf new file mode 100755 index 000000000..1deca9517 Binary files /dev/null and b/fpga/usrp1/rbf/rev4/std_4rx_0tx.rbf differ -- cgit v1.2.3