1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-14 03:30:02 +00:00

prepare 1.2.0 release

This commit is contained in:
Pavol Rusnak 2014-07-01 21:42:00 +02:00
parent 8ee9d50eb6
commit df524b9f35
6 changed files with 13 additions and 7 deletions

View File

@ -8,9 +8,9 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FE324A81C208C89497E
# define used versions for pinning
ENV GCC_ARM_VERSION 4-8-2014q2-0trusty9
ENV LIBOPENCM3_GITREV c01f9ee323d06b5325d77cda593a46dfe76ba341
ENV TREZOR_MCU_GITREV e9fd756daad713525fa30bc3a08df4127548383f
ENV GCC_ARM_VERSION 4-8-2014q2-0trusty10
ENV LIBOPENCM3_GITREV f6b6d62ec5628ebb0602c466ee9fd7a6070ef1f0
ENV TREZOR_MCU_GITREV v1.2.0
# install build tools and dependencies

View File

@ -1,5 +1,10 @@
#!/bin/bash
if [ -z "$1" ]; then
echo "Please provide filename as argument"
exit 1
fi
MAGIC=`head -c +4 $1`
if [ "x$MAGIC" != "xTRZR" ]; then

View File

@ -49,7 +49,8 @@ typedef enum _ButtonRequestType {
ButtonRequestType_ButtonRequest_ConfirmWord = 5,
ButtonRequestType_ButtonRequest_WipeDevice = 6,
ButtonRequestType_ButtonRequest_ProtectCall = 7,
ButtonRequestType_ButtonRequest_SignTx = 8
ButtonRequestType_ButtonRequest_SignTx = 8,
ButtonRequestType_ButtonRequest_FirmwareCheck = 9
} ButtonRequestType;
typedef enum _PinMatrixRequestType {

View File

@ -21,7 +21,7 @@
#define __TREZOR_H__
#define VERSION_MAJOR 1
#define VERSION_MINOR 1
#define VERSION_MINOR 2
#define VERSION_PATCH 0
#define STR(X) #X

@ -1 +1 @@
Subproject commit bf7b99fd286ae6ff5ada0e1bc7e4d403f5a7dc8e
Subproject commit fc98712da5c260f3828dab703880eb5e9da00580

@ -1 +1 @@
Subproject commit 3308cc62a64bac76fb475363f9bce83cab1d8381
Subproject commit 3747ba432336bf10191a63e84fbfead62e944ddb