Merge pull request #108 from Zondax/swap

Zondax · Aug 16, 2023 · 928c759 · 928c759
2 parents 3ffe648 + 7bb01dd
commit 928c759
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/dockerized_build.mk b/dockerized_build.mk
@@ -49,7 +49,7 @@ $(info EXAMPLE_VUE_DIR       : $(EXAMPLE_VUE_DIR))
 $(info TESTS_JS_DIR          : $(TESTS_JS_DIR))
 $(info TESTS_JS_PACKAGE      : $(TESTS_JS_PACKAGE))
 
-DOCKER_IMAGE_ZONDAX=zondax/ledger-app-builder:ledger-afb65b17862f69d49fd3ecd07403a30dcc6add11
+DOCKER_IMAGE_ZONDAX=zondax/ledger-app-builder:ledger-551859be7851d050f6b2e0f7b27a62b370b3215f
 DOCKER_IMAGE_LEDGER=ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
 
 ifdef INTERACTIVE

diff --git a/include/zxversion.h b/include/zxversion.h
@@ -17,4 +17,4 @@
 
 #define ZXLIB_MAJOR     19
 #define ZXLIB_MINOR     8
-#define ZXLIB_PATCH     0
+#define ZXLIB_PATCH     1
diff --git a/makefiles/Makefile.devices b/makefiles/Makefile.devices
@@ -16,7 +16,11 @@
 #*******************************************************************************
 
 ifeq ($(TARGET_NAME),TARGET_NANOS)
+ifeq ($(HAVE_SWAP),1)
+APP_LOAD_PARAMS += --appFlags 0x800
+else
 APP_LOAD_PARAMS += --appFlags 0x000
+endif
 
 ifeq ($(NANOS_STACK_SIZE),)
 APP_STACK_SIZE:=3150
@@ -30,21 +34,33 @@ OUTPUT_INSTALLER := $(CURDIR)/pkg/installer_s.sh
 endif
 
 ifeq ($(TARGET_NAME),TARGET_NANOX)
+ifeq ($(HAVE_SWAP),1)
+APP_LOAD_PARAMS += --appFlags 0xA00
+else
 APP_LOAD_PARAMS += --appFlags 0x200
+endif
 ICONNAME:=$(CURDIR)/nanox_icon.gif
 OUTPUT_ELF ?= $(CURDIR)/output/app_x.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/installer_x.sh
 endif
 
 ifeq ($(TARGET_NAME),TARGET_NANOS2)
+ifeq ($(HAVE_SWAP),1)
+APP_LOAD_PARAMS += --appFlags 0x800
+else
 APP_LOAD_PARAMS += --appFlags 0x000
+endif
 ICONNAME:=$(CURDIR)/nanox_icon.gif
 OUTPUT_ELF ?= $(CURDIR)/output/app_s2.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/installer_s2.sh
 endif
 
 ifeq ($(TARGET_NAME),TARGET_STAX)
+ifeq ($(HAVE_SWAP),1)
+APP_LOAD_PARAMS += --appFlags 0xA00
+else
 APP_LOAD_PARAMS += --appFlags 0x200
+endif
 ICONNAME:=$(CURDIR)/stax_icon.gif
 OUTPUT_ELF ?= $(CURDIR)/output/app_stax.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/installer_stax.sh