Skip to content

Commit 2227d11

Browse files
committed
Bump FPGA to v0.10.2
host: bladerf2: Disable FPGA tuning mode if using pre-v0.10.2 FPGA.
1 parent 1f692be commit 2227d11

5 files changed

Lines changed: 18 additions & 2 deletions

File tree

hdl/fpga/platforms/bladerf-micro/software/bladeRF_nios/src/fpga_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define FPGA_VERSION_ID 0x7777
99
#define FPGA_VERSION_MAJOR 0
1010
#define FPGA_VERSION_MINOR 10
11-
#define FPGA_VERSION_PATCH 1
11+
#define FPGA_VERSION_PATCH 2
1212
#define FPGA_VERSION ((uint32_t)( FPGA_VERSION_MAJOR | \
1313
(FPGA_VERSION_MINOR << 8) | \
1414
(FPGA_VERSION_PATCH << 16) ) )

hdl/fpga/platforms/bladerf/software/bladeRF_nios/src/fpga_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define FPGA_VERSION_ID 0x7777
99
#define FPGA_VERSION_MAJOR 0
1010
#define FPGA_VERSION_MINOR 10
11-
#define FPGA_VERSION_PATCH 1
11+
#define FPGA_VERSION_PATCH 2
1212
#define FPGA_VERSION ((uint32_t)( FPGA_VERSION_MAJOR | \
1313
(FPGA_VERSION_MINOR << 8) | \
1414
(FPGA_VERSION_PATCH << 16) ) )

host/libraries/libbladeRF/src/board/bladerf1/compatibility.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ const struct version_compat_table bladerf1_fw_compat_table = {fw_compat, ARRAY_S
3333

3434
static const struct compat fpga_compat[] = {
3535
/* FPGA requires >= Firmware */
36+
{ VERSION(0, 10, 2), VERSION(1, 6, 1) },
3637
{ VERSION(0, 10, 1), VERSION(1, 6, 1) },
3738
{ VERSION(0, 10, 0), VERSION(1, 6, 1) },
3839
{ VERSION(0, 9, 0), VERSION(1, 6, 1) },

host/libraries/libbladeRF/src/board/bladerf2/common.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,20 @@ bladerf_tuning_mode default_tuning_mode(struct bladerf *dev)
257257
mode = BLADERF_TUNING_MODE_HOST;
258258
}
259259

260+
/* Detect TX FPGA bug and report warning */
261+
if (BLADERF_TUNING_MODE_FPGA == mode &&
262+
have_cap(board_data->capabilities, BLADERF_CAP_FPGA_TUNING) &&
263+
version_fields_less_than(&board_data->fpga_version, 0, 10, 2)) {
264+
log_warning("FPGA v%u.%u.%u has errata related to FPGA tuning mode. "
265+
"Forcing host-based tuning mode. "
266+
"Please update to FPGA v%u.%u.%u or newer to use "
267+
"FPGA tuning mode.\n",
268+
board_data->fpga_version.major,
269+
board_data->fpga_version.minor,
270+
board_data->fpga_version.patch, 0, 10, 2);
271+
mode = BLADERF_TUNING_MODE_HOST;
272+
}
273+
260274
switch (mode) {
261275
case BLADERF_TUNING_MODE_HOST:
262276
log_debug("Default tuning mode: Host\n");

host/libraries/libbladeRF/src/board/bladerf2/compatibility.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const struct version_compat_table bladerf2_fw_compat_table = {fw_compat, ARRAY_S
2525

2626
static const struct compat fpga_compat[] = {
2727
/* FPGA requires >= Firmware */
28+
{ VERSION(0, 10, 2), VERSION(2, 1, 0) },
2829
{ VERSION(0, 10, 1), VERSION(2, 1, 0) },
2930
{ VERSION(0, 10, 0), VERSION(2, 1, 0) },
3031
{ VERSION(0, 9, 0), VERSION(2, 1, 0) },

0 commit comments

Comments
 (0)