fixup! refactor(core): move files out of extmod

core/SConscript.boardloader

@@ -53,10 +53,10 @@ CPPPATH_MOD += [
         'vendor/micropython/lib/uzlib',
 ]
 SOURCE_MOD += [
-    'embed/src/display.c',
-    'embed/src/colors.c',
-    'embed/src/fonts/fonts.c',
-    'embed/src/fonts/font_bitmap.c',
+    'embed/lib/display.c',
+    'embed/lib/colors.c',
+    'embed/lib/fonts/fonts.c',
+    'embed/lib/fonts/font_bitmap.c',
 ]
 
 SOURCE_STMHAL = [
@@ -141,7 +141,7 @@ env.Replace(
     LINKFLAGS='-T embed/boardloader/memory.ld -Wl,--gc-sections -Wl,-Map=build/boardloader/boardloader.map -Wl,--warn-common  -Wl,--print-memory-usage',
     CPPPATH=[
         'embed/boardloader',
-        'embed/src',
+        'embed/lib',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython/stmhal',

core/SConscript.bootloader

@@ -75,11 +75,11 @@ CPPPATH_MOD += [
 ]
 
 SOURCE_MOD += [
-    'embed/src/buffers.c',
-    'embed/src/colors.c',
-    'embed/src/display.c',
-    'embed/src/fonts/fonts.c',
-    'embed/src/fonts/font_bitmap.c',
+    'embed/lib/buffers.c',
+    'embed/lib/colors.c',
+    'embed/lib/display.c',
+    'embed/lib/fonts/fonts.c',
+    'embed/lib/fonts/font_bitmap.c',
     'embed/extmod/modtrezorcrypto/rand.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
@@ -204,7 +204,7 @@ env.Replace(
         'embed/bootloader',
         'embed/bootloader/nanopb',
         'embed/bootloader/protob',
-        'embed/src',
+        'embed/lib',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',

core/SConscript.bootloader_ci

@@ -67,10 +67,10 @@ CPPPATH_MOD += [
         'vendor/micropython/lib/uzlib',
 ]
 SOURCE_MOD += [
-    'embed/src/display.c',
-    'embed/src/colors.c',
-    'embed/src/fonts/fonts.c',
-    'embed/src/fonts/font_bitmap.c',
+    'embed/lib/display.c',
+    'embed/lib/colors.c',
+    'embed/lib/fonts/fonts.c',
+    'embed/lib/fonts/font_bitmap.c',
     'embed/extmod/modtrezorcrypto/rand.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
@@ -181,7 +181,7 @@ env.Replace(
         'embed/bootloader_ci',
         'embed/bootloader_ci/nanopb',
         'embed/bootloader_ci/protob',
-        'embed/src',
+        'embed/lib',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',

core/SConscript.firmware

@@ -172,11 +172,11 @@ CPPPATH_MOD += [
         'vendor/micropython/lib/uzlib',
 ]
 SOURCE_MOD += [
-    'embed/src/buffers.c',
-    'embed/src/colors.c',
-    'embed/src/display.c',
-    'embed/src/fonts/fonts.c',
-    'embed/src/fonts/font_bitmap.c',
+    'embed/lib/buffers.c',
+    'embed/lib/colors.c',
+    'embed/lib/display.c',
+    'embed/lib/fonts/fonts.c',
+    'embed/lib/fonts/font_bitmap.c',
     'embed/extmod/modtrezorui/modtrezorui.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
@@ -474,7 +474,7 @@ env.Replace(
         '.',
         'embed/rust',
         'embed/firmware',
-        'embed/src',
+        'embed/lib',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython',

core/SConscript.prodtest

@@ -44,11 +44,11 @@ CPPPATH_MOD += [
 ]
 
 SOURCE_MOD += [
-    'embed/src/display.c',
-    'embed/src/colors.c',
-    'embed/src/fonts/fonts.c',
-    'embed/src/fonts/font_bitmap.c',
-    'embed/src/qr-code-generator/qrcodegen.c',
+    'embed/lib/display.c',
+    'embed/lib/colors.c',
+    'embed/lib/fonts/fonts.c',
+    'embed/lib/fonts/font_bitmap.c',
+    'embed/lib/qr-code-generator/qrcodegen.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
     'vendor/micropython/lib/uzlib/tinflate.c',
@@ -150,7 +150,7 @@ env.Replace(
     LINKFLAGS='-T embed/prodtest/memory.ld -Wl,--gc-sections -Wl,-Map=build/prodtest/prodtest.map -Wl,--warn-common',
     CPPPATH=[
         'embed/prodtest',
-        'embed/src',
+        'embed/lib',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',

core/SConscript.reflash

@@ -37,10 +37,10 @@ CPPPATH_MOD += [
         'vendor/micropython/lib/uzlib',
 ]
 SOURCE_MOD += [
-    'embed/src/display.c',
-    'embed/src/colors.c',
-    'embed/src/fonts/fonts.c',
-    'embed/src/fonts/font_bitmap.c',
+    'embed/lib/display.c',
+    'embed/lib/colors.c',
+    'embed/lib/fonts/fonts.c',
+    'embed/lib/fonts/font_bitmap.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
     'vendor/micropython/lib/uzlib/tinflate.c',
@@ -141,7 +141,7 @@ env.Replace(
     LINKFLAGS='-T embed/reflash/memory.ld -Wl,--gc-sections -Wl,-Map=build/reflash/reflash.map -Wl,--warn-common',
     CPPPATH=[
         'embed/reflash',
-        'embed/src',
+        'embed/lib',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',

core/SConscript.unix

@@ -170,11 +170,11 @@ CPPPATH_MOD += [
         'vendor/micropython/lib/uzlib',
 ]
 SOURCE_MOD += [
-    'embed/src/buffers.c',
-    'embed/src/colors.c',
-    'embed/src/display.c',
-    'embed/src/fonts/fonts.c',
-    'embed/src/fonts/font_bitmap.c',
+    'embed/lib/buffers.c',
+    'embed/lib/colors.c',
+    'embed/lib/display.c',
+    'embed/lib/fonts/fonts.c',
+    'embed/lib/fonts/font_bitmap.c',
     'embed/extmod/modtrezorui/modtrezorui.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
@@ -442,7 +442,7 @@ env.Replace(
     CPPPATH=[
         '.',
         'embed/rust',
-        'embed/src',
+        'embed/lib',
         'embed/unix',
         'embed/extmod/modtrezorui',
         'vendor/micropython',

core/embed/rust/build.rs

@@ -75,7 +75,7 @@ fn prepare_bindings() -> bindgen::Builder {
         "-I../../../storage",
         "-I../../vendor/micropython",
         "-I../../vendor/micropython/lib/uzlib",
-        "-I../src",
+        "-I../lib",
         format!("-DTREZOR_MODEL_{}", model()).as_str(),
         format!("-DTREZOR_BOARD=\"{}\"", board()).as_str(),
     ]);

core/site_scons/tools.py

@@ -11,7 +11,7 @@ def add_font(font_name, font, defines, sources):
             'TREZOR_FONT_' + font_name + '_ENABLE=' + font,
             'TREZOR_FONT_' + font_name + '_INCLUDE=\\"' + font.lower() + '.h\\"',
         ]
-        sourcefile = 'embed/src/fonts/' + font.lower() + '.c'
+        sourcefile = 'embed/lib/fonts/' + font.lower() + '.c'
         if sourcefile not in sources:
             sources.append(sourcefile)