diff options
| author | Josh Blum <josh@joshknows.com> | 2012-07-16 20:41:18 -0700 | 
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-07-16 20:41:18 -0700 | 
| commit | 9d30b8fc24dc7efa8973a4d305b240c245133fe6 (patch) | |
| tree | e5488d3d0d8e489cea4bc97f81375e5b9a88e771 /host/lib/usrp/usrp2 | |
| parent | bb2fbec27b2dc7d199119ca952ae2a431cbbbb15 (diff) | |
| parent | b6bb13bcbab932d54f0502f885a9db8ca906eb5f (diff) | |
| download | uhd-9d30b8fc24dc7efa8973a4d305b240c245133fe6.tar.gz uhd-9d30b8fc24dc7efa8973a4d305b240c245133fe6.tar.bz2 uhd-9d30b8fc24dc7efa8973a4d305b240c245133fe6.zip | |
Merge branch 'master' into next
Diffstat (limited to 'host/lib/usrp/usrp2')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.cpp | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp index 316e38da8..f0b2a90a6 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.cpp +++ b/host/lib/usrp/usrp2/usrp2_iface.cpp @@ -413,13 +413,13 @@ public:          //create the images downloader and burner commands          const std::string images_downloader_cmd = str(boost::format("%s\"%s\"") % sudo % find_images_downloader());          if (this->get_rev() == USRP2_REV3 or this->get_rev() == USRP2_REV4){ -            const std::string card_burner = (fs::path(fw_image_path).branch_path().branch_path() / "utils" / "usrp2_card_burner_gui.py").string(); +            const std::string card_burner = (fs::path(fw_image_path).branch_path().branch_path() / "utils" / "usrp2_card_burner.py").string();              const std::string card_burner_cmd = str(boost::format("\"%s%s\" %s--fpga=\"%s\" %s--fw=\"%s\"") % sudo % card_burner % ml % fpga_image_path % ml % fw_image_path);              return str(boost::format("%s\n%s") % print_images_error() % card_burner_cmd);          }          else{              const std::string addr = _ctrl_transport->get_recv_addr(); -            const std::string net_burner = (fs::path(fw_image_path).branch_path().branch_path() / "utils" / "usrp_n2xx_net_burner_gui.py").string(); +            const std::string net_burner = (fs::path(fw_image_path).branch_path().branch_path() / "utils" / "usrp_n2xx_net_burner.py").string();              const std::string net_burner_cmd = str(boost::format("\"%s\" %s--fpga=\"%s\" %s--fw=\"%s\" %s--addr=\"%s\"") % net_burner % ml % fpga_image_path % ml % fw_image_path % ml % addr);              return str(boost::format("%s\n%s") % print_images_error() % net_burner_cmd);          } | 
