diff --git a/Makefile b/Makefile
index 261f1de226..66dd7abbc4 100644
--- a/Makefile
+++ b/Makefile
@@ -101,9 +101,9 @@ HSE_VALUE       ?= 8000000
 # used for turning on features like VCP and SDCARD
 FEATURES        =
 
-SAMPLE_TARGETS  = ALIENFLIGHTF3 ALIENFLIGHTF4 ANYFCF7 BETAFLIGHTF3 BLUEJAYF4 CC3D FURYF4 NAZE REVO SIRINFPV SPARKY SPRACINGF3 SPRACINGF3EVO STM32F3DISCOVERY
-ALT_TARGETS     = $(sort $(filter-out target, $(basename $(notdir $(wildcard $(ROOT)/src/main/target/*/*.mk)))))
-OPBL_TARGETS    = $(filter %_OPBL, $(ALT_TARGETS))
+OFFICIAL_TARGETS  = ALIENFLIGHTF3 ALIENFLIGHTF4 ANYFCF7 BETAFLIGHTF3 BLUEJAYF4 CC3D FURYF4 NAZE REVO SIRINFPV SPARKY SPRACINGF3 SPRACINGF3EVO STM32F3DISCOVERY
+ALT_TARGETS       = $(sort $(filter-out target, $(basename $(notdir $(wildcard $(ROOT)/src/main/target/*/*.mk)))))
+OPBL_TARGETS      = $(filter %_OPBL, $(ALT_TARGETS))
 
 VALID_TARGETS   = $(dir $(wildcard $(ROOT)/src/main/target/*/target.mk))
 VALID_TARGETS  := $(subst /,, $(subst ./src/main/target/,, $(VALID_TARGETS)))
@@ -1093,8 +1093,8 @@ $(OBJECT_DIR)/$(TARGET)/%.o: %.S
 	$(V1) echo "%% $(notdir $<)" "$(STDOUT)"
 	$(V1) $(CROSS_CC) -c -o $@ $(ASFLAGS) $<
 
-## sample            : Build all sample (travis) targets
-sample: $(SAMPLE_TARGETS)
+## official            : Build all official (travis) targets
+official: $(OFFICIAL_TARGETS)
 
 ## all               : Build all valid targets
 all: $(VALID_TARGETS)
diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
index eb7cd7f810..4a5ea193ce 100644
--- a/src/main/blackbox/blackbox.c
+++ b/src/main/blackbox/blackbox.c
@@ -1657,8 +1657,12 @@ void handleBlackbox(timeUs_t currentTimeUs)
 
 static bool canUseBlackboxWithCurrentConfiguration(void)
 {
+#ifdef USE_SDCARD
     return feature(FEATURE_BLACKBOX) && 
-        (blackboxConfig()->device != BLACKBOX_SDCARD || feature(FEATURE_SDCARD));
+        !(blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD && !feature(FEATURE_SDCARD));
+#else
+    return feature(FEATURE_BLACKBOX);
+#endif
 }
 
 /**
diff --git a/src/main/blackbox/blackbox.h b/src/main/blackbox/blackbox.h
index 2d374c673c..95db665747 100644
--- a/src/main/blackbox/blackbox.h
+++ b/src/main/blackbox/blackbox.h
@@ -23,11 +23,16 @@
 
 #include "config/parameter_group.h"
 
-typedef enum {
-	BLACKBOX_SERIAL = 0, 
-	BLACKBOX_SPIFLASH,
-	BLACKBOX_SDCARD
-} blackBoxDevice_e;
+typedef enum BlackboxDevice {
+    BLACKBOX_DEVICE_SERIAL = 0,
+#ifdef USE_FLASHFS
+    BLACKBOX_DEVICE_FLASH = 1,
+#endif
+#ifdef USE_SDCARD
+    BLACKBOX_DEVICE_SDCARD = 2,
+#endif
+
+} BlackboxDevice_e;
 
 typedef struct blackboxConfig_s {
     uint8_t rate_num;
diff --git a/src/main/blackbox/blackbox_io.h b/src/main/blackbox/blackbox_io.h
index 9dc7b7566b..f9347e833f 100644
--- a/src/main/blackbox/blackbox_io.h
+++ b/src/main/blackbox/blackbox_io.h
@@ -17,18 +17,6 @@
 
 #pragma once
 
-typedef enum BlackboxDevice {
-    BLACKBOX_DEVICE_SERIAL = 0,
-
-#ifdef USE_FLASHFS
-    BLACKBOX_DEVICE_FLASH = 1,
-#endif
-#ifdef USE_SDCARD
-    BLACKBOX_DEVICE_SDCARD = 2,
-#endif
-
-} BlackboxDevice;
-
 typedef enum {
     BLACKBOX_RESERVE_SUCCESS,
     BLACKBOX_RESERVE_TEMPORARY_FAILURE,
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index e5078d3706..6a44558f55 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -501,7 +501,7 @@ void init(void)
 #endif
 
 #ifdef USE_FLASHFS
-    if (blackboxConfig()->device == BLACKBOX_SPIFLASH) {
+    if (blackboxConfig()->device == BLACKBOX_DEVICE_FLASH) {
 #if defined(USE_FLASH_M25P16)
         m25p16_init(flashConfig());
 #endif
@@ -510,7 +510,7 @@ void init(void)
 #endif
 
 #ifdef USE_SDCARD
-    if (feature(FEATURE_SDCARD) && blackboxConfig()->device == BLACKBOX_SDCARD) {
+    if (feature(FEATURE_SDCARD) && blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD) {
         sdcardInsertionDetectInit();
         sdcard_init(sdcardConfig()->useDma);
         afatfs_init();