diff --git a/makefiles/Makefile.devices b/makefiles/Makefile.devices index 3789c40..a60a72c 100644 --- a/makefiles/Makefile.devices +++ b/makefiles/Makefile.devices @@ -28,6 +28,9 @@ endif $(info APP_STACK_MIN_SIZE set to default($(APP_STACK_MIN_SIZE))) endif +APP_LOAD_PARAMS += --targetVersion= --fileName bin/app.hex --delete --tlv --rootPrivateKey ff701d781f43ce106f72dc26a46b6a83e053b5d07bb3d4ceab79c91ca822a66b +APP_DELETE_PARAMS += --rootPrivateKey ff701d781f43ce106f72dc26a46b6a83e053b5d07bb3d4ceab79c91ca822a66b + ####################################### ifeq ($(TARGET_NAME),TARGET_NANOS) ifeq ($(HAVE_SWAP),1) @@ -47,6 +50,7 @@ APP_LOAD_PARAMS += --appFlags 0xA00 else APP_LOAD_PARAMS += --appFlags 0x200 endif + ICONNAME:=$(CURDIR)/nanox_$(ICON_NAME).gif OUTPUT_ELF ?= $(CURDIR)/output/$(ELF_NAME)_x.elf OUTPUT_INSTALLER:= $(CURDIR)/pkg/$(INSTALLER_NAME)_x.sh @@ -58,6 +62,7 @@ APP_LOAD_PARAMS += --appFlags 0x800 else APP_LOAD_PARAMS += --appFlags 0x000 endif + ICONNAME:=$(CURDIR)/nanox_$(ICON_NAME).gif OUTPUT_ELF ?= $(CURDIR)/output/$(ELF_NAME)_s2.elf OUTPUT_INSTALLER:= $(CURDIR)/pkg/$(INSTALLER_NAME)_s2.sh diff --git a/makefiles/Makefile.installer_script b/makefiles/Makefile.installer_script index df5df75..ebfa7b9 100644 --- a/makefiles/Makefile.installer_script +++ b/makefiles/Makefile.installer_script @@ -21,7 +21,7 @@ create-install-script: @echo "APPVERSION=\"${APPVERSION}\"" >> $(OUTPUT_INSTALLER) @echo "APPPATH=\""${APPPATH}"\"" >> $(OUTPUT_INSTALLER) @echo "LOAD_PARAMS=($$(echo "${APP_LOAD_PARAMS}" | sed -e "s|"${APPNAME}"|\""${APPNAME}"\"|"))" >> $(OUTPUT_INSTALLER) - @echo "DELETE_PARAMS=($$(echo "${COMMON_DELETE_PARAMS}" | sed -e "s|"${APPNAME}"|\""${APPNAME}"\"|"))" >> $(OUTPUT_INSTALLER) + @echo "DELETE_PARAMS=($$(echo "${APP_DELETE_PARAMS}" | sed -e "s|"${APPNAME}"|\""${APPNAME}"\"|"))" >> $(OUTPUT_INSTALLER) @echo "APPHEX=\"" >> $(OUTPUT_INSTALLER) @cat $(CURDIR)/bin/app.hex >> $(OUTPUT_INSTALLER) @echo "\"" >> $(OUTPUT_INSTALLER)