Merge pull request #116 from Zondax/dev

Zondax · Dec 8, 2023 · 42e82e9 · 42e82e9
2 parents 7f80d18 + 0289a35
commit 42e82e9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 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-18aeb18415cf282b88ecf6d86ce5fa2dff4820d8
+DOCKER_IMAGE_ZONDAX=zondax/ledger-app-builder:ledger-4e23f9e59b2f54100b2d5078a38779531d0f87e8
 DOCKER_IMAGE_LEDGER=ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
 
 ifdef INTERACTIVE

diff --git a/include/zxmacros.h b/include/zxmacros.h
@@ -40,6 +40,10 @@ extern void explicit_bzero(void *s, size_t n) __THROW __nonnull ((1));
 #define __Z_UNUSED __attribute__((unused))
 #define NV_ALIGN __attribute__ ((aligned(64)))
 
+#ifndef UNUSED
+#define UNUSED(x) (void)x
+#endif
+
 #if defined(LEDGER_SPECIFIC)
 #include "bolos_target.h"
 #endif

diff --git a/include/zxmacros_x64.h b/include/zxmacros_x64.h
@@ -31,10 +31,6 @@
 #define CX_ECCINFO_PARITY_ODD 1u
 #define CX_ECCINFO_xGTn 2u
 
-#ifndef UNUSED
-#define UNUSED(x) (void)x
-#endif
-
 #ifndef __APPLE__
 #define MEMZERO explicit_bzero
 #else

diff --git a/include/zxversion.h b/include/zxversion.h
@@ -15,6 +15,6 @@
 ********************************************************************************/
 #pragma once
 
-#define ZXLIB_MAJOR     19
-#define ZXLIB_MINOR     9
-#define ZXLIB_PATCH     1
+#define ZXLIB_MAJOR     20
+#define ZXLIB_MINOR     0
+#define ZXLIB_PATCH     0
diff --git a/makefiles/Makefile.devices b/makefiles/Makefile.devices
@@ -22,10 +22,8 @@ else
 APP_LOAD_PARAMS += --appFlags 0x000
 endif
 
-ifeq ($(NANOS_STACK_SIZE),)
-APP_STACK_SIZE:=3150
-else
-APP_STACK_SIZE:= $(NANOS_STACK_SIZE)
+ifneq ($(NANOS_STACK_SIZE),)
+$(error NANOS_STACK_SIZE is deprecated. Remove NANOS_STACK_SIZE definition in app/Makefile)
 endif
 
 ICONNAME:=$(CURDIR)/nanos_icon.gif