github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 18:48:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev_em4x50_info_write

Browse source 
merge conflict
This commit is contained in:
tharexde 2020-06-22 21:04:48 +02:00
commit cdb57c9c2b
43 changed files with 773 additions and 614 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common_arm/ldscript.common
View file

@ -9,7 +9,7 @@ ms of the GNU GPL, version 2 or,
-----------------------------------------------------------------------------
*/
stacksize = DEFINED(stacksize) ? stacksize : 6K;
stacksize = DEFINED(stacksize) ? stacksize : 8488;
commonareasize = 0x20;
/* AT91SAM7S256 has 256k Flash and 64k RAM */