Skip to content

Commit

Permalink
3.13.0.0 Release
Browse files Browse the repository at this point in the history
- Update Debian changelog
- Update manifest.txt
- Update Debian copyright file
- Update fpga-src submodule
  • Loading branch information
brentstapleton committed Jul 24, 2018
1 parent a39b668 commit f114cfa
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 4 deletions.
2 changes: 1 addition & 1 deletion fpga-src
Submodule fpga-src updated 68 files
+102 −0 usrp3/top/e320/Makefile
+133 −0 usrp3/top/e320/Makefile.e320.inc
+10 −0 usrp3/top/e320/Makefile.srcs
+39 −0 usrp3/top/e320/build_e320.tcl
+3 −0 usrp3/top/e320/dev_config.json
+359 −0 usrp3/top/e320/dts/dma-common.dtsi
+74 −0 usrp3/top/e320/dts/e320-common.dtsi
+17 −0 usrp3/top/e320/dts/e320-fpga.dtsi
+55 −0 usrp3/top/e320/dts/usrp_e320_fpga_1G.dts
+31 −0 usrp3/top/e320/dts/usrp_e320_fpga_AA.dts
+55 −0 usrp3/top/e320/dts/usrp_e320_fpga_XG.dts
+1,737 −0 usrp3/top/e320/e320.v
+16 −0 usrp3/top/e320/e320_10ge.xdc
+7 −0 usrp3/top/e320/e320_10ge_port0.xdc
+15 −0 usrp3/top/e320/e320_1ge.xdc
+13 −0 usrp3/top/e320/e320_aurora.xdc
+220 −0 usrp3/top/e320/e320_clocking.v
+1,126 −0 usrp3/top/e320/e320_core.v
+27 −0 usrp3/top/e320/e320_dram.xdc
+81 −0 usrp3/top/e320/ip/Makefile.inc
+30 −0 usrp3/top/e320/ip/aurora_64b66b_pcs_pma/Makefile.inc
+1,218 −0 usrp3/top/e320/ip/aurora_64b66b_pcs_pma/aurora_64b66b_pcs_pma.xci
+329 −0 usrp3/top/e320/ip/aurora_64b66b_pcs_pma/aurora_axis_mac.v
+370 −0 usrp3/top/e320/ip/aurora_64b66b_pcs_pma/aurora_phy_x1.v
+15 −0 usrp3/top/e320/ip/axi64_4k_2clk_fifo/Makefile.inc
+548 −0 usrp3/top/e320/ip/axi64_4k_2clk_fifo/axi64_4k_2clk_fifo.xci
+15 −0 usrp3/top/e320/ip/axi64_8k_2clk_fifo/Makefile.inc
+546 −0 usrp3/top/e320/ip/axi64_8k_2clk_fifo/axi64_8k_2clk_fifo.xci
+14 −0 usrp3/top/e320/ip/axi_eth_dma/Makefile.inc
+327 −0 usrp3/top/e320/ip/axi_eth_dma/axi_eth_dma.xci
+17 −0 usrp3/top/e320/ip/axi_intercon_4x64_256_bd/Makefile.inc
+2,191 −0 usrp3/top/e320/ip/axi_intercon_4x64_256_bd/axi_intercon_4x64_256_bd.bd
+123 −0 usrp3/top/e320/ip/axi_intercon_4x64_256_bd/axi_intercon_4x64_256_bd.bxml
+419 −0 usrp3/top/e320/ip/axi_intercon_4x64_256_bd/axi_intercon_4x64_256_bd_wrapper.v
+26 −0 usrp3/top/e320/ip/ddr3_32bit/Makefile.inc
+2,184 −0 usrp3/top/e320/ip/ddr3_32bit/ddr3_32bit.xci
+161 −0 usrp3/top/e320/ip/ddr3_32bit/mig_xc7z045ffg900-3.prj
+32 −0 usrp3/top/e320/ip/e320_ps_bd/Makefile.inc
+73 −0 usrp3/top/e320/ip/e320_ps_bd/chdr_dma_frame_size.tcl
+359 −0 usrp3/top/e320/ip/e320_ps_bd/chdr_dma_rx.tcl
+239 −0 usrp3/top/e320/ip/e320_ps_bd/chdr_dma_top.tcl
+172 −0 usrp3/top/e320/ip/e320_ps_bd/chdr_dma_tx.tcl
+ usrp3/top/e320/ip/e320_ps_bd/e320_ps_bd.pdf
+818 −0 usrp3/top/e320/ip/e320_ps_bd/e320_ps_bd.tcl
+13,335 −0 usrp3/top/e320/ip/e320_ps_bd/ps7_init.c
+13,326 −0 usrp3/top/e320/ip/e320_ps_bd/ps7_init_gpl.c
+15 −0 usrp3/top/e320/ip/fifo_4k_2clk/Makefile.inc
+540 −0 usrp3/top/e320/ip/fifo_4k_2clk/fifo_4k_2clk.xci
+15 −0 usrp3/top/e320/ip/fifo_short_2clk/Makefile.inc
+542 −0 usrp3/top/e320/ip/fifo_short_2clk/fifo_short_2clk.xci
+49 −0 usrp3/top/e320/ip/one_gig_eth_pcs_pma/Makefile.inc
+292 −0 usrp3/top/e320/ip/one_gig_eth_pcs_pma/one_gig_eth_pcs_pma.xci
+25 −0 usrp3/top/e320/ip/one_gig_eth_pcs_pma/one_gig_eth_pcs_pma_clocking.v.patch
+17 −0 usrp3/top/e320/ip/one_gig_eth_pcs_pma/one_gig_eth_pcs_pma_support.v.patch
+102 −0 usrp3/top/e320/ip/one_gig_eth_pcs_pma/one_gige_phy.v
+42 −0 usrp3/top/e320/ip/ten_gig_eth_pcs_pma/Makefile.inc
+161 −0 usrp3/top/e320/ip/ten_gig_eth_pcs_pma/ten_gig_eth_pcs_pma.xci
+249 −0 usrp3/top/e320/ip/ten_gig_eth_pcs_pma/ten_gige_phy.v
+37 −0 usrp3/top/e320/ip/ten_gig_eth_pcs_pma/ten_gige_phy_clk_gen.v
+473 −0 usrp3/top/e320/mb_pins.xdc
+349 −0 usrp3/top/e320/mb_timing.xdc
+618 −0 usrp3/top/e320/n3xx_mgt_io_core.v
+522 −0 usrp3/top/e320/n3xx_sfp_wrapper.v
+63 −0 usrp3/top/e320/rfnoc_ce_auto_inst_e320.v
+46 −0 usrp3/top/e320/rfnoc_ce_default_inst_e320.v
+10 −0 usrp3/top/e320/setupenv.sh
+1 −1 usrp3/top/n3xx/ip/aurora_64b66b_pcs_pma/Makefile.inc
+0 −1 usrp3/top/n3xx/n3xx_sfp_wrapper.v
25 changes: 25 additions & 0 deletions host/cmake/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
uhd (3.13.0.0-0ubuntu1) trusty; urgency=low

