aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2015-09-11 15:24:37 -0700
committerMartin Braun <martin.braun@ettus.com>2015-09-11 15:24:37 -0700
commita09e0a31b73db3061f2e7c4a9813fe6963f95fb2 (patch)
tree642623e247b37685ab8fdb52539d84214b353e09
parent225526a9762b688418c34745e270bfccb4b0c507 (diff)
parentf7a15853324e3e0001c7a9e5bab397cb24e0e01f (diff)
downloaduhd-a09e0a31b73db3061f2e7c4a9813fe6963f95fb2.tar.gz
uhd-a09e0a31b73db3061f2e7c4a9813fe6963f95fb2.tar.bz2
uhd-a09e0a31b73db3061f2e7c4a9813fe6963f95fb2.zip
Merge branch 'maint'
-rw-r--r--CHANGELOG9
m---------fpga-src0
-rw-r--r--host/CMakeLists.txt4
-rw-r--r--host/lib/convert/CMakeLists.txt2
4 files changed, 12 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7047b2a8d..6a84a0d72 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,15 @@
Change Log for Releases
==============================
+## 003.009.001
+* B200mini: Updated udev rules, removed DCM
+* B200: Better USB error messages
+* Cores: Fixed CORDIC scaling issue on all devices that use
+ dsp_core_3000
+* X300: Fixed GPIO issue
+* Examples: Added PPS source option
+* Docs: Multiple manual updates
+
## 003.009.000
* X300: Updated DAC ctrl, FPGA toolchain is now entirely Vivado,
improved master clock controls, added ADC self-cal capability,
diff --git a/fpga-src b/fpga-src
-Subproject da37ebb6f909f3813617f346d500506244aa5a1
+Subproject 62dfea2cdf53c588ef9eaa9dfd1b781dfa89ab1
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 5736acf90..7f7d58658 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -269,8 +269,8 @@ UHD_INSTALL(FILES
#{{{IMG_SECTION
# This section is written automatically by /images/create_imgs_package.py
# Any manual changes in here will be overwritten.
-SET(UHD_IMAGES_MD5SUM "033ee49251ee21be656f2fe7546fbbb2")
-SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.009.000-16-g5284e247.zip")
+SET(UHD_IMAGES_MD5SUM "2ff397927220f591f377a04c9e9e8b7e")
+SET(UHD_IMAGES_DOWNLOAD_SRC "uhd-images_003.009.001-release.zip")
#}}}
########################################################################
diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt
index 024c2260b..10376ba9c 100644
--- a/host/lib/convert/CMakeLists.txt
+++ b/host/lib/convert/CMakeLists.txt
@@ -60,7 +60,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
CHECK_INCLUDE_FILE_CXX(arm_neon.h HAVE_ARM_NEON_H)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-IF(HAVE_ARM_NEON_H)
+IF(HAVE_ARM_NEON_H AND (${CMAKE_SIZEOF_VOID_P} EQUAL 4))
ENABLE_LANGUAGE(ASM)
LIBUHD_APPEND_SOURCES(