diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2018-01-22 14:27:37 -0800 |
|---|---|---|
| committer | Ashish Chaudhari <ashish.chaudhari@ettus.com> | 2018-01-24 15:09:29 -0800 |
| commit | 081e81274dbc14d6ff80c49c00d828863319b392 (patch) | |
| tree | ed2d35fec505f8693d2861b5393df9eab115b02f /host/lib | |
| parent | f764f5ea6d19c3f26cbc00f1096b1dfcb77f359c (diff) | |
| download | uhd-081e81274dbc14d6ff80c49c00d828863319b392.tar.gz uhd-081e81274dbc14d6ff80c49c00d828863319b392.tar.bz2 uhd-081e81274dbc14d6ff80c49c00d828863319b392.zip | |
usrp3: Changes for Vivado 2017.4
- Bumped compat number for e3xx, n230, x3xx, n3xx
- Updated images package for e3xx, n230, x3xx, n3xx
- Updated fpga-src submodule
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/usrp/e300/e300_fpga_defs.hpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/n230/n230_fpga_defs.h | 2 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_fw_common.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/e300/e300_fpga_defs.hpp b/host/lib/usrp/e300/e300_fpga_defs.hpp index abee413ea..1f5cd4733 100644 --- a/host/lib/usrp/e300/e300_fpga_defs.hpp +++ b/host/lib/usrp/e300/e300_fpga_defs.hpp @@ -10,7 +10,7 @@ namespace uhd { namespace usrp { namespace e300 { namespace fpga { static const size_t NUM_RADIOS = 2; -static const uint32_t COMPAT_MAJOR = 16; +static const uint32_t COMPAT_MAJOR = 17; static const uint32_t COMPAT_MINOR = 0; }}}} // namespace diff --git a/host/lib/usrp/n230/n230_fpga_defs.h b/host/lib/usrp/n230/n230_fpga_defs.h index d87c9a3fa..3e13e3454 100644 --- a/host/lib/usrp/n230/n230_fpga_defs.h +++ b/host/lib/usrp/n230/n230_fpga_defs.h @@ -104,7 +104,7 @@ static const uint32_t AD9361_SPI_SLAVE_NUM = 0x1; static const uint32_t ADF4001_SPI_SLAVE_NUM = 0x2; static const uint32_t RB_N230_PRODUCT_ID = 1; -static const uint32_t RB_N230_COMPAT_MAJOR = 0x20; +static const uint32_t RB_N230_COMPAT_MAJOR = 0x21; static const uint32_t RB_N230_COMPAT_SAFE = 0xC0; /******************************************************************* diff --git a/host/lib/usrp/x300/x300_fw_common.h b/host/lib/usrp/x300/x300_fw_common.h index d495934eb..88ef27296 100644 --- a/host/lib/usrp/x300/x300_fw_common.h +++ b/host/lib/usrp/x300/x300_fw_common.h @@ -22,7 +22,7 @@ extern "C" { #define X300_REVISION_MIN 2 #define X300_FW_COMPAT_MAJOR 5 #define X300_FW_COMPAT_MINOR 2 -#define X300_FPGA_COMPAT_MAJOR 0x21 +#define X300_FPGA_COMPAT_MAJOR 0x22 //shared memory sections - in between the stack and the program space #define X300_FW_SHMEM_BASE 0x6000 |