From 2f7f7c8d2d5d0bebd84618077e61e344c689f622 Mon Sep 17 00:00:00 2001 From: Sugandha Gupta Date: Thu, 16 May 2019 15:13:52 -0700 Subject: mpmd: image_loader: Add support for devices without fpga_type This fixes fpga image loading for devices which not have SFP port and hence no fpga_type e.g. E310. --- host/lib/usrp/mpmd/mpmd_image_loader.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'host/lib') diff --git a/host/lib/usrp/mpmd/mpmd_image_loader.cpp b/host/lib/usrp/mpmd/mpmd_image_loader.cpp index e0145bd4b..d5c7d3da9 100644 --- a/host/lib/usrp/mpmd/mpmd_image_loader.cpp +++ b/host/lib/usrp/mpmd/mpmd_image_loader.cpp @@ -169,9 +169,13 @@ static bool mpmd_image_loader(const image_loader::image_loader_args_t& image_loa }(); // generate_fpga_type lambda function UHD_LOG_TRACE("MPMD IMAGE LOADER", "FPGA type: " << fpga_type); - if (!dev_addr.has_key("product") or fpga_type == "") { + if (!dev_addr.has_key("product")) { throw uhd::runtime_error( "Found a device but could not auto-generate an image filename."); + } else if (fpga_type == "") { + return find_image_path( + str(boost::format("usrp_%s_fpga.bit") + % (boost::algorithm::to_lower_copy(dev_addr["product"])))); } else { return find_image_path( str(boost::format("usrp_%s_fpga_%s.bit") -- cgit v1.2.3