aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2017-03-15 12:58:35 -0700
committerMartin Braun <martin.braun@ettus.com>2017-03-15 12:58:35 -0700
commitd2a25056604cef5a84bc3d9c129ad2d31d838a0e (patch)
tree148329f1c87576a9e9deb7af3dd5fb541f22ca39
parent315a7f8e42ff95ab532bcf674c26e34446ae7340 (diff)
downloaduhd-d2a25056604cef5a84bc3d9c129ad2d31d838a0e.tar.gz
uhd-d2a25056604cef5a84bc3d9c129ad2d31d838a0e.tar.bz2
uhd-d2a25056604cef5a84bc3d9c129ad2d31d838a0e.zip
x300: Put back runtime error on FPGA compat mismatch
-rw-r--r--host/lib/usrp/x300/x300_impl.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index 374247fea..fe422db46 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -1665,10 +1665,7 @@ void x300_impl::check_fpga_compat(const fs_path &mb_path, const mboard_members_t
: "resource")
% members.get_pri_eth().addr);
- std::cout << "=========================================================" << std::endl;
- std::cout << "Warning:" << std::endl;
- //throw uhd::runtime_error(str(boost::format(
- std::cout << (str(boost::format(
+ throw uhd::runtime_error(str(boost::format(
"Expected FPGA compatibility number %d, but got %d:\n"
"The FPGA image on your device is not compatible with this host code build.\n"
"Download the appropriate FPGA images for this version of UHD.\n"
@@ -1680,7 +1677,6 @@ void x300_impl::check_fpga_compat(const fs_path &mb_path, const mboard_members_t
) % int(X300_FPGA_COMPAT_MAJOR) % compat_major
% print_utility_error("uhd_images_downloader.py")
% image_loader_cmd));
- std::cout << "=========================================================" << std::endl;
}
_tree->create<std::string>(mb_path / "fpga_version").set(str(boost::format("%u.%u")
% compat_major % compat_minor));