coldcard/firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve SP during callgate process. Bump copyright, version

Browse Source
This commit is contained in:
Peter D. Gray 2019-02-11 13:46:28 -05:00
parent e4f0038a02
commit 3772830176
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
stm32/bootloader/startup.S
View File

@ -65,9 +65,9 @@ my_version_code:
.align 4
.ascii "(c) Copyright 2018 by Coinkite Inc. \n"
.ascii "(c) Copyright 2018-2019 by Coinkite Inc. \n"
.ascii " \n"
.ascii "This space for rent. Just 1BTC/year. \n"
.ascii "This space for rent! Just 2BTC/year. \n"
.ascii " \n"
//
@ -125,14 +125,17 @@ wipe_loop1:
cmp r9, r10
bne wipe_loop1
// switch to our own stack
// switch to our own stack (but save caller's stack ptr)
mov r10, sp
mov sp, r9
push {r10, lr}
// do the real work
push {lr}
dispatcher: // just for debuger view
bl firewall_dispatch
pop {lr}
pop {r10, lr}
mov sp, r10
// clear our sram completely
movw r9, BL_SRAM_BASE & 0xffff

2
stm32/bootloader/version.h
View File

@ -6,7 +6,7 @@
#include <stdint.h>
// Public version number for humans. Lots more version data added by Makefile.
#define RELEASE_VERSION "1.1.0"
#define RELEASE_VERSION "1.2.0"
extern const char version_string[];