* N3x0: Enable fast-reinit, fix power level issue, accept 0x01 PID for
AD9371, fix concurrency issues with Liberio
* B200: Fix sc8/sc12 modes, fix frame-size related issues, fix tick rate
coercion, fix issues on update of tick rate, fix EOB-not-seen
issue
* E310: Move to RFNoC architecture (this disables network mode!)
* UBX: Fix phase synchronization for 184.32 MHz master clock rate,
* multi_usrp: Fix get_?x_info() API calls
* UHD: Remove more Boost usage, fix some compiler warnings, default to
all-channels subdev specs for X3x0 and N3x0, various LMX2592
fixes, bump minimum CMake to 2.8.2, fix logging dtor issues
* RFNoC: Merge all existing RFNoC features into master
* FPGA: Fix various testbenches, add batch testbench execution mode,
improve uhd_image_builder and uhd_image_builder_gui, add all
existing RFNoC features
* Add Python API
* MPM: Enable Rev2 EEPROM format, fix some rare issues when detecting
Ethernet devices
* CMake: Allow to override UHD_GIT_BRANCH, fix Python-finding logic, add
ENABLE_N300 target

-- Ettus Research <[email protected]> Tue, 24 Jul 2018 10:13:10 -0800

uhd (3.12.0.0-0ubuntu1) trusty; urgency=low

