mirror of
https://github.com/EttusResearch/uhd.git
synced 2026-10-25 17:36:10 +00:00
Compare commits
5 Commits
43875c9f25
...
b30cd6c44c
| Author | SHA1 | Date | |
|---|---|---|---|
|
b30cd6c44c | ||
|
|
e14ba329f7 | ||
|
|
74a7905854 | ||
|
|
886c076933 | ||
|
|
0320e7918d |
@ -34,6 +34,9 @@ SKIP_PATHS = [
|
||||
"lib/packet_proc_200",
|
||||
"lib/radio_200",
|
||||
"lib/vita_200",
|
||||
"lib/wb_spi/bench",
|
||||
"lib/wb_spi/doc",
|
||||
"lib/wb_spi/sim",
|
||||
]
|
||||
|
||||
|
||||
|
||||
@ -126,7 +126,7 @@ Description: universal hardware driver for Ettus Research products - doc
|
||||
Package: uhd-rfnoc-dev
|
||||
Architecture: all
|
||||
Section: libdevel
|
||||
Depends: python3, csh, ${misc:Depends}
|
||||
Depends: python3, ${misc:Depends}
|
||||
Recommends: libuhd-dev (= ${binary:Version})
|
||||
Suggests: uhd-doc
|
||||
Multi-Arch: foreign
|
||||
|
||||
@ -2,3 +2,4 @@ usr/include
|
||||
usr/lib/*/cmake/uhd/*.cmake
|
||||
usr/lib/*/libuhd.so
|
||||
usr/lib/*/pkgconfig
|
||||
usr/share/uhd/*/rfnoc-newmod
|
||||
|
||||
@ -1 +1,6 @@
|
||||
usr/lib/*/*.so.*
|
||||
usr/share/uhd/*/cal
|
||||
usr/share/uhd/*/rfnoc/blocks
|
||||
usr/share/uhd/*/rfnoc/core
|
||||
usr/share/uhd/*/rfnoc/modules
|
||||
usr/share/uhd/*/rfnoc/transport_adapters
|
||||
|
||||
22
host/cmake/debian/patches/rfnoc-blocks-track-runtime-abi
Normal file
22
host/cmake/debian/patches/rfnoc-blocks-track-runtime-abi
Normal file
@ -0,0 +1,22 @@
|
||||
From c32d2668697311670df8b9023e97b45d574566e3 Mon Sep 17 00:00:00 2001
|
||||
From: "A. Maitland Bottoms" <bottoms@debian.org>
|
||||
Date: Mon, 21 Dec 2020 21:17:23 -0400
|
||||
Subject: [PATCH 07/11] rfnoc blocks track runtime abi
|
||||
|
||||
Including ABI version in paths allows multiple versions of libuhd
|
||||
to be installed at once, easing transition conflicts.
|
||||
---
|
||||
host/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/host/CMakeLists.txt
|
||||
+++ b/host/CMakeLists.txt
|
||||
@@ -135,7 +135,7 @@ include(UHDPackage) #setup cpack
|
||||
########################################################################
|
||||
include(GNUInstallDirs)
|
||||
|
||||
-set(PKG_DATA_DIR ${CMAKE_INSTALL_DATAROOTDIR}/uhd)
|
||||
+set(PKG_DATA_DIR ${CMAKE_INSTALL_DATAROOTDIR}/uhd/${UHD_ABI_VERSION})
|
||||
if(NOT DEFINED PKG_LIB_DIR)
|
||||
set(PKG_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/uhd)
|
||||
endif()
|
||||
@ -1 +1,2 @@
|
||||
host-paths-return-uhd-build_info-install_prefix-as-p.patch
|
||||
rfnoc-blocks-track-runtime-abi
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
debian/NetworkManager-USRP /etc/NetworkManager/system-connections/
|
||||
usr/lib/uhd* /usr/lib/
|
||||
usr/bin/rfnoc_image_builder
|
||||
usr/bin/rfnoc_modtool
|
||||
usr/bin/uhd_adc_self_cal
|
||||
@ -12,9 +11,4 @@ usr/bin/uhd_image_loader
|
||||
usr/bin/uhd_images_downloader
|
||||
usr/bin/uhd_usrp_probe
|
||||
usr/bin/usrp2_card_burner
|
||||
usr/share/uhd/cal
|
||||
usr/share/uhd/rfnoc/blocks
|
||||
usr/share/uhd/rfnoc/core
|
||||
usr/share/uhd/rfnoc/modules
|
||||
usr/share/uhd/rfnoc/transport_adapters
|
||||
usr/share/uhd/rfnoc-newmod
|
||||
usr/bin/usrpctl
|
||||
|
||||
@ -1 +1 @@
|
||||
usr/share/uhd/rfnoc/fpga/usrp3
|
||||
usr/share/uhd/*/rfnoc/fpga
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# !/usr/bin/env python3
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
# Copyright 2025 Ettus Research, a National Instruments Brand
|
||||
#
|
||||
|
||||
@ -96,6 +96,7 @@ data:
|
||||
outputs:
|
||||
# This will generate one or more ports all called 'out'. It is also
|
||||
# possible to have multiple ports with different names.
|
||||
out:
|
||||
% if data_iface_type == 'axis_data':
|
||||
num_ports: ${ num_outputs }
|
||||
item_width: ${ out_item_width }
|
||||
|
||||
@ -9,9 +9,9 @@ x4xx_zbx_cpld_default uhd-8d022b3 x4xx/uhd-8d022b3/x4xx_zbx_cpld
|
||||
x4xx_x440_fpga_default uhd-ccf87eb x4xx/uhd-ccf87eb/x4xx_x440_fpga_default-gccf87eb.zip 7189dfed4471463209f7ad6044c0237e2317fd3c6b852fe1be644689e0159b5e
|
||||
x4xx_x440_cpld_default uhd-f5bb3e0 x4xx/uhd-f5bb3e0/x4xx_x440_cpld_default-gf5bb3e0.zip 1c929c125b868bac47e027e4351ca8f3cbafc8ea517fff24693a1801955eb4db
|
||||
# X410-Series Filesystems
|
||||
x4xx_common_sdk_default meta-ettus-v4.9.0.0-rc2 x4xx/meta-ettus-v4.9.0.0-rc2/x4xx_common_sdk_default-v4.9.0.0-rc2.zip 0
|
||||
x4xx_common_mender_default meta-ettus-v4.9.0.0-rc2 x4xx/meta-ettus-v4.9.0.0-rc2/x4xx_common_mender_default-v4.9.0.0-rc2.zip 0
|
||||
x4xx_common_sdimg_default meta-ettus-v4.9.0.0-rc2 x4xx/meta-ettus-v4.9.0.0-rc2/x4xx_common_sdimg_default-v4.9.0.0-rc2.zip 0
|
||||
x4xx_common_sdk_default meta-ettus-v4.9.0.0 x4xx/meta-ettus-v4.9.0.0/x4xx_common_sdk_default-v4.9.0.0.zip 0
|
||||
x4xx_common_mender_default meta-ettus-v4.9.0.0 x4xx/meta-ettus-v4.9.0.0/x4xx_common_mender_default-v4.9.0.0.zip 0
|
||||
x4xx_common_sdimg_default meta-ettus-v4.9.0.0 x4xx/meta-ettus-v4.9.0.0/x4xx_common_sdimg_default-v4.9.0.0.zip 0
|
||||
|
||||
# X300-Series
|
||||
x3xx_x300_fpga_default uhd-ccf87eb x3xx/uhd-ccf87eb/x3xx_x300_fpga_default-gccf87eb.zip a4fe86c785d48a4ae410ea3770bc529570d005b85c34bccf67a35d674d5727fd
|
||||
@ -26,16 +26,16 @@ e3xx_e310_sg3_fpga_default uhd-ccf87eb e3xx/uhd-ccf87eb/e3xx_e310_sg3
|
||||
e3xx_e320_fpga_default uhd-ccf87eb e3xx/uhd-ccf87eb/e3xx_e320_fpga_default-gccf87eb.zip a06ad03bd457dce5c493168b991bf496c9d065d607b46f46d36c162b52ade1ce
|
||||
|
||||
# E310 Filesystems
|
||||
e3xx_e310_sdk_default meta-ettus-v4.9.0.0-rc2 e3xx/meta-ettus-v4.9.0.0-rc2/e3xx_e310_sdk_default-v4.9.0.0-rc2.zip 0
|
||||
e3xx_e310_sg1_mender_default meta-ettus-v4.9.0.0-rc2 e3xx/meta-ettus-v4.9.0.0-rc2/e3xx_e310_sg1_mender_default-v4.9.0.0-rc2.zip 0
|
||||
e3xx_e310_sg1_sdimg_default meta-ettus-v4.9.0.0-rc2 e3xx/meta-ettus-v4.9.0.0-rc2/e3xx_e310_sg1_sdimg_default-v4.9.0.0-rc2.zip 0
|
||||
e3xx_e310_sg3_mender_default meta-ettus-v4.9.0.0-rc2 e3xx/meta-ettus-v4.9.0.0-rc2/e3xx_e310_sg3_mender_default-v4.9.0.0-rc2.zip 0
|
||||
e3xx_e310_sg3_sdimg_default meta-ettus-v4.9.0.0-rc2 e3xx/meta-ettus-v4.9.0.0-rc2/e3xx_e310_sg3_sdimg_default-v4.9.0.0-rc2.zip 0
|
||||
e3xx_e310_sdk_default meta-ettus-v4.9.0.0 e3xx/meta-ettus-v4.9.0.0/e3xx_e310_sdk_default-v4.9.0.0.zip 0
|
||||
e3xx_e310_sg1_mender_default meta-ettus-v4.9.0.0 e3xx/meta-ettus-v4.9.0.0/e3xx_e310_sg1_mender_default-v4.9.0.0.zip 0
|
||||
e3xx_e310_sg1_sdimg_default meta-ettus-v4.9.0.0 e3xx/meta-ettus-v4.9.0.0/e3xx_e310_sg1_sdimg_default-v4.9.0.0.zip 0
|
||||
e3xx_e310_sg3_mender_default meta-ettus-v4.9.0.0 e3xx/meta-ettus-v4.9.0.0/e3xx_e310_sg3_mender_default-v4.9.0.0.zip 0
|
||||
e3xx_e310_sg3_sdimg_default meta-ettus-v4.9.0.0 e3xx/meta-ettus-v4.9.0.0/e3xx_e310_sg3_sdimg_default-v4.9.0.0.zip 0
|
||||
|
||||
# E320 Filesystems, etc
|
||||
e3xx_e320_sdk_default meta-ettus-v4.9.0.0-rc2 e3xx/meta-ettus-v4.9.0.0-rc2/e3xx_e320_sdk_default-v4.9.0.0-rc2.zip 0
|
||||
e3xx_e320_mender_default meta-ettus-v4.9.0.0-rc2 e3xx/meta-ettus-v4.9.0.0-rc2/e3xx_e320_mender_default-v4.9.0.0-rc2.zip 0
|
||||
e3xx_e320_sdimg_default meta-ettus-v4.9.0.0-rc2 e3xx/meta-ettus-v4.9.0.0-rc2/e3xx_e320_sdimg_default-v4.9.0.0-rc2.zip 0
|
||||
e3xx_e320_sdk_default meta-ettus-v4.9.0.0 e3xx/meta-ettus-v4.9.0.0/e3xx_e320_sdk_default-v4.9.0.0.zip 0
|
||||
e3xx_e320_mender_default meta-ettus-v4.9.0.0 e3xx/meta-ettus-v4.9.0.0/e3xx_e320_mender_default-v4.9.0.0.zip 0
|
||||
e3xx_e320_sdimg_default meta-ettus-v4.9.0.0 e3xx/meta-ettus-v4.9.0.0/e3xx_e320_sdimg_default-v4.9.0.0.zip 0
|
||||
|
||||
# N300-Series
|
||||
n3xx_n300_fpga_default uhd-ccf87eb n3xx/uhd-ccf87eb/n3xx_n300_fpga_default-gccf87eb.zip 935754bf71985cb90f2eba754783e9f56b7ff97152861ccca1c084c6cd301f5f
|
||||
@ -46,9 +46,9 @@ n3xx_n320_cpld_default uhd-739b37b n3xx/uhd-739b37b/n3xx_n320_c
|
||||
# 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-v4.9.0.0-rc2 n3xx/meta-ettus-v4.9.0.0-rc2/n3xx_common_sdk_default-v4.9.0.0-rc2.zip 0
|
||||
n3xx_common_mender_default meta-ettus-v4.9.0.0-rc2 n3xx/meta-ettus-v4.9.0.0-rc2/n3xx_common_mender_default-v4.9.0.0-rc2.zip 0
|
||||
n3xx_common_sdimg_default meta-ettus-v4.9.0.0-rc2 n3xx/meta-ettus-v4.9.0.0-rc2/n3xx_common_sdimg_default-v4.9.0.0-rc2.zip 0
|
||||
n3xx_common_sdk_default meta-ettus-v4.9.0.0 n3xx/meta-ettus-v4.9.0.0/n3xx_common_sdk_default-v4.9.0.0.zip 0
|
||||
n3xx_common_mender_default meta-ettus-v4.9.0.0 n3xx/meta-ettus-v4.9.0.0/n3xx_common_mender_default-v4.9.0.0.zip 0
|
||||
n3xx_common_sdimg_default meta-ettus-v4.9.0.0 n3xx/meta-ettus-v4.9.0.0/n3xx_common_sdimg_default-v4.9.0.0.zip 0
|
||||
|
||||
# B200-Series
|
||||
b2xx_b200_fpga_default uhd-c37b318 b2xx/uhd-c37b318/b2xx_b200_fpga_default-gc37b318.zip 35542b8a2b6a6dfd3aa155c35364af85c2599cfb692b0cf94013c5342c945448
|
||||
|
||||
Loading…
Reference in New Issue
Block a user