diff --git a/firmware/common/tune_config.h b/firmware/common/tune_config.h
index 7fc76af9..34c692e6 100644
--- a/firmware/common/tune_config.h
+++ b/firmware/common/tune_config.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#ifdef PRALINE
+#if defined(PRALINE) || defined(UNIVERSAL)
 	#include "fpga.h"
 
 typedef struct {
diff --git a/firmware/common/tuning.c b/firmware/common/tuning.c
index f613ab30..9c863beb 100644
--- a/firmware/common/tuning.c
+++ b/firmware/common/tuning.c
@@ -29,18 +29,23 @@
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
 
-#ifdef PRALINE
-	#define MIN_BYPASS_FREQ FP_MHZ(2320)
-	#define MAX_BYPASS_FREQ FP_MHZ(2580)
-#else
-	#define MIN_BYPASS_FREQ FP_MHZ(2170)
-	#define MAX_BYPASS_FREQ FP_MHZ(2740)
-#endif
-
 #define MID1_HP_FREQ FP_MHZ(3600)
 #define MID2_HP_FREQ FP_MHZ(5100)
 #define MAX_HP_FREQ  FP_MHZ(7250)
 
+static fp_40_24_t min_bypass_freq = FP_MHZ(2170);
+static fp_40_24_t max_bypass_freq = FP_MHZ(2740);
+
+void tuning_setup(void)
+{
+#if defined(PRALINE) || defined(UNIVERSAL)
+	if (detected_platform() == BOARD_ID_PRALINE) {
+		min_bypass_freq = FP_MHZ(2320);
+		max_bypass_freq = FP_MHZ(2580);
+	}
+#endif
+}
+
 fp_40_24_t select_graduated_if(fp_40_24_t freq_rf, rf_path_filter_t img_reject)
 {
 	fp_40_24_t freq_if;
@@ -57,8 +62,8 @@ fp_40_24_t select_graduated_if(fp_40_24_t freq_rf, rf_path_filter_t img_reject)
 	case RF_PATH_FILTER_HIGH_PASS:
 		if (freq_rf < MID1_HP_FREQ) {
 			/* IF is graduated from 2170 MHz to 2740 MHz */
-			freq_if = MIN_BYPASS_FREQ +
-				(((freq_rf - (MAX_BYPASS_FREQ)) * 57) / 86);
+			freq_if = min_bypass_freq +
+				(((freq_rf - (max_bypass_freq)) * 57) / 86);
 		} else if (freq_rf < MID2_HP_FREQ) {
 			/* IF is graduated from 2350 MHz to 2650 MHz */
 			freq_if = FP_MHZ(2350) + ((freq_rf - (MID1_HP_FREQ)) / 5);
@@ -75,9 +80,9 @@ fp_40_24_t select_graduated_if(fp_40_24_t freq_rf, rf_path_filter_t img_reject)
 
 rf_path_filter_t select_img_reject(fp_40_24_t freq_rf)
 {
-	if (freq_rf > MAX_BYPASS_FREQ) {
+	if (freq_rf > max_bypass_freq) {
 		return RF_PATH_FILTER_HIGH_PASS;
-	} else if (freq_rf >= MIN_BYPASS_FREQ) {
+	} else if (freq_rf >= min_bypass_freq) {
 		return RF_PATH_FILTER_BYPASS;
 	} else {
 		return RF_PATH_FILTER_LOW_PASS;
@@ -91,14 +96,14 @@ fp_40_24_t restrict_rf(fp_40_24_t freq_rf, rf_path_filter_t img_reject)
 
 	switch (img_reject) {
 	case RF_PATH_FILTER_LOW_PASS:
-		max_rf = MIN_BYPASS_FREQ;
+		max_rf = min_bypass_freq;
 		break;
 	case RF_PATH_FILTER_HIGH_PASS:
-		min_rf = MAX_BYPASS_FREQ;
+		min_rf = max_bypass_freq;
 		break;
 	default:
-		min_rf = MIN_BYPASS_FREQ;
-		max_rf = MAX_BYPASS_FREQ;
+		min_rf = min_bypass_freq;
+		max_rf = max_bypass_freq;
 	}
 	freq_rf = MIN(freq_rf, max_rf);
 	freq_rf = MAX(freq_rf, min_rf);
diff --git a/firmware/common/tuning.h b/firmware/common/tuning.h
index a338cd28..db123ee3 100644
--- a/firmware/common/tuning.h
+++ b/firmware/common/tuning.h
@@ -26,6 +26,8 @@
 #include "fixed_point.h"
 #include "rf_path.h"
 
+void tuning_setup(void);
+
 /**
  * Select fixed or graduated IF for a given RF and image reject filter.
  */
diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c
index 93308cda..3238ca0e 100644
--- a/firmware/hackrf_usb/hackrf_usb.c
+++ b/firmware/hackrf_usb/hackrf_usb.c
@@ -40,8 +40,9 @@
 #include <rf_path.h>
 #include <rom_iap.h>
 #include <selftest.h>
-#include <transceiver_mode.h>
 #include <sgpio.h>
+#include <transceiver_mode.h>
+#include <tuning.h>
 #include <usb.h>
 #include <usb_queue.h>
 #include <usb_request.h>
@@ -463,6 +464,7 @@ int main(void)
 	clock_gen_init();
 	#endif
 #endif
+	tuning_setup();
 #ifdef HACKRF_ONE
 	// Set up mixer before enabling RF power, because its
 	// GPO is used to control the antenna bias tee.