From 7d9d0fbbc645fc7820cf15eb2b946b1f83a49da8 Mon Sep 17 00:00:00 2001
From: Edouard Merle <edouard.merle@ledger.fr>
Date: Tue, 1 Feb 2022 16:48:36 +0100
Subject: [PATCH] fix: build for lns+

---
 Makefile      | 24 +++++++++++++-----------
 src/ui_flow.c |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 4607051..0a1a209 100644
--- a/Makefile
+++ b/Makefile
@@ -248,10 +248,10 @@ APP_LOAD_PARAMS += $(APP_LOAD_FLAGS) --path "44'/1'"
 DEFINES += $(DEFINES_LIB)
 
 #prepare hsm generation
-ifeq ($(TARGET_NAME), TARGET_NANOX)
-ICONNAME=icons/nanox_app_$(CHAIN).gif
-else
+ifeq ($(TARGET_NAME),TARGET_NANOS)
 ICONNAME=icons/nanos_app_$(CHAIN).gif
+else
+ICONNAME=icons/nanox_app_$(CHAIN).gif
 endif
 
 ################
@@ -283,19 +283,21 @@ DEFINES   += HAVE_UX_FLOW
 DEFINES   += HAVE_WEBUSB WEBUSB_URL_SIZE_B=0 WEBUSB_URL=""
 
 ifeq ($(TARGET_NAME),TARGET_NANOX)
-DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=300
 DEFINES   += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000
 DEFINES   += HAVE_BLE_APDU # basic ledger apdu transport over BLE
+endif
 
+ifeq ($(TARGET_NAME),TARGET_NANOS)
+DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=72
+DEFINES   += HAVE_WALLET_ID_SDK
+else
+DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=300
 DEFINES   += HAVE_GLO096
 DEFINES   += HAVE_BAGL BAGL_WIDTH=128 BAGL_HEIGHT=64
 DEFINES   += HAVE_BAGL_ELLIPSIS # long label truncation feature
 DEFINES   += HAVE_BAGL_FONT_OPEN_SANS_REGULAR_11PX
 DEFINES   += HAVE_BAGL_FONT_OPEN_SANS_EXTRABOLD_11PX
 DEFINES   += HAVE_BAGL_FONT_OPEN_SANS_LIGHT_16PX
-else
-DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=72
-DEFINES   += HAVE_WALLET_ID_SDK
 endif
 
 # Enables direct data signing without having to specify it in the settings. Useful when testing with speculos.
@@ -311,7 +313,7 @@ DEFINES += HAVE_BYPASS_SIGNATURES
 endif
 
 # NFTs
-ifeq ($(TARGET_NAME), TARGET_NANOX)
+ifneq ($(TARGET_NAME),TARGET_NANOS)
 DEFINES	+= HAVE_NFT_SUPPORT
 # Enable the NFT testing key
 NFT_TESTING_KEY:=0
@@ -325,10 +327,10 @@ endif
 DEBUG:=0
 ifneq ($(DEBUG),0)
 DEFINES += HAVE_STACK_OVERFLOW_CHECK
-ifeq ($(TARGET_NAME),TARGET_NANOX)
-DEFINES   += HAVE_PRINTF PRINTF=mcu_usb_printf
-else
+ifeq ($(TARGET_NAME),TARGET_NANOS)
 DEFINES   += HAVE_PRINTF PRINTF=screen_printf
+else
+DEFINES   += HAVE_PRINTF PRINTF=mcu_usb_printf
 endif
 else
 DEFINES   += PRINTF\(...\)=
diff --git a/src/ui_flow.c b/src/ui_flow.c
index b6b2fa3..d6c0a16 100644
--- a/src/ui_flow.c
+++ b/src/ui_flow.c
@@ -171,7 +171,7 @@ UX_STEP_CB(
       "Error",
       "Blind signing must be enabled in Settings",
     });
-#elif defined(TARGET_NANOX)
+#elif defined(TARGET_NANOX) || defined(TARGET_NANOS2)
 UX_STEP_CB(
     ux_warning_contract_data_step,
     pnn,