From bddb72d76ae04a4cd981433fc40e1e1546659ae7 Mon Sep 17 00:00:00 2001 From: andrew Date: Fri, 11 Jan 2019 20:40:40 +0100 Subject: [PATCH] Include trezor-storage before micropython. --- SConscript.firmware | 4 +--- SConscript.unix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/SConscript.firmware b/SConscript.firmware index 67682baa9..03e3af463 100644 --- a/SConscript.firmware +++ b/SConscript.firmware @@ -10,9 +10,6 @@ SOURCE_MOD = [] PYOPT = '1' # modtrezorconfig -CPPPATH_MOD += [ - 'vendor/trezor-storage/c', -] SOURCE_MOD += [ 'embed/extmod/modtrezorconfig/modtrezorconfig.c', 'vendor/trezor-storage/c/norcow.c', @@ -330,6 +327,7 @@ env.Replace( 'embed/firmware', 'embed/trezorhal', 'embed/extmod/modtrezorui', + 'vendor/trezor-storage/c', 'vendor/micropython', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc', 'vendor/micropython/lib/stm32lib/CMSIS/STM32F4xx/Include', diff --git a/SConscript.unix b/SConscript.unix index d1f4c7010..4770d1c39 100644 --- a/SConscript.unix +++ b/SConscript.unix @@ -9,9 +9,6 @@ SOURCE_MOD = [] LIBS_MOD = [] # modtrezorconfig -CPPPATH_MOD += [ - 'vendor/trezor-storage/c', -] SOURCE_MOD += [ 'embed/extmod/modtrezorconfig/modtrezorconfig.c', 'vendor/trezor-storage/c/norcow.c', @@ -299,6 +296,7 @@ env.Replace( '.', 'embed/unix', 'embed/extmod/modtrezorui', + 'vendor/trezor-storage/c', 'vendor/micropython', 'vendor/micropython/ports/unix', 'vendor/micropython/lib/mp-readline',