From 597b9fabd1f4c35c35bd24dbf588048ac5cd4cac Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 27 Apr 2019 16:38:08 +0200
Subject: [PATCH] legacy: fix build parameters

---
 legacy/firmware/Makefile | 8 ++++----
 legacy/firmware/usb.c    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/legacy/firmware/Makefile b/legacy/firmware/Makefile
index 41ac8fb99..85e759fea 100644
--- a/legacy/firmware/Makefile
+++ b/legacy/firmware/Makefile
@@ -26,11 +26,11 @@ OBJS += reset.o
 OBJS += signing.o
 OBJS += crypto.o
 
-ifeq ($(U2F_ENABLED),1)
+ifneq ($(U2F_ENABLED),0)
 OBJS += u2f.o
 endif
 
-ifeq ($(BITCOIN_ONLY),0)
+ifneq ($(BITCOIN_ONLY),1)
 OBJS += ethereum.o
 OBJS += ethereum_tokens.o
 OBJS += lisk.o
@@ -105,7 +105,7 @@ OBJS += protob/messages-common.pb.o
 OBJS += protob/messages-crypto.pb.o
 OBJS += protob/messages-debug.pb.o
 OBJS += protob/messages-management.pb.o
-ifeq ($(BITCOIN_ONLY),0)
+ifneq ($(BITCOIN_ONLY),1)
 OBJS += protob/messages-ethereum.pb.o
 OBJS += protob/messages-lisk.pb.o
 OBJS += protob/messages-nem.pb.o
@@ -131,7 +131,7 @@ CFLAGS += -DDEBUG_LINK=$(DEBUG_LINK)
 CFLAGS += -DDEBUG_LOG=$(DEBUG_LOG)
 CFLAGS += -DSCM_REVISION='"$(shell git rev-parse HEAD | sed 's:\(..\):\\x\1:g')"'
 CFLAGS += -DUSE_MONERO=0
-ifeq ($(BITCOIN_ONLY),0)
+ifneq ($(BITCOIN_ONLY),1)
 CFLAGS += -DUSE_ETHEREUM=1
 CFLAGS += -DUSE_NEM=1
 MAKO_RENDER_FLAG =
diff --git a/legacy/firmware/usb.c b/legacy/firmware/usb.c
index a5b990d01..45ecb9ac2 100644
--- a/legacy/firmware/usb.c
+++ b/legacy/firmware/usb.c
@@ -278,6 +278,8 @@ static const struct usb_config_descriptor config = {
     .interface = ifaces,
 };
 
+static volatile char tiny = 0;
+
 #if U2F_ENABLED
 
 static enum usbd_request_return_codes hid_control_request(
@@ -309,8 +311,6 @@ static void u2f_rx_callback(usbd_device *dev, uint8_t ep) {
 
 #endif
 
-static volatile char tiny = 0;
-
 static void main_rx_callback(usbd_device *dev, uint8_t ep) {
   (void)ep;
   static CONFIDENTIAL uint8_t buf[64] __attribute__((aligned(4)));