usb_desc: fix descriptors for btc-only edition

Regression of e10a9ee#diff-b6dce29b44c127fb34e4ffcf96402ce8R31
com03240 · Oct 30, 2019 · 1e0b0ec · 1e0b0ec
1 parent 0aa7bfe
commit 1e0b0ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,7 +86,7 @@ endif()
 # Versions MUST contain three parts and start with lowercase 'v'.
 # Example 'v1.0.0'. They MUST not contain a pre-release label such as '-beta'.
 set(FIRMWARE_VERSION "v4.2.1")
-set(FIRMWARE_BTC_ONLY_VERSION "v4.2.1")
+set(FIRMWARE_BTC_ONLY_VERSION "v4.2.2")
 set(BOOTLOADER_VERSION "v1.0.1")
 
 find_package(PythonInterp 3.6 REQUIRED)

diff --git a/src/usb/class/usb_desc.h b/src/usb/class/usb_desc.h
@@ -28,7 +28,7 @@
 #define USB_DESC_IDPRODUCT 0x2403
 #define USB_DESC_HWW_EP_IN (1 | USB_EP_DIR_IN)
 #define USB_DESC_HWW_EP_OUT (2 | USB_EP_DIR_OUT)
-#ifndef BOOTLOADER
+#if defined(APP_U2F)
 #define USB_DESC_U2F_EP_IN (3 | USB_EP_DIR_IN)
 #define USB_DESC_U2F_EP_OUT (4 | USB_EP_DIR_OUT)
 #define USB_DESC_IFACE_NUM_U2F 1