Merge pull request #65 from LedgerHQ/xch/app-load-params-fix

Makefile app load params fix
LedgerHQ · Nov 30, 2023 · 6ddc60e · 6ddc60e
2 parents a720f0a + dd0dc57
commit 6ddc60e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -63,8 +63,6 @@ DEFINES += HAVE_SPRINTF HAVE_SNPRINTF_FORMAT_U
 DEFINES += APPVERSION=\"$(APPVERSION)\"
 DEFINES += MAJOR_VERSION=$(APPVERSION_M) MINOR_VERSION=$(APPVERSION_N) PATCH_VERSION=$(APPVERSION_P)
 
-DEFINES   += UNUSED\(x\)=\(void\)x
-
 ## USB HID?
 DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=4 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
 
@@ -153,12 +151,6 @@ all: default
 #   Build    #
 ##############
 
-# import generic rules from the sdk
-include $(BOLOS_SDK)/Makefile.rules
-
-#add dependency on custom makefile filename
-dep/%.d: %.c Makefile
-
 listvariants:
 	@echo VARIANTS COIN cardano_ada
 
@@ -203,3 +195,6 @@ format:
 
 size: all
 	$(GCCPATH)arm-none-eabi-size --format=gnu bin/app.elf
+
+# import generic rules from the sdk
+include $(BOLOS_SDK)/Makefile.rules
diff --git a/src/io.c b/src/io.c
@@ -181,7 +181,6 @@ unsigned short io_exchange_al(unsigned char channel, unsigned short tx_len)
 	return 0;
 }
 
-STATIC_ASSERT(CX_APILEVEL >= 9, "bad api level");
 static const unsigned PIN_VERIFIED = BOLOS_UX_OK; // Seems to work for api 9/10
 
 bool device_is_unlocked()

diff --git a/src/main.c b/src/main.c
@@ -39,12 +39,6 @@
 #include "uiScreens_nbgl.h"
 #endif
 
-// The whole app is designed for a specific api level.
-// In case there is an api change, first *verify* changes
-// (especially potential security implications) before bumping
-// the API level!
-STATIC_ASSERT(CX_APILEVEL >= 9, "bad api level");
-
 static const int INS_NONE = -1;
 
 static const uint8_t CLA = 0xD7;