arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-16 11:28:14 +00:00
Code Issues Releases Wiki Activity

update to current micropython master

Browse Source
This commit is contained in:
Pavol Rusnak 2017-03-26 23:11:57 +02:00
parent 2a32975977
commit 6861e68f21
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.firmware
View File

@ -142,6 +142,7 @@ OBJ_MP += $(addprefix $(BUILD_MP)/,\
lib/libm/kf_tan.o \ lib/libm/kf_tan.o \
lib/libm/log1pf.o \ lib/libm/log1pf.o \
lib/libm/math.o \ lib/libm/math.o \
lib/libm/nearbyintf.o \
lib/libm/roundf.o \ lib/libm/roundf.o \
lib/libm/sf_cos.o \ lib/libm/sf_cos.o \
lib/libm/sf_erf.o \ lib/libm/sf_erf.o \

5
micropython/firmware/main.c
View File

@ -8,6 +8,7 @@
#include "py/stackctrl.h" #include "py/stackctrl.h"
#include "py/repl.h" #include "py/repl.h"
#include "py/gc.h" #include "py/gc.h"
#include "py/mperrno.h"
#include "lib/utils/pyexec.h" #include "lib/utils/pyexec.h"
#include "gccollect.h" #include "gccollect.h"
@ -98,6 +99,6 @@ mp_obj_t mp_builtin_open(uint n_args, const mp_obj_t *args, mp_map_t *kwargs) {
} }
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open); MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
int mp_reader_new_file(mp_reader_t *reader, const char *filename) { void mp_reader_new_file(mp_reader_t *reader, const char *filename) {
return 2; // assume error was "file not found" mp_raise_OSError(MP_ENOENT); // assume "file not found"
} }

2
vendor/micropython vendored

@ -1 +1 @@
Subproject commit bbdaf762cf45518b1f8188b9a951e8459dcc73e3 Subproject commit bf2d7b10934242b56833d30a91d0ce1beae097e0