From 83bb450df7ebee176a5e26b61e145b98535521e7 Mon Sep 17 00:00:00 2001 From: "A. Maitland Bottoms" Date: Tue, 20 Dec 2022 19:57:03 -0500 Subject: [PATCH] 0.2022.11-1 upload --- debian/changelog | 6 ++ .../0001-debian-add-2021.03-release.patch | 38 -------- ...-debian-update-fpga-and-fx3-postinst.patch | 86 ------------------- ...-disable-RX-switch-when-tx_ota_req-i.patch | 30 ------- ...rf-wlan-disable-RX-switch-when-tx_ot.patch | 29 ------- debian/patches/gcc-12-warnings | 13 --- debian/patches/series | 5 -- 7 files changed, 6 insertions(+), 201 deletions(-) delete mode 100644 debian/patches/0001-debian-add-2021.03-release.patch delete mode 100644 debian/patches/0002-debian-update-fpga-and-fx3-postinst.patch delete mode 100644 debian/patches/0003-hdl-bladerf-wlan-disable-RX-switch-when-tx_ota_req-i.patch delete mode 100644 debian/patches/0004-Revert-hdl-bladerf-wlan-disable-RX-switch-when-tx_ot.patch delete mode 100644 debian/patches/gcc-12-warnings diff --git a/debian/changelog b/debian/changelog index aeed942..8ad253e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bladerf (0.2022.11-1) unstable; urgency=medium + + * New upstream tag. + + -- A. Maitland Bottoms Tue, 20 Dec 2022 19:42:03 -0500 + bladerf (0.2021.10-4) unstable; urgency=medium * Team upload. diff --git a/debian/patches/0001-debian-add-2021.03-release.patch b/debian/patches/0001-debian-add-2021.03-release.patch deleted file mode 100644 index 74772fe..0000000 --- a/debian/patches/0001-debian-add-2021.03-release.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c56bc3264f807e3927ae6c293e7a4cc68ca5c72a Mon Sep 17 00:00:00 2001 -From: Robert Ghilduta -Date: Tue, 16 Feb 2021 00:57:31 -0500 -Subject: [PATCH 1/4] debian: add 2021.03 release - ---- - debian/changelog | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/debian/changelog b/debian/changelog -index 4ce3802d..ad1efe4e 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,3 +1,21 @@ -+bladerf (2021.03) unstable; urgency=low -+ -+ * Release for 2021.03 tag -+ * Added packet mode format BLADERF_FORMAT_PACKET_META. libbladeRF is able to -+ * exchange variable length packets with the HDL if packet mode is enabled -+ * Added RFIC parameters for burst waveforms -+ * Ability to query backend for handle and lock -+ * Variable length packet support for PACKET_META mode -+ * Indicate presence of packet cores in FPGA -+ * Add packet mode. The HDL fabric is able to exchange variable length -+ * packets with the host -+ * Added packet_generator as an example for how to send packets to the host -+ * Added bladeRF 2.0 micro headless example variant "foxhunt" -+ * Fix metadata related arithmetic and logic -+ -+ -+ -- Robert Ghilduta (Nuand LLC) Tue, 16 Feb 2021 00:50:56 -0500 -+ - bladerf (2019.07) unstable; urgency=low - - * Release for 2019.07 tag --- -2.30.2 - diff --git a/debian/patches/0002-debian-update-fpga-and-fx3-postinst.patch b/debian/patches/0002-debian-update-fpga-and-fx3-postinst.patch deleted file mode 100644 index 7ed0827..0000000 --- a/debian/patches/0002-debian-update-fpga-and-fx3-postinst.patch +++ /dev/null @@ -1,86 +0,0 @@ -From e09200c38e1b273ebe43cd789839e66b0506aead Mon Sep 17 00:00:00 2001 -From: Robert Ghilduta -Date: Tue, 16 Feb 2021 00:57:35 -0500 -Subject: [PATCH 2/4] debian: update fpga and fx3 postinst - ---- - debian/bladerf-firmware-fx3.postinst | 4 ++-- - debian/bladerf-fpga-hostedx115.postinst | 4 ++-- - debian/bladerf-fpga-hostedx40.postinst | 4 ++-- - debian/bladerf-fpga-hostedxa4.postinst | 4 ++-- - debian/bladerf-fpga-hostedxa9.postinst | 4 ++-- - 5 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/debian/bladerf-firmware-fx3.postinst b/debian/bladerf-firmware-fx3.postinst -index bd901909..26f2bf49 100644 ---- a/debian/bladerf-firmware-fx3.postinst -+++ b/debian/bladerf-firmware-fx3.postinst -@@ -1,7 +1,7 @@ - #!/bin/sh -e - --UPSTREAM='https://www.nuand.com/fx3/bladeRF_fw_v2.3.2.img' --CHECKSUM='c823ea5aa2c25c26bbaf4ab395ac559d' -+UPSTREAM='https://www.nuand.com/fx3/bladeRF_fw_v2.4.0.img' -+CHECKSUM='337f570f2e3fdb26abde0f0765196d92' - DATAFILE='/usr/share/Nuand/bladeRF/bladeRF_fw.img' - DESCRIPT='firmware' - MYNAMEIS='bladerf-firmware-fx3' -diff --git a/debian/bladerf-fpga-hostedx115.postinst b/debian/bladerf-fpga-hostedx115.postinst -index 2c5f9c96..d1231d19 100644 ---- a/debian/bladerf-fpga-hostedx115.postinst -+++ b/debian/bladerf-fpga-hostedx115.postinst -@@ -1,7 +1,7 @@ - #!/bin/sh -e - --UPSTREAM='https://www.nuand.com/fpga/v0.11.0/hostedx115.rbf' --CHECKSUM='bee4542c4b020077c71ae630ef0d0fc8' -+UPSTREAM='https://www.nuand.com/fpga/v0.12.0/hostedx115.rbf' -+CHECKSUM='a31999827d609adeb9ef3511ec6f8d65' - DATAFILE='/usr/share/Nuand/bladeRF/hostedx115.rbf' - DESCRIPT='FPGA bitstream' - MYNAMEIS='bladerf-fpga-hostedx115' -diff --git a/debian/bladerf-fpga-hostedx40.postinst b/debian/bladerf-fpga-hostedx40.postinst -index 37e2cd33..e80fc564 100644 ---- a/debian/bladerf-fpga-hostedx40.postinst -+++ b/debian/bladerf-fpga-hostedx40.postinst -@@ -1,7 +1,7 @@ - #!/bin/sh -e - --UPSTREAM='https://www.nuand.com/fpga/v0.11.0/hostedx40.rbf' --CHECKSUM='7a9b8e7f0f81af6d393132d7eb3e6e18' -+UPSTREAM='https://www.nuand.com/fpga/v0.12.0/hostedx40.rbf' -+CHECKSUM='93ab4d27170e1bbcd84768d4a51214f6' - DATAFILE='/usr/share/Nuand/bladeRF/hostedx40.rbf' - DESCRIPT='FPGA bitstream' - MYNAMEIS='bladerf-fpga-hostedx40' -diff --git a/debian/bladerf-fpga-hostedxa4.postinst b/debian/bladerf-fpga-hostedxa4.postinst -index ef43507a..2d1771ad 100644 ---- a/debian/bladerf-fpga-hostedxa4.postinst -+++ b/debian/bladerf-fpga-hostedxa4.postinst -@@ -1,7 +1,7 @@ - #!/bin/sh -e - --UPSTREAM='https://www.nuand.com/fpga/v0.11.0/hostedxA4.rbf' --CHECKSUM='b23bf6088aff5cff90bdea9488a35d89' -+UPSTREAM='https://www.nuand.com/fpga/v0.12.0/hostedxA4.rbf' -+CHECKSUM='ca7ff3840d1f3017043f120ea2400fc2' - DATAFILE='/usr/share/Nuand/bladeRF/hostedxA4.rbf' - DESCRIPT='FPGA bitstream' - MYNAMEIS='bladerf-fpga-hostedxa4' -diff --git a/debian/bladerf-fpga-hostedxa9.postinst b/debian/bladerf-fpga-hostedxa9.postinst -index 11f6ca6c..bca7c45a 100644 ---- a/debian/bladerf-fpga-hostedxa9.postinst -+++ b/debian/bladerf-fpga-hostedxa9.postinst -@@ -1,7 +1,7 @@ - #!/bin/sh -e - --UPSTREAM='https://www.nuand.com/fpga/v0.11.0/hostedxA9.rbf' --CHECKSUM='a17a2859e4f28fdc3952de78aca1dabe' -+UPSTREAM='https://www.nuand.com/fpga/v0.12.0/hostedxA9.rbf' -+CHECKSUM='42c6c6e8e95b232aaf2e6801662c2752' - DATAFILE='/usr/share/Nuand/bladeRF/hostedxA9.rbf' - DESCRIPT='FPGA bitstream' - MYNAMEIS='bladerf-fpga-hostedxa9' --- -2.30.2 - diff --git a/debian/patches/0003-hdl-bladerf-wlan-disable-RX-switch-when-tx_ota_req-i.patch b/debian/patches/0003-hdl-bladerf-wlan-disable-RX-switch-when-tx_ota_req-i.patch deleted file mode 100644 index ff8bf22..0000000 --- a/debian/patches/0003-hdl-bladerf-wlan-disable-RX-switch-when-tx_ota_req-i.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ded573bc9ab4201e69d8e785c3fd1d4f46f045eb Mon Sep 17 00:00:00 2001 -From: Robert Ghilduta -Date: Wed, 5 May 2021 17:50:01 -0700 -Subject: [PATCH 3/4] hdl: bladerf-wlan: disable RX switch when tx_ota_req is - asserted - -The RX RF switch can provide an additional 30dB of isolation if no input is -selected, this can be helpful when transmitting. ---- - hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-wlan.vhd | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-wlan.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-wlan.vhd -index 703b1633..0b0a6a58 100644 ---- a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-wlan.vhd -+++ b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-wlan.vhd -@@ -573,8 +573,8 @@ begin - adi_tx_spdt2_v <= unpack(rffe_gpio.o).tx_spdt2; - adi_tx_spdt1_v <= unpack(rffe_gpio.o).tx_spdt1; - tx_bias_en <= unpack(rffe_gpio.o).tx_bias_en; -- adi_rx_spdt2_v <= unpack(rffe_gpio.o).rx_spdt2; -- adi_rx_spdt1_v <= unpack(rffe_gpio.o).rx_spdt1; -+ adi_rx_spdt2_v <= unpack(rffe_gpio.o).rx_spdt2 and (not tx_ota_req_r & not tx_ota_req_r); -+ adi_rx_spdt1_v <= unpack(rffe_gpio.o).rx_spdt1 and (not tx_ota_req_r & not tx_ota_req_r); - rx_bias_en <= unpack(rffe_gpio.o).rx_bias_en; - --adi_sync_in <= unpack(rffe_gpio.o).sync_in; - adi_en_agc <= unpack(rffe_gpio.o).en_agc; --- -2.30.2 - diff --git a/debian/patches/0004-Revert-hdl-bladerf-wlan-disable-RX-switch-when-tx_ot.patch b/debian/patches/0004-Revert-hdl-bladerf-wlan-disable-RX-switch-when-tx_ot.patch deleted file mode 100644 index 61ff273..0000000 --- a/debian/patches/0004-Revert-hdl-bladerf-wlan-disable-RX-switch-when-tx_ot.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 29455d29d8b9e58fb18487f886d14b38974e1dfd Mon Sep 17 00:00:00 2001 -From: Robert Ghilduta -Date: Wed, 2 Jun 2021 18:16:31 -0700 -Subject: [PATCH 4/4] Revert "hdl: bladerf-wlan: disable RX switch when - tx_ota_req is asserted" - -This reverts commit ded573bc9ab4201e69d8e785c3fd1d4f46f045eb. ---- - hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-wlan.vhd | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-wlan.vhd b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-wlan.vhd -index 0b0a6a58..703b1633 100644 ---- a/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-wlan.vhd -+++ b/hdl/fpga/platforms/bladerf-micro/vhdl/bladerf-wlan.vhd -@@ -573,8 +573,8 @@ begin - adi_tx_spdt2_v <= unpack(rffe_gpio.o).tx_spdt2; - adi_tx_spdt1_v <= unpack(rffe_gpio.o).tx_spdt1; - tx_bias_en <= unpack(rffe_gpio.o).tx_bias_en; -- adi_rx_spdt2_v <= unpack(rffe_gpio.o).rx_spdt2 and (not tx_ota_req_r & not tx_ota_req_r); -- adi_rx_spdt1_v <= unpack(rffe_gpio.o).rx_spdt1 and (not tx_ota_req_r & not tx_ota_req_r); -+ adi_rx_spdt2_v <= unpack(rffe_gpio.o).rx_spdt2; -+ adi_rx_spdt1_v <= unpack(rffe_gpio.o).rx_spdt1; - rx_bias_en <= unpack(rffe_gpio.o).rx_bias_en; - --adi_sync_in <= unpack(rffe_gpio.o).sync_in; - adi_en_agc <= unpack(rffe_gpio.o).en_agc; --- -2.30.2 - diff --git a/debian/patches/gcc-12-warnings b/debian/patches/gcc-12-warnings deleted file mode 100644 index bb6625d..0000000 --- a/debian/patches/gcc-12-warnings +++ /dev/null @@ -1,13 +0,0 @@ -Forwarded: https://github.com/Nuand/bladeRF/pull/869 - ---- a/host/libraries/libbladeRF_test/test_repeater/src/repeater.c -+++ b/host/libraries/libbladeRF_test/test_repeater/src/repeater.c -@@ -112,7 +112,7 @@ static int term_init() - return status; - } - -- memcpy(&termios_new, &termios_backup, sizeof(termios_new)); -+ memcpy(&termios_new, termios_backup, sizeof(termios_new)); - - termios_new.c_cc[VMIN] = 1; - termios_new.c_cc[VTIME] = 0; diff --git a/debian/patches/series b/debian/patches/series index ca40ff6..b83ed89 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,5 @@ -# 0001-debian-add-2021.03-release.patch -# 0002-debian-update-fpga-and-fx3-postinst.patch -0003-hdl-bladerf-wlan-disable-RX-switch-when-tx_ota_req-i.patch -0004-Revert-hdl-bladerf-wlan-disable-RX-switch-when-tx_ot.patch spelling debian-kfreebsd try-hurd-build update-bladerf-udev-rules update-to-cmake-3.5 -gcc-12-warnings