diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-21 10:46:18 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-21 10:46:18 -0700 |
| commit | 16ef969d87cf74448d44dc1f31a5870cda4a8446 (patch) | |
| tree | caf349f28c87a77e73be65149e24d726c0446055 /host | |
| parent | 893819c87f1cc9e845e29df0c26e1d2d0012b750 (diff) | |
| download | uhd-16ef969d87cf74448d44dc1f31a5870cda4a8446.tar.gz uhd-16ef969d87cf74448d44dc1f31a5870cda4a8446.tar.bz2 uhd-16ef969d87cf74448d44dc1f31a5870cda4a8446.zip | |
x300: Check FPGA compat before firmware compat
- The firmware is a subset of the FPGA so this order makes sense
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index cab2ec491..b2b9e5c6a 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -508,9 +508,10 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr) x300_load_fw(mb.zpu_ctrl, x300_fw_image); } - //check compat -- good place to do after conditional loading - this->check_fw_compat(mb_path, mb.zpu_ctrl); + //check compat numbers + //check fpga compat before fw compat because the fw is a subset of the fpga image this->check_fpga_compat(mb_path, mb.zpu_ctrl); + this->check_fw_compat(mb_path, mb.zpu_ctrl); //store which FPGA image is loaded mb.loaded_fpga_image = get_fpga_option(mb.zpu_ctrl); |