embed: include files from vendor/micropython/ports/stm32 explicitly

SConscript.boardloader

@@ -115,7 +115,6 @@ env.Replace(
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython/stmhal',
-        'vendor/micropython/ports/stm32',
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',
         'vendor/micropython/lib/stm32lib/CMSIS/STM32F4xx/Include',
         'vendor/micropython/lib/cmsis/inc',

SConscript.bootloader

@@ -137,7 +137,6 @@ env.Replace(
         'embed/bootloader/protob',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
-        'vendor/micropython/ports/stm32',
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',
         'vendor/micropython/lib/stm32lib/CMSIS/STM32F4xx/Include',
         'vendor/micropython/lib/cmsis/inc',

SConscript.firmware

@@ -330,7 +330,6 @@ env.Replace(
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',
         'vendor/micropython/lib/stm32lib/CMSIS/STM32F4xx/Include',
         'vendor/micropython/lib/cmsis/inc',
-        'vendor/micropython/ports/stm32',
     ] + CPPPATH_MOD,
     CPPDEFINES=[
         ('TREZOR_MODEL', '$TREZOR_MODEL'),

SConscript.prodtest

@@ -115,7 +115,6 @@ env.Replace(
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',
         'vendor/micropython/lib/stm32lib/CMSIS/STM32F4xx/Include',
         'vendor/micropython/lib/cmsis/inc',
-        'vendor/micropython/ports/stm32',
     ] + CPPPATH_MOD,
     CPPDEFINES=[
         ('TREZOR_MODEL', '$TREZOR_MODEL'),

SConscript.reflash

@@ -7,6 +7,14 @@ CPPPATH_MOD = []
 CPPDEFINES_MOD = []
 SOURCE_MOD = []
 
+# modtrezorcrypto
+CPPPATH_MOD += [
+    'vendor/trezor-crypto',
+]
+SOURCE_MOD += [
+    'vendor/trezor-crypto/memzero.c',
+]
+
 # modtrezorui
 CPPDEFINES_MOD += [
     'TREZOR_FONT_BOLD_ENABLE',
@@ -107,7 +115,6 @@ env.Replace(
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',
         'vendor/micropython/lib/stm32lib/CMSIS/STM32F4xx/Include',
         'vendor/micropython/lib/cmsis/inc',
-        'vendor/micropython/ports/stm32',
     ] + CPPPATH_MOD,
     CPPDEFINES=[
         ('TREZOR_MODEL', '$TREZOR_MODEL'),

embed/firmware/main.c

@@ -30,8 +30,8 @@
 #include "py/mperrno.h"
 #include "lib/utils/pyexec.h"
 
-#include "gccollect.h"
-#include "pendsv.h"
+#include "ports/stm32/gccollect.h"
+#include "ports/stm32/pendsv.h"
 
 #include "common.h"
 #include "display.h"

embed/trezorhal/systick.c

@@ -45,9 +45,9 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "irq.h"
-#include "systick.h"
-#include "pybthread.h"
+#include "ports/stm32/irq.h"
+#include "ports/stm32/systick.h"
+#include "ports/stm32/pybthread.h"
 
 extern __IO uint32_t uwTick;