aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Koo <steven.koo@ni.com>2022-07-13 14:06:57 -0500
committerskooNI <60897865+skooNI@users.noreply.github.com>2022-07-15 16:56:27 -0500
commit7e1ff96a0dbb56f50380051208947c4193e4b5b3 (patch)
treeebb7350d64b8b28b6cf5a806f4be9c028da63545
parentimages: Update manifest with latest cpld firmware (diff)
downloaduhd-UHD-4.1.tar.xz
uhd-UHD-4.1.zip
uhd: Prepare branch for 4.1.0.6-rc1 releaseUHD-4.1
cmake: Increase patch version number debian: Update changelog images: Update manifest uhd: Update changelog Signed-off-by: Steven Koo <steven.koo@ni.com>
-rw-r--r--CHANGELOG11
-rw-r--r--host/cmake/Modules/UHDVersion.cmake2
-rw-r--r--host/cmake/debian/changelog15
-rw-r--r--images/manifest.txt28
4 files changed, 41 insertions, 15 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 637d1badd..ba2eb01ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,17 @@
Change Log for Releases
==============================
+## 004.001.000.006
+* mpm
+ - add support for lattice zbx cpld
+* N320
+ - Revert PLL lock time reduction
+* images
+ - Update manifest with latest cpld firmware
+ - zbx lattice cpld image manifest
+* uhd
+ - fixup! add support for max10 variants
+
## 004.001.000.005
* ad9361
- Add comment re overclocking
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index da5e95423..ef7533e3f 100644
--- a/host/cmake/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
@@ -20,7 +20,7 @@ find_package(Git QUIET)
set(UHD_VERSION_MAJOR 4)
set(UHD_VERSION_API 1)
set(UHD_VERSION_ABI 0)
-set(UHD_VERSION_PATCH 5)
+set(UHD_VERSION_PATCH 6)
set(UHD_VERSION_DEVEL FALSE)
########################################################################
diff --git a/host/cmake/debian/changelog b/host/cmake/debian/changelog
index 898bccec4..c95eaeb23 100644
--- a/host/cmake/debian/changelog
+++ b/host/cmake/debian/changelog
@@ -1,3 +1,18 @@
+uhd (4.1.0.6-0ubuntu1) ubuntu_release; urgency=low
+
+ * mpm
+ - add support for lattice zbx cpld
+ * N320
+ - Revert PLL lock time reduction
+ * images
+ - Update manifest with latest cpld firmware
+ - zbx lattice cpld image manifest
+ * uhd
+ - fixup! add support for max10 variants
+
+ -- Ettus Research <packages@ettus.com> Wed, 13 Jul 2022 01:56:31 -0800
+
+
uhd (4.1.0.5-0ubuntu1) ubuntu_release; urgency=low
* ad9361
diff --git a/images/manifest.txt b/images/manifest.txt
index f8581ea8a..1f92599e6 100644
--- a/images/manifest.txt
+++ b/images/manifest.txt
@@ -6,9 +6,9 @@ x4xx_x410_fpga_default uhd-8bef9bf x4xx/uhd-8bef9bf/x4xx_x410_fpg
x4xx_x410_cpld_default uhd-6fd9f37 x4xx/uhd-6fd9f37/x4xx_x410_cpld_default-g6fd9f37.zip 74e09bedda84105258484217d4dbf68860ce2079d27cf8352952fe8e4d727e93
x4xx_zbx_cpld_default uhd-780c921 x4xx/uhd-780c921/x4xx_zbx_cpld_default-g780c921.zip 2ea491fafdb05adc52ee35f02c1047e0d430b02e2529a51162bcb4d5e049abfd
# X410-Series Filesystems
-x4xx_common_sdk_default meta-ettus-v4.1.0.5 x4xx/meta-ettus-v4.1.0.5/x4xx_common_sdk_default-v4.1.0.5.zip 0
-x4xx_common_mender_default meta-ettus-v4.1.0.5 x4xx/meta-ettus-v4.1.0.5/x4xx_common_mender_default-v4.1.0.5.zip 0
-x4xx_common_sdimg_default meta-ettus-v4.1.0.5 x4xx/meta-ettus-v4.1.0.5/x4xx_common_sdimg_default-v4.1.0.5.zip 0
+x4xx_common_sdk_default meta-ettus-v4.1.0.6-rc1 x4xx/meta-ettus-v4.1.0.6-rc1/x4xx_common_sdk_default-v4.1.0.6-rc1.zip 0
+x4xx_common_mender_default meta-ettus-v4.1.0.6-rc1 x4xx/meta-ettus-v4.1.0.6-rc1/x4xx_common_mender_default-v4.1.0.6-rc1.zip 0
+x4xx_common_sdimg_default meta-ettus-v4.1.0.6-rc1 x4xx/meta-ettus-v4.1.0.6-rc1/x4xx_common_sdimg_default-v4.1.0.6-rc1.zip 0
# X300-Series
x3xx_x310_fpga_default uhd-8bef9bf x3xx/uhd-8bef9bf/x3xx_x310_fpga_default-g8bef9bf.zip 18a5eea4d1ba87912deba653a903ac63e9ccd981855304066d4ef35fad66631e
@@ -23,16 +23,16 @@ e3xx_e310_sg3_fpga_default uhd-8bef9bf e3xx/uhd-8bef9bf/e3xx_e310_sg3
e3xx_e320_fpga_default uhd-8bef9bf e3xx/uhd-8bef9bf/e3xx_e320_fpga_default-g8bef9bf.zip 38c719404ad4eaff78b6f57e84d07e308d5aa33574566ffa960a9c672b364562
# E310 Filesystems
-e3xx_e310_sdk_default meta-ettus-v4.1.0.5 e3xx/meta-ettus-v4.1.0.5/e3xx_e310_sdk_default-v4.1.0.5.zip 0
-e3xx_e310_sg1_mender_default meta-ettus-v4.1.0.5 e3xx/meta-ettus-v4.1.0.5/e3xx_e310_sg1_mender_default-v4.1.0.5.zip 0
-e3xx_e310_sg1_sdimg_default meta-ettus-v4.1.0.5 e3xx/meta-ettus-v4.1.0.5/e3xx_e310_sg1_sdimg_default-v4.1.0.5.zip 0
-e3xx_e310_sg3_mender_default meta-ettus-v4.1.0.5 e3xx/meta-ettus-v4.1.0.5/e3xx_e310_sg3_mender_default-v4.1.0.5.zip 0
-e3xx_e310_sg3_sdimg_default meta-ettus-v4.1.0.5 e3xx/meta-ettus-v4.1.0.5/e3xx_e310_sg3_sdimg_default-v4.1.0.5.zip 0
+e3xx_e310_sdk_default meta-ettus-v4.1.0.6-rc1 e3xx/meta-ettus-v4.1.0.6-rc1/e3xx_e310_sdk_default-v4.1.0.6-rc1.zip 0
+e3xx_e310_sg1_mender_default meta-ettus-v4.1.0.6-rc1 e3xx/meta-ettus-v4.1.0.6-rc1/e3xx_e310_sg1_mender_default-v4.1.0.6-rc1.zip 0
+e3xx_e310_sg1_sdimg_default meta-ettus-v4.1.0.6-rc1 e3xx/meta-ettus-v4.1.0.6-rc1/e3xx_e310_sg1_sdimg_default-v4.1.0.6-rc1.zip 0
+e3xx_e310_sg3_mender_default meta-ettus-v4.1.0.6-rc1 e3xx/meta-ettus-v4.1.0.6-rc1/e3xx_e310_sg3_mender_default-v4.1.0.6-rc1.zip 0
+e3xx_e310_sg3_sdimg_default meta-ettus-v4.1.0.6-rc1 e3xx/meta-ettus-v4.1.0.6-rc1/e3xx_e310_sg3_sdimg_default-v4.1.0.6-rc1.zip 0
# E320 Filesystems, etc
-e3xx_e320_sdk_default meta-ettus-v4.1.0.5 e3xx/meta-ettus-v4.1.0.5/e3xx_e320_sdk_default-v4.1.0.5.zip 0
-e3xx_e320_mender_default meta-ettus-v4.1.0.5 e3xx/meta-ettus-v4.1.0.5/e3xx_e320_mender_default-v4.1.0.5.zip 0
-e3xx_e320_sdimg_default meta-ettus-v4.1.0.5 e3xx/meta-ettus-v4.1.0.5/e3xx_e320_sdimg_default-v4.1.0.5.zip 0
+e3xx_e320_sdk_default meta-ettus-v4.1.0.6-rc1 e3xx/meta-ettus-v4.1.0.6-rc1/e3xx_e320_sdk_default-v4.1.0.6-rc1.zip 0
+e3xx_e320_mender_default meta-ettus-v4.1.0.6-rc1 e3xx/meta-ettus-v4.1.0.6-rc1/e3xx_e320_mender_default-v4.1.0.6-rc1.zip 0
+e3xx_e320_sdimg_default meta-ettus-v4.1.0.6-rc1 e3xx/meta-ettus-v4.1.0.6-rc1/e3xx_e320_sdimg_default-v4.1.0.6-rc1.zip 0
# N300-Series
n3xx_n310_fpga_default uhd-8bef9bf n3xx/uhd-8bef9bf/n3xx_n310_fpga_default-g8bef9bf.zip 2a04d8eb68af9ce811f3a3fca29a6d37ff8a274b5d00f27b08740129121c7a5c
@@ -43,9 +43,9 @@ n3xx_n320_cpld_default fpga-4bc2c6f n3xx/fpga-4bc2c6f/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.1.0.5 n3xx/meta-ettus-v4.1.0.5/n3xx_common_sdk_default-v4.1.0.5.zip 0
-n3xx_common_mender_default meta-ettus-v4.1.0.5 n3xx/meta-ettus-v4.1.0.5/n3xx_common_mender_default-v4.1.0.5.zip 0
-n3xx_common_sdimg_default meta-ettus-v4.1.0.5 n3xx/meta-ettus-v4.1.0.5/n3xx_common_sdimg_default-v4.1.0.5.zip 0
+n3xx_common_sdk_default meta-ettus-v4.1.0.6-rc1 n3xx/meta-ettus-v4.1.0.6-rc1/n3xx_common_sdk_default-v4.1.0.6-rc1.zip 0
+n3xx_common_mender_default meta-ettus-v4.1.0.6-rc1 n3xx/meta-ettus-v4.1.0.6-rc1/n3xx_common_mender_default-v4.1.0.6-rc1.zip 0
+n3xx_common_sdimg_default meta-ettus-v4.1.0.6-rc1 n3xx/meta-ettus-v4.1.0.6-rc1/n3xx_common_sdimg_default-v4.1.0.6-rc1.zip 0
# B200-Series
b2xx_b200_fpga_default uhd-26793b8 b2xx/uhd-26793b8/b2xx_b200_fpga_default-g26793b8.zip 7fde585623bee8c274cd4db9fb1a3a4738e4ce862dd8bb09a3f1448e37c3cc99