mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-11-13 19:18:56 +00:00
micropython: update submodule; fix build
This commit is contained in:
parent
b28fd6327f
commit
2cde9511da
@ -12,10 +12,7 @@ install:
|
||||
script:
|
||||
- make build_cross
|
||||
|
||||
- make build_stmhal_frozen
|
||||
|
||||
- make build_unix_frozen TREZORUI_NOUI=1
|
||||
- make clean_unix
|
||||
- make build_trezorhal
|
||||
|
||||
- make build_unix TREZORUI_NOUI=1
|
||||
|
||||
|
@ -63,6 +63,7 @@ OBJ_MOD += \
|
||||
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/bignum.o \
|
||||
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/bip32.o \
|
||||
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/bip39.o \
|
||||
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/blake2b.o \
|
||||
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/blake2s.o \
|
||||
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/curve25519-donna/curve25519.o \
|
||||
$(BUILD_FW)/extmod/modtrezorcrypto/trezor-crypto/curves.o \
|
||||
|
1
micropython/firmware/.gitignore
vendored
Normal file
1
micropython/firmware/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
build/
|
@ -185,16 +185,6 @@ extern const struct _mp_obj_module_t mp_module_TrezorUtils;
|
||||
#define free(p) m_free(p)
|
||||
#define realloc(p, n) m_realloc(p, n)
|
||||
|
||||
// Timing functions
|
||||
|
||||
#include "stmhal/systick.h"
|
||||
|
||||
#define mp_hal_delay_ms HAL_Delay
|
||||
#define mp_hal_delay_us(us) sys_tick_udelay(us)
|
||||
#define mp_hal_delay_us_fast(us) sys_tick_udelay(us)
|
||||
#define mp_hal_ticks_ms HAL_GetTick
|
||||
#define mp_hal_ticks_us() sys_tick_get_microseconds()
|
||||
|
||||
extern bool mp_hal_ticks_cpu_enabled;
|
||||
|
||||
void mp_hal_ticks_cpu_enable(void);
|
||||
|
2
vendor/micropython
vendored
2
vendor/micropython
vendored
@ -1 +1 @@
|
||||
Subproject commit 815700a492ae1253910b79b6f6c32bfce4d5a848
|
||||
Subproject commit d38958077d58b8bbe8de2a8fa4387fd94004defb
|
Loading…
Reference in New Issue
Block a user