* N3x0: Add White Rabbit support, add N300 support, standard BIST
Expand Down
94 changes: 94 additions & 0 deletions host/cmake/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,11 @@ Copyright: 2004-2008 oharboe - �yvind Harboe - [email protected]
License: zpu-FreeBSD
Comment: Not used for uhd-host package

Files: mpm/lib/mykonos/adi/*
Copyright: Copyright (c) 2015-2017 Analog Devices Inc.
License: AD9371-API
Comment: Not used for uhd-host package

License: GPL-2+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -1167,3 +1172,92 @@ License: MIT
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

License: AD9371-API
Analog Devices, Inc. ("ADI")
Source Code Software License Agreement
20130524-CISC-CTSLA
.
DOWNLOADING, REPRODUCING, DISTRIBUTING OR OTHERWISE USING THE SOFTWARE
CONSTITUTES ACCEPTANCE OF THIS LICENSE. THE SOFTWARE MAY NOT BE USED EXCEPT AS
EXPRESSLY AUTHORIZED UNDER THIS LICENSE.
.
The software is protected by copyright law and international copyright
treaties.
.
License: Subject to the terms and conditions of this license, the software may
be reproduced, modified and distributed in source code and object code form.
.
Conditions:
Any distribution of the software must include a complete copy of this license
and retain all copyright and other proprietary notices. The software that is
distributed (including modified versions of the software) shall be subject to
the terms and conditions of this license.
The software may not be combined or merged with other software in any manner
that would cause the software to become subject to terms and conditions which
differ from those of this license.
Licensee shall not use the name or any trademark of ADI (including those of
its licensors) or any contributor to endorse or promote products without prior
written consent of the owner of the name or trademark. The term “contributor”
means any person or entity that modifies or distributes the software.
Modified versions of the Software must be conspicuously marked as such.
Use of the software may or may not infringe patent rights of one or more
patent holders. This license does not alleviate the obligation to obtain
separate licenses from patent holders to use the software.
All rights not expressly granted hereunder are reserved.
This license shall be governed by the laws of Massachusetts, without regard to
its conflict of laws rules. The software shall only be used in compliance with
all applicable laws and regulations, including without limitation export
control laws.
.
WARRANTY DISCLAIMER: THE SOFTWARE AND ANY RELATED INFORMATION AND/OR ADVICE IS
PROVIDED ON AN “AS IS” BASIS, WITHOUT REPRESENTATIONS, GUARANTEES OR
WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, ORAL OR WRITTEN, INCLUDING WITHOUT
LIMITATION, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
TITLE AND NON-INFRINGEMENT. There is no obligation to provide software support
or updates. The Software is not fault-tolerant and is not intended for use in
high risk applications, including without limitation in the operation of
nuclear facilities, aircraft navigation or control systems, air traffic
control, life support machines, weapons systems or any other application in
which the failure of the software could lead to death, personal injury, or
severe physical or environmental damages. The software is not authorized to be
used under such circumstances.
.
LIMITATION OF LIABILITY: TO THE MAXIMUM EXTENT PERMITTED BY LAW ADI (INCLUDING
ITS LICENSORS) AND CONTRIBUTORS SHALL NOT BE LIABLE FOR ANY DAMAGES ARISING
FROM OR RELATED TO THE SOFTWARE, ITS USE OR ANY RELATED INFORMATION AND/OR
SERVICES, INCLUDING BUT NOT LIMITED TO ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, PUNITIVE, EXEMPLARY, CONSEQUENTIAL OR ANALOGOUS DAMAGES (INCLUDING
WITHOUT LIMITATION ANY DAMAGES RESULTING FROM LOSS OF USE, DATA, REVENUE,
PROFITS, OR SAVINGS, COMPUTER DAMAGE OR ANY OTHER CAUSE), UNDER ANY LEGAL
THEORY (INCLUDING WITHOUT LIMITATION CONTRACT, WARRANTY, TORT, NEGLIGENCE,
STRICT OR PRODUCT LIABILITY), EVEN IF IT HAS BEEN INFORMED OF THE POSSIBILITY
OF SUCH DAMAGES. Some jurisdictions do not permit the exclusion or limitation
of liability for consequential, incidental or other damages, and, as such,
some portion of the above limitation may not apply. In such jurisdictions,
liability is limited to the greatest extent permitted by law.
.
Third Party Software: The software may be accompanied by or include software
made available by one or more third parties (“Third Party Software”). Each
portion of Third Party Software is subject to its own separate software
license terms and conditions (“Third Party Licenses”). The Third Party
Licenses for Third Party Software delivered with the software are set forth
or identified (by url or otherwise) in (i) Appendix A to this license (if
any), (ii) the applicable software header or footer text, (iii) a text file
located in the directory of the applicable Third Party Software component
and/or (iv) such other location customarily used for licensing terms. The use
of each portion of Third Party Software is subject to the Third Party
Licenses, and you agree that your use of any Third Party Software is bound by
the applicable Third Party License. You agree to review and comply with all
applicable Third Party Licenses prior to any use or distribution of any Third
Party Software. Third Party Software is provided on an “as is” basis without
any representation, warranty or liability of any kind. ADI (including its
licensors) and contributors shall have no liability or responsibility for the
operation or performance of the Third Party Software and shall not be liable
for any damages, costs, or expenses, direct or indirect, arising out of the
performance or failure to perform of the Third Party Software. ADI (including
its licensors) and contributors shall be entitled to the benefit of any and all
limitations of liability and disclaimers of warranties contained in the Third
Party Licenses. For the avoidance of doubt, this license does not alter, limit
or expand the terms and conditions of, or rights granted to you pursuant to,
Third Party Licenses
6 changes: 3 additions & 3 deletions images/manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ n3xx_n300_fpga_default fpga-1107862 n3xx/fpga-1107862/n3xx_n300_
# N3XX Mykonos firmware
#n3xx_n310_fw_default fpga-6bea23d n3xx/fpga-6bea23d/n3xx_n310_fw_default-g6bea23d.zip 0
# N300-Series Filesystems, etc
n3xx_common_sdk_default meta-ettus-v3.12.0.0 n3xx/meta-ettus-v3.12.0.0/n3xx_common_sdk_default-v3.12.0.0.zip 0
n3xx_common_mender_default meta-ettus-v3.12.0.0 n3xx/meta-ettus-v3.12.0.0/n3xx_common_mender_default-v3.12.0.0.zip 0
n3xx_common_sdimg_default meta-ettus-v3.12.0.0 n3xx/meta-ettus-v3.12.0.0/n3xx_common_sdimg_default-v3.12.0.0.zip 0
n3xx_common_sdk_default meta-ettus-v3.13.0.0 n3xx/meta-ettus-v3.13.0.0/n3xx_common_sdk_default-v3.13.0.0.zip 0
n3xx_common_mender_default meta-ettus-v3.13.0.0 n3xx/meta-ettus-v3.13.0.0/n3xx_common_mender_default-v3.13.0.0.zip 0
n3xx_common_sdimg_default meta-ettus-v3.13.0.0 n3xx/meta-ettus-v3.13.0.0/n3xx_common_sdimg_default-v3.13.0.0.zip 0

# B200-Series
b2xx_b200_fpga_default fpga-63e630a b2xx/fpga-63e630a/b2xx_b200_fpga_default-g63e630a.zip c42f010a90c9a184a2bf8ab7182dcbcc50598a259f06f9b5fda92023dc6cfed8
Expand Down

0 comments on commit f114cfa

Please sign in to comment.