diff --git a/README b/README index 509bec2..b8e8a89 100644 --- a/README +++ b/README @@ -3,11 +3,11 @@ BWalletFirmware 本项目基于https://github.com/trezor/trezor-mcu/ 构建说明: -bootloader v1.3.2 +bootloader v1.3.2 https://github.com/BWallet/bwallet-mcu/releases/tag/1.3.0 -firmware v1.3.3 -hash: a8100efdb655a886b9f177001e20d81f8adf4eda85e40311cab6ffb2e2aec99b +firmware v1.3.4 +hash: 148c448aa2f158554ed17ec4860e0c0b9d8e0da2de95cd283cd3e72e9df9933f 系统环境:ubuntu:14.04 32bit @@ -15,9 +15,9 @@ hash: a8100efdb655a886b9f177001e20d81f8adf4eda85e40311cab6ffb2e2aec99b $apt-get update $sudo apt-get install -y build-essential git python python-pip libssl-dev $pip install ecdsa -$wget https://launchpadlibrarian.net/200701245/gcc-arm-none-eabi-4_9-2015q1-20150306-linux.tar.bz2 -$tar vxf gcc-arm-none-eabi-4_9-2015q1-20150306-linux.tar.bz2 -$export PATH=$PATH:$(HOME)/gcc-arm-none-eabi-4_9-2015q1/bin +$wget wget https://launchpadlibrarian.net/186124160/gcc-arm-none-eabi-4_8-2014q3-20140805-linux.tar.bz2 +$tar vxf gcc-arm-none-eabi-4_8-2014q3-20140805-linux.tar.bz2 +$export PATH=$PATH:$(HOME)/gcc-arm-none-eabi-4_8-2014q3/bin 终端上能运行arm-none-eabi-gcc 表示编译环境构建完成 2、下载stm32所用的libopencm3 依赖库及BWallet项目到同一目录 @@ -32,7 +32,7 @@ $make git clone https://github.com/BWallet/bwallet-mcu.git $cd bwallet-mcu/ $git submodule update --recursive --init -$git checkout 1.3.3 +$git checkout 1.3.4 $git submodule update $make $cd bwallet-mcu/firmware diff --git a/firmware/Makefile b/firmware/Makefile index 91ab046..7f7e8f3 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -1,4 +1,4 @@ -APPVER = 1.3.3 +APPVER = 1.3.4 NAME = bwallet diff --git a/firmware/bwallet.h b/firmware/bwallet.h index cca56ae..4146b87 100644 --- a/firmware/bwallet.h +++ b/firmware/bwallet.h @@ -22,7 +22,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 -#define VERSION_PATCH 3 +#define VERSION_PATCH 4 #define STR(X) #X #define VERSTR(X) STR(X) diff --git a/firmware/storage.c b/firmware/storage.c index 1313235..bb5290f 100644 --- a/firmware/storage.c +++ b/firmware/storage.c @@ -64,7 +64,7 @@ static char sessionPassphrase[51]; 0x0010 | ? | Storage structure */ -#define STORAGE_VERSION 5 +#define STORAGE_VERSION 6 void storage_from_flash(uint32_t version) { @@ -84,6 +84,9 @@ void storage_from_flash(uint32_t version) case 5: // copy(since 1.3.3) memcpy(&storage, (void *)(FLASH_STORAGE_START + 4 + sizeof(storage_uuid)), sizeof(Storage)); break; + case 6: // copy(since 1.3.4) + memcpy(&storage, (void *)(FLASH_STORAGE_START + 4 + sizeof(storage_uuid)), sizeof(Storage)); + break; } storage.version = STORAGE_VERSION; } diff --git a/memory_app_1.3.3.ld b/memory_app_1.3.4.ld similarity index 100% rename from memory_app_1.3.3.ld rename to memory_app_1.3.4.ld