Merge pull request #131 from Zondax/fix/splus-appflags

fix splus appflag
Zondax · Apr 4, 2022 · 4e79245 · 4e79245
2 parents c5a8a4c + 6ddc03c
commit 4e79245
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 27 deletions.
diff --git a/app/Makefile b/app/Makefile
@@ -114,7 +114,7 @@ OUTPUT_INSTALLER:= $(CURDIR)/pkg/installer_x.sh
 endif
 
 ifeq ($(TARGET_NAME),TARGET_NANOS2)
-APP_LOAD_PARAMS += --appFlags 0x200
+APP_LOAD_PARAMS += --appFlags 0x000
 SCRIPT_LD:=$(CURDIR)/script_s2.ld
 ICONNAME:=$(CURDIR)/nanox_icon.gif
 OUTPUT_ELF ?= $(CURDIR)/output/app_s2.elf

diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=12
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=9180
 # This is the patch version of this release
-APPVERSION_P=0
+APPVERSION_P=1
diff --git a/cmake/cmake-modules b/cmake/cmake-modules
diff --git a/deps/nanosplus-secure-sdk b/deps/nanosplus-secure-sdk
diff --git a/tests_tools/Cargo.lock b/tests_tools/Cargo.lock
diff --git a/tests_tools/neon/native/Cargo.toml b/tests_tools/neon/native/Cargo.toml
@@ -12,8 +12,8 @@ name = "teststools"
 crate-type = ["cdylib"]
 
 [build-dependencies]
-neon-build = "0.9.1"
+neon-build = "0.10.0"
 
 [dependencies]
-neon = "0.10.0-alpha.2"
+neon = "0.10.0"
 schnorrkel = "0.10.2"
diff --git a/tests_tools/neon/package.json b/tests_tools/neon/package.json
@@ -7,7 +7,7 @@
   "license": "Apache-2.0",
   "private": true,
   "dependencies": {
-    "neon-cli": "^0.5.1"
+    "neon-cli": "^0.10.0"
   },
   "scripts": {
     "install": "node_modules/.bin/neon build",

diff --git a/tests_tools/neon/yarn.lock b/tests_tools/neon/yarn.lock
@@ -321,10 +321,10 @@ neo-async@^2.6.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-neon-cli@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/neon-cli/-/neon-cli-0.5.1.tgz#a8568f64878687c7c95e1aad0ff99256b3daf65f"
-  integrity sha512-j8y4BvCoKn+sBabMbFe4on5ZZkuJOvBRNdPnE61etWixQFWCaBJOa0ZUH9UQM1+2FfPFDQlHNb/alpzSWz+b9w==
+neon-cli@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/neon-cli/-/neon-cli-0.10.0.tgz#b588fceb0d5c0a5c1b140381f38511fc3be5f431"
+  integrity sha512-eiyn+XDlZEauVcPZkGSW+Iw2RwidrEoPrW0LfLntOkUecLHZgfm9dOainQI074ZMi75825VV/GCSTrv4J70TpA==
   dependencies:
     chalk "^4.1.0"
     command-line-args "^5.1.1"

diff --git a/tests_zemu/package.json b/tests_zemu/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@zondax/ledger-substrate": "^0.24.0",
-    "@zondax/zemu": "^0.27.0-rc2"
+    "@zondax/zemu": "^0.27.4"
   },
   "devDependencies": {
     "@types/jest": "^27.0.3",

diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
+1 −1		include/bolos_version.h
+3 −0		include/errors.h
+3 −1		include/os_nvm.h
+3 −3		src/syscalls.c