From 1325cdd1fa530be473de39f171acba309d00b270 Mon Sep 17 00:00:00 2001
From: Paul David <paul.david@ettus.com>
Date: Tue, 17 May 2016 10:15:29 -0700
Subject: examples: Increased the reference locking timeout in benchmark_rate

---
 host/examples/benchmark_rate.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/host/examples/benchmark_rate.cpp b/host/examples/benchmark_rate.cpp
index bf3015119..0f01da035 100644
--- a/host/examples/benchmark_rate.cpp
+++ b/host/examples/benchmark_rate.cpp
@@ -31,7 +31,8 @@
 
 namespace po = boost::program_options;
 
-const double INIT_DELAY = 0.05;  // 50mS initial delay before transmit
+const double CLOCK_TIMEOUT = 1000;  // 1000mS timeout for external clock locking
+const double INIT_DELAY    = 0.05;  // 50mS initial delay before transmit
 //typedef boost::atomic<bool>   atomic_bool;
 // We'll fake atomic bools for now, for more backward compat.
 // This is just an example, after all.
@@ -330,7 +331,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         if(ref != "internal") {
             std::cout << "Now confirming lock on clock signals..." << std::endl;
             bool is_locked = false;
-            boost::system_time end_time = boost::get_system_time() + boost::posix_time::milliseconds(80);
+            boost::system_time end_time = boost::get_system_time() + boost::posix_time::milliseconds(CLOCK_TIMEOUT);
             for (int i = 0; i < num_mboards; i++) {
                 if (ref == "mimo" and i == 0) continue;
                 while((is_locked = usrp->get_mboard_sensor("ref_locked",i).to_bool()) == false and
-- 
cgit v1.2.3


From 1aa5d7e2360d2d3d6e843ebe970cd89a9ecc3c0b Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Thu, 19 May 2016 13:18:05 -0700
Subject: cmake: Better verbosity for installing/packaging images.

---
 host/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 29e89b8b7..12cb91645 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -403,8 +403,9 @@ UHD_INSTALL(
 # Handle pre-built UHD Images for packaging
 ########################################################################
 IF(DEFINED UHD_IMAGES_SRC_DIR AND EXISTS "${UHD_IMAGES_SRC_DIR}")
+    MESSAGE(STATUS "Reading images from directory `${UHD_IMAGES_SRC_DIR}'")
     FILE(GLOB_RECURSE _image_files "${UHD_IMAGES_SRC_DIR}/*")
-    MESSAGE(STATUS "Using images:")
+    MESSAGE(STATUS "These images files will be installed/packaged:")
     FOREACH(_img ${_image_files})
         MESSAGE(STATUS "  ${_img}")
     ENDFOREACH(_img)
-- 
cgit v1.2.3