Include trezor-storage before micropython.

6 years ago · bddb72d76a
parent 1c0946f562
commit bddb72d76a
2 changed files with 2 additions and 6 deletions
--- 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',
--- 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',