From 2cde9511dad9b9803df5e3e396473ac55b73fa94 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Tue, 7 Mar 2017 00:56:18 +0100
Subject: [PATCH] micropython: update submodule; fix build

---
 .travis.yml                         |  5 +----
 Makefile.firmware                   |  1 +
 micropython/firmware/.gitignore     |  1 +
 micropython/firmware/mpconfigport.h | 10 ----------
 vendor/micropython                  |  2 +-
 5 files changed, 4 insertions(+), 15 deletions(-)
 create mode 100644 micropython/firmware/.gitignore

diff --git a/.travis.yml b/.travis.yml
index caab8409d..6d50e83d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
 
diff --git a/Makefile.firmware b/Makefile.firmware
index c89b3d274..ac7b54dfd 100644
--- a/Makefile.firmware
+++ b/Makefile.firmware
@@ -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 \
diff --git a/micropython/firmware/.gitignore b/micropython/firmware/.gitignore
new file mode 100644
index 000000000..567609b12
--- /dev/null
+++ b/micropython/firmware/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/micropython/firmware/mpconfigport.h b/micropython/firmware/mpconfigport.h
index 14064f9af..1a910deb7 100644
--- a/micropython/firmware/mpconfigport.h
+++ b/micropython/firmware/mpconfigport.h
@@ -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);
diff --git a/vendor/micropython b/vendor/micropython
index 815700a49..d38958077 160000
--- a/vendor/micropython
+++ b/vendor/micropython
@@ -1 +1 @@
-Subproject commit 815700a492ae1253910b79b6f6c32bfce4d5a848
+Subproject commit d38958077d58b8bbe8de2a8fa4387fd94004defb