feat(core): add support for STM32U5A9J-DK board

[no changelog]

core/Makefile

@@ -55,6 +55,16 @@ BOOTLOADER_MAXSIZE  = 131072
 FIRMWARE_P1_MAXSIZE = 786432
 FIRMWARE_P2_MAXSIZE = 917504
 FIRMWARE_MAXSIZE    = 1703936
+else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),DISC2))
+OPENOCD_TARGET = target/stm32u5x.cfg
+BOARDLOADER_START   = 0x0C004000
+BOARDLOADER_END     = 0x0C010000
+BOOTLOADER_START    = 0x0C010000
+FIRMWARE_START   	= 0x0C050000
+PRODTEST_START      = 0x0C050000
+BOARDLOADER_MAXSIZE = 49152
+BOOTLOADER_MAXSIZE  = 131072
+FIRMWARE_MAXSIZE    = 3735552
 else ifeq ($(TREZOR_MODEL), 1)
 OPENOCD_TARGET = target/stm32f2x.cfg
 FIRMWARE_START   	= 0x08010000

core/SConscript.bootloader

@@ -36,7 +36,7 @@ if TREZOR_MODEL in ('R', ):
     FONT_BOLD='Font_PixelOperator_Bold_8'
     FONT_MONO='Font_PixelOperator_Regular_8'
     FONT_BIG=None
-elif TREZOR_MODEL in ('T', 'DISC1'):
+elif TREZOR_MODEL in ('T', 'DISC1', 'DISC2'):
     FONT_NORMAL='Font_TTHoves_Regular_21'
     FONT_DEMIBOLD=None
     FONT_BOLD='Font_TTHoves_Bold_17'

core/SConscript.bootloader_ci

@@ -6,7 +6,7 @@ import tools
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
 CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 
-if TREZOR_MODEL in ('1', 'DISC1'):
+if TREZOR_MODEL in ('1', 'DISC1', 'DISC2'):
     # skip bootloader_ci build
     env = Environment()
     def build_bootloader_ci(target,source,env):

core/SConscript.bootloader_emu

@@ -33,7 +33,7 @@ if TREZOR_MODEL in ('1', 'R'):
     FONT_BOLD='Font_PixelOperator_Bold_8'
     FONT_MONO='Font_PixelOperator_Regular_8'
     FONT_BIG=None
-elif TREZOR_MODEL in ('T', ):
+elif TREZOR_MODEL in ('T', 'DISC2'):
     FONT_NORMAL='Font_TTHoves_Regular_21'
     FONT_DEMIBOLD=None
     FONT_BOLD='Font_TTHoves_Bold_17'
@@ -176,6 +176,8 @@ if TREZOR_MODEL in ('T', 'R'):
     CPU_MODEL   = 'STM32F427xx'
 elif TREZOR_MODEL in ('DISC1', ):
     CPU_MODEL   = 'STM32F429xx'
+elif TREZOR_MODEL in ('DISC2', ):
+    CPU_MODEL   = 'STM32U5A9xx'
 elif TREZOR_MODEL in ('1',):
     CPU_MODEL   = 'STM32F405xx'
 else:

core/SConscript.firmware

@@ -41,7 +41,7 @@ if TREZOR_MODEL in ('1', 'R'):
     FONT_BOLD='Font_PixelOperator_Bold_8'
     FONT_MONO='Font_PixelOperatorMono_Regular_8'
     FONT_BIG='Font_Unifont_Regular_16'
-elif TREZOR_MODEL in ('T', 'DISC1'):
+elif TREZOR_MODEL in ('T', 'DISC1', 'DISC2'):
     FONT_NORMAL='Font_TTHoves_Regular_21'
     FONT_DEMIBOLD='Font_TTHoves_DemiBold_21'
     FONT_BOLD='Font_TTHoves_Bold_17'
@@ -391,7 +391,7 @@ SOURCE_FIRMWARE = [
 ]
 
 
-if TREZOR_MODEL in ('T', 'DISC1'):
+if TREZOR_MODEL in ('T', 'DISC1', 'DISC2'):
     UI_LAYOUT = 'UI_LAYOUT_TT'
     ui_layout_feature = 'model_tt'
 elif TREZOR_MODEL in ('1', 'R'):
@@ -806,7 +806,7 @@ if TREZOR_MODEL not in ('1',):
             ' --rename-section .data=.vendorheader,alloc,load,readonly,contents'
             ' $SOURCE $TARGET', ))
 
-if TREZOR_MODEL not in ('DISC1', ):
+if TREZOR_MODEL not in ('DISC1', 'DISC2'):
     tools.embed_binary(
             obj_program,
             env,

core/SConscript.prodtest

@@ -8,7 +8,7 @@ CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 PRODUCTION = ARGUMENTS.get('PRODUCTION', '0') == '1'
 BOOTLOADER_DEVEL = ARGUMENTS.get('BOOTLOADER_DEVEL', '0') == '1'
 
-if TREZOR_MODEL in ('DISC1', ):
+if TREZOR_MODEL in ('DISC1', 'DISC2'):
     # skip prodtest build
     env = Environment()
     def build_prodtest(target,source,env):

core/SConscript.reflash

@@ -6,7 +6,7 @@ import tools
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
 CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 
-if TREZOR_MODEL in ('DISC1', ):
+if TREZOR_MODEL in ('DISC1', 'DISC2'):
     # skip reflash build
     env = Environment()
     def build_reflash(target,source,env):

core/SConscript.unix

@@ -10,7 +10,7 @@ TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
 DMA2D =  TREZOR_MODEL in ('T', )
 CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 
-if TREZOR_MODEL in ('DISC1', ):
+if TREZOR_MODEL in ('DISC1', 'DISC2'):
     # skip unix build
     env = Environment()
     def build_unix(target,source,env):
@@ -42,7 +42,7 @@ if TREZOR_MODEL in ('1', 'R'):
     FONT_BOLD='Font_PixelOperator_Bold_8'
     FONT_MONO='Font_PixelOperatorMono_Regular_8'
     FONT_BIG='Font_Unifont_Regular_16'
-elif TREZOR_MODEL in ('T', ):
+elif TREZOR_MODEL in ('T', 'DISC2'):
     FONT_NORMAL='Font_TTHoves_Regular_21'
     FONT_DEMIBOLD='Font_TTHoves_DemiBold_21'
     FONT_BOLD='Font_TTHoves_Bold_17'
@@ -501,6 +501,8 @@ if TREZOR_MODEL in ('T', 'R'):
     CPU_MODEL   = 'STM32F427xx'
 elif TREZOR_MODEL in ('DISC1', ):
     CPU_MODEL   = 'STM32F429xx'
+elif TREZOR_MODEL in ('DISC2', ):
+    CPU_MODEL   = 'STM32U5A9xx'
 elif TREZOR_MODEL in ('1',):
     CPU_MODEL   = 'STM32F405xx'
 else:

core/embed/firmware/memory_DISC2.ld

@@ -0,0 +1,123 @@
+/* TREZORv2 firmware linker script */
+
+ENTRY(reset_handler)
+
+MEMORY {
+  FLASH  (rx)  : ORIGIN = 0x0C050000, LENGTH = 3648K
+  SRAM1  (wal) : ORIGIN = 0x30000000, LENGTH =  768K - (0x100 + 4)
+  BOOT_ARGS  (wal) : ORIGIN = 0x300BFEFC, LENGTH =  (0x100 + 4)
+  SRAM2  (wal) : ORIGIN = 0x300C0000, LENGTH =  64K
+  SRAM3  (wal) : ORIGIN = 0x300D0000, LENGTH =  832K
+  SRAM5  (wal) : ORIGIN = 0x301A0000, LENGTH =  832K
+  SRAM6  (wal) : ORIGIN = 0x30270000, LENGTH =  0
+  SRAM4  (wal) : ORIGIN = 0x38000000, LENGTH =  16K
+}
+
+main_stack_base = ORIGIN(SRAM2) + SIZEOF(.stack); /* 8-byte aligned full descending stack */
+_sstack = ORIGIN(SRAM2) + 0x100;
+_estack = main_stack_base;
+
+/* used by the startup code to populate variables used by the C code */
+data_lma = LOADADDR(.data);
+data_vma = ADDR(.data);
+data_size = SIZEOF(.data);
+
+/* used by the startup code to populate variables used by the C code */
+sensitive_lma = LOADADDR(.sensitive);
+sensitive_vma = ADDR(.sensitive);
+sensitive_size = SIZEOF(.sensitive);
+
+/* used by the startup code to wipe memory */
+sram1_start = ORIGIN(SRAM1);
+sram1_end = ORIGIN(SRAM1) + LENGTH(SRAM1);
+sram2_start = ORIGIN(SRAM2);
+sram2_end = ORIGIN(SRAM2) + LENGTH(SRAM2);
+sram3_start = ORIGIN(SRAM3);
+sram3_end = ORIGIN(SRAM3) + LENGTH(SRAM3);
+sram4_start = ORIGIN(SRAM4);
+sram4_end = ORIGIN(SRAM4) + LENGTH(SRAM4);
+sram5_start = ORIGIN(SRAM5);
+sram5_end = ORIGIN(SRAM5) + LENGTH(SRAM5);
+sram6_start = ORIGIN(SRAM6);
+sram6_end = ORIGIN(SRAM6) + LENGTH(SRAM6);
+
+/* reserve 256 bytes for bootloader arguments */
+boot_args_start = ORIGIN(BOOT_ARGS);
+boot_args_end = ORIGIN(BOOT_ARGS) + LENGTH(BOOT_ARGS);
+g_boot_args = (boot_args_start + 4);
+g_boot_flag = boot_args_start;
+
+_codelen = SIZEOF(.flash) + SIZEOF(.data) + SIZEOF(.sensitive);
+_flash_start = ORIGIN(FLASH);
+_flash_end = ORIGIN(FLASH) + LENGTH(FLASH);
+_heap_start = ADDR(.heap);
+_heap_end = ADDR(.heap) + SIZEOF(.heap);
+
+SECTIONS {
+  .vendorheader : ALIGN(4) {
+    KEEP(*(.vendorheader))
+  } >FLASH AT>FLASH
+
+  .header : ALIGN(4) {
+    KEEP(*(.header));
+  } >FLASH AT>FLASH
+
+  .flash : ALIGN(512) {
+    KEEP(*(.vector_table));
+    . = ALIGN(4);
+    *(.text*);
+    . = ALIGN(4);
+    *(.rodata*);
+    . = ALIGN(4);
+    KEEP(*(.bootloader));
+    *(.bootloader*);
+    . = ALIGN(512);
+  } >FLASH AT>FLASH
+
+  .data : ALIGN(4) {
+    *(.data*);
+    . = ALIGN(512);
+  } >SRAM1 AT>FLASH
+
+  /DISCARD/ : {
+    *(.ARM.exidx*);
+  }
+
+  .bss : ALIGN(4) {
+    *(.bss*);
+    . = ALIGN(4);
+  } >SRAM1
+
+  .data_ccm : ALIGN(4) {
+    *(.no_dma_buffers*);
+    . = ALIGN(4);
+  } >SRAM1
+
+  .heap : ALIGN(4) {
+    . = 37K; /* this acts as a build time assertion that at least this much memory is available for heap use */
+    . = ABSOLUTE(sram1_end); /* this explicitly sets the end of the heap */
+  } >SRAM1
+
+  .stack : ALIGN(8) {
+    . = 16K + 0x100; /* Exactly 16K allocated for stack. Overflow causes MemManage fault (when using MPU). */
+  } >SRAM2
+
+  .sensitive : ALIGN(512) {
+    *(.sensitive*);
+    . = ALIGN(512);
+  } >SRAM2 AT>FLASH
+
+  .fb1 : ALIGN(4) {
+   __fb_start = .;
+    *(.fb1*);
+    *(.gfxmmu_table*);
+    *(.framebuffer_select*);
+    . = ALIGN(4);
+  } >SRAM3
+
+  .fb2 : ALIGN(4) {
+    *(.fb2*);
+   __fb_end = .;
+    . = ALIGN(4);
+  } >SRAM5
+}

core/embed/models/model.h

@@ -11,6 +11,8 @@
 #include "model_T2B1.h"
 #elif defined TREZOR_MODEL_DISC1
 #include "model_D001.h"
+#elif defined TREZOR_MODEL_DISC2
+#include "model_D002.h"
 #else
 #error Unknown Trezor model
 #endif

core/embed/models/model_D002.h

@@ -0,0 +1,32 @@
+#ifndef MODELS_MODEL_DISC2_H_
+#define MODELS_MODEL_DISC2_H_
+
+#define MODEL_NAME "T"
+#define MODEL_FULL_NAME "Trezor Model T"
+#define MODEL_INTERNAL_NAME "D002"
+#define MODEL_INTERNAL_NAME_TOKEN D002
+#define MODEL_NAME_QSTR MP_QSTR_T
+#define MODEL_INTERNAL_NAME_QSTR MP_QSTR_D001
+
+/*** Discovery uses DEV keys in any build variant ***/
+#define MODEL_BOARDLOADER_KEYS \
+  (const uint8_t *)"\xdb\x99\x5f\xe2\x51\x69\xd1\x41\xca\xb9\xbb\xba\x92\xba\xa0\x1f\x9f\x2e\x1e\xce\x7d\xf4\xcb\x2a\xc0\x51\x90\xf3\x7f\xcc\x1f\x9d", \
+  (const uint8_t *)"\x21\x52\xf8\xd1\x9b\x79\x1d\x24\x45\x32\x42\xe1\x5f\x2e\xab\x6c\xb7\xcf\xfa\x7b\x6a\x5e\xd3\x00\x97\x96\x0e\x06\x98\x81\xdb\x12", \
+  (const uint8_t *)"\x22\xfc\x29\x77\x92\xf0\xb6\xff\xc0\xbf\xcf\xdb\x7e\xdb\x0c\x0a\xa1\x4e\x02\x5a\x36\x5e\xc0\xe3\x42\xe8\x6e\x38\x29\xcb\x74\xb6",
+
+#define MODEL_BOOTLOADER_KEYS \
+  (const uint8_t *)"\xd7\x59\x79\x3b\xbc\x13\xa2\x81\x9a\x82\x7c\x76\xad\xb6\xfb\xa8\xa4\x9a\xee\x00\x7f\x49\xf2\xd0\x99\x2d\x99\xb8\x25\xad\x2c\x48", \
+  (const uint8_t *)"\x63\x55\x69\x1c\x17\x8a\x8f\xf9\x10\x07\xa7\x47\x8a\xfb\x95\x5e\xf7\x35\x2c\x63\xe7\xb2\x57\x03\x98\x4c\xf7\x8b\x26\xe2\x1a\x56", \
+  (const uint8_t *)"\xee\x93\xa4\xf6\x6f\x8d\x16\xb8\x19\xbb\x9b\xeb\x9f\xfc\xcd\xfc\xdc\x14\x12\xe8\x7f\xee\x6a\x32\x4c\x2a\x99\xa1\xe0\xe6\x71\x48",
+
+#define BOARDLOADER_START 0x0C004000
+#define BOARD_CAPABILITIES_ADDR 0x0C00FF00
+#define BOOTLOADER_START 0x0C010000
+#define FIRMWARE_START 0x0C050000
+
+#define IMAGE_CHUNK_SIZE (256 * 1024)
+#define BOOTLOADER_IMAGE_MAXSIZE (128 * 1024 * 1)  // 128 KB
+#define FIRMWARE_IMAGE_MAXSIZE (128 * 1024 * 13)   // 1664 KB
+#define NORCOW_SECTOR_SIZE (64 * 1024)
+
+#endif

core/embed/models/model_D002_layout.c

@@ -0,0 +1,93 @@
+#include "flash.h"
+#include "model.h"
+
+const flash_area_t STORAGE_AREAS[STORAGE_AREAS_COUNT] = {
+    {
+        .num_subareas = 1,
+        .secure_area = true,
+        .subarea[0] =
+            {
+                .first_sector = 0x18,
+                .num_sectors = 8,
+            },
+    },
+    {
+        .num_subareas = 1,
+        .secure_area = true,
+        .subarea[0] =
+            {
+                .first_sector = 0x20,
+                .num_sectors = 8,
+            },
+    },
+};
+
+const flash_area_t BOARDLOADER_AREA = {
+    .num_subareas = 1,
+    .secure_area = true,
+    .subarea[0] =
+        {
+            .first_sector = 1,
+            .num_sectors = 6,
+        },
+};
+
+const flash_area_t BOOTLOADER_AREA = {
+    .num_subareas = 1,
+    .secure_area = true,
+    .subarea[0] =
+        {
+            .first_sector = 0x08,
+            .num_sectors = 16,
+        },
+};
+
+const flash_area_t FIRMWARE_AREA = {
+    .num_subareas = 1,
+    .secure_area = true,
+    .subarea[0] =
+        {
+            .first_sector = 0x28,
+            .num_sectors = 456,
+        },
+};
+
+const flash_area_t SECRET_AREA = {
+    .num_subareas = 1,
+    .secure_area = true,
+    .subarea[0] =
+        {
+            .first_sector = 0,
+            .num_sectors = 2,
+        },
+};
+
+const flash_area_t BHK_AREA = {
+    .num_subareas = 1,
+    .secure_area = true,
+    .subarea[0] =
+        {
+            .first_sector = 1,
+            .num_sectors = 1,
+        },
+};
+
+const flash_area_t WIPE_AREA = {
+    .num_subareas = 1,
+    .secure_area = true,
+    .subarea[0] =
+        {
+            .first_sector = 0x18,
+            .num_sectors = 488,
+        },
+};
+
+const flash_area_t ALL_WIPE_AREA = {
+    .num_subareas = 1,
+    .secure_area = true,
+    .subarea[0] =
+        {
+            .first_sector = 0x08,
+            .num_sectors = 504,
+        },
+};

core/embed/trezorhal/boards/stm32u5a9j-dk.h

@@ -0,0 +1,31 @@
+#ifndef STM32U5A9J_DK_H_
+#define STM32U5A9J_DK_H_
+
+#define HSE_16MHZ
+#define VDD_1V8 1
+
+#define USE_I2C 1
+#define USE_RGB_COLORS 1
+#define USE_TOUCH 1
+//#define USE_SBU 1
+//#define USE_DISP_I8080_8BIT_DW 1
+
+#include "displays/dsi.h"
+
+#define I2C_COUNT 1
+#define I2C_INSTANCE_1 I2C5
+#define I2C_INSTANCE_1_CLK_EN __HAL_RCC_I2C5_CLK_ENABLE
+#define I2C_INSTANCE_1_CLK_DIS __HAL_RCC_I2C5_CLK_DISABLE
+#define I2C_INSTANCE_1_PIN_AF GPIO_AF2_I2C5
+#define I2C_INSTANCE_1_SDA_PORT GPIOH
+#define I2C_INSTANCE_1_SDA_PIN GPIO_PIN_4
+#define I2C_INSTANCE_1_SDA_CLK_EN __HAL_RCC_GPIOH_CLK_ENABLE
+#define I2C_INSTANCE_1_SCL_PORT GPIOH
+#define I2C_INSTANCE_1_SCL_PIN GPIO_PIN_5
+#define I2C_INSTANCE_1_SCL_CLK_EN __HAL_RCC_GPIOH_CLK_ENABLE
+#define I2C_INSTANCE_1_RESET_REG &RCC->APB1RSTR2
+#define I2C_INSTANCE_1_RESET_BIT RCC_APB1RSTR2_I2C5RST
+
+#define TOUCH_I2C_NUM 0
+
+#endif  // STM32U5A9J_DK_H_

core/embed/trezorhal/stm32u5/displays/dsi.h

@@ -0,0 +1,30 @@
+#ifndef DSI_H_
+#define DSI_H_
+
+#include STM32_HAL_H
+
+#define MAX_DISPLAY_RESX 240
+#define MAX_DISPLAY_RESY 240
+#define DISPLAY_RESX 240
+#define DISPLAY_RESY 240
+#define DISPLAY_COLOR_MODE DMA2D_OUTPUT_ARGB8888
+#define DISPLAY_FRAMEBUFFER_WIDTH 768
+#define DISPLAY_FRAMEBUFFER_HEIGHT 480
+#define DISPLAY_FRAMEBUFFER_OFFSET_X 120
+#define DISPLAY_FRAMEBUFFER_OFFSET_Y 120
+#define TREZOR_FONT_BPP 4
+
+#define DISPLAY_EFFICIENT_CLEAR 1
+
+extern uint8_t* const DISPLAY_DATA_ADDRESS;
+
+uint32_t rgb565_to_rgb888(uint16_t color);
+
+static inline void display_pixel(uint8_t* fb, int16_t x, int16_t y,
+                                 uint16_t color) {
+  uint32_t p = 4 * ((y + 120) * DISPLAY_FRAMEBUFFER_WIDTH + (x + 120));
+  uint32_t c = rgb565_to_rgb888(color);
+  *((uint32_t*)(fb + p)) = c;
+}
+
+#endif

core/embed/vendorheader/D002/vendor_dev_DO_NOT_SIGN.json

@@ -0,0 +1,20 @@
+{
+    "header_len": 4608,
+    "text": "DEV ONLY, DO NOT USE!",
+    "hw_model": "D002",
+    "expiry": 0,
+    "version": [0, 0],
+    "sig_m": 2,
+    "trust": {
+        "allow_run_with_secret": false,
+        "show_vendor_string": false,
+        "require_user_click": false,
+        "red_background": false,
+        "delay": 0
+    },
+    "pubkeys": [
+        "e28a8970753332bd72fef413e6b0b2ef1b4aadda7aa2c141f233712a6876b351",
+        "d4eec1869fb1b8a4e817516ad5a931557cb56805c3eb16e8f3a803d647df7869",
+        "772c8a442b7db06e166cfbc1ccbcbcde6f3eba76a4e98ef3ffc519502237d6ef"
+    ]
+}

core/embed/vendorheader/D002/vendor_unsafe.json

@@ -0,0 +1,20 @@
+{
+    "header_len": 4608,
+    "text": "UNSAFE, DO NOT USE!",
+    "hw_model": "D002",
+    "expiry": 0,
+    "version": [0, 1],
+    "sig_m": 2,
+    "trust": {
+        "allow_run_with_secret": false,
+        "show_vendor_string": true,
+        "require_user_click": true,
+        "red_background": true,
+        "delay": 1
+    },
+    "pubkeys": [
+        "e28a8970753332bd72fef413e6b0b2ef1b4aadda7aa2c141f233712a6876b351",
+        "d4eec1869fb1b8a4e817516ad5a931557cb56805c3eb16e8f3a803d647df7869",
+        "772c8a442b7db06e166cfbc1ccbcbcde6f3eba76a4e98ef3ffc519502237d6ef"
+    ]
+}

core/embed/vendorheader/generate.sh

@@ -16,7 +16,7 @@ for arg in "$@"; do
     fi
 done
 
-MODELS=(T2T1 T2B1 D001)
+MODELS=(T2T1 T2B1 D001 D002)
 
 for MODEL in ${MODELS[@]}; do
     cd $MODEL

core/site_scons/boards/discovery2.py

@@ -0,0 +1,97 @@
+from __future__ import annotations
+
+from . import get_hw_model_as_number
+from .stm32u5_common import stm32u5_common_files
+
+
+def configure(
+    env: dict,
+    features_wanted: list[str],
+    defines: list[str | tuple[str, str]],
+    sources: list[str],
+    paths: list[str],
+) -> list[str]:
+    features_available: list[str] = []
+    board = "stm32u5a9j-dk.h"
+    display = "dsi.c"
+    hw_model = get_hw_model_as_number("D002")
+    hw_revision = 0
+
+    mcu = "STM32U5A9xx"
+    linker_script = "stm32u5a"
+
+    stm32u5_common_files(env, defines, sources, paths)
+
+    env.get("ENV")[
+        "CPU_ASFLAGS"
+    ] = "-mthumb -mcpu=cortex-m33 -mfloat-abi=hard -mfpu=fpv5-sp-d16 "
+    env.get("ENV")[
+        "CPU_CCFLAGS"
+    ] = "-mthumb -mcpu=cortex-m33 -mfloat-abi=hard -mfpu=fpv5-sp-d16 -mtune=cortex-m33 -mcmse "
+    env.get("ENV")["RUST_TARGET"] = "thumbv8m.main-none-eabihf"
+
+    defines += [mcu]
+    defines += [
+        f'TREZOR_BOARD=\\"boards/{board}\\"',
+    ]
+    defines += [
+        f"HW_MODEL={hw_model}",
+    ]
+    defines += [
+        f"HW_REVISION={hw_revision}",
+    ]
+    sources += [
+        "embed/models/model_D002_layout.c",
+    ]
+    sources += [
+        f"embed/trezorhal/stm32u5/displays/{display}",
+    ]
+
+    if "input" in features_wanted:
+        sources += [
+            "embed/trezorhal/stm32u5/i2c.c",
+        ]
+        sources += [
+            "embed/lib/touch.c",
+        ]
+        sources += [
+            "embed/trezorhal/stm32u5/touch/sitronix.c",
+        ]
+        features_available.append("touch")
+
+    # if "sd_card" in features_wanted:
+    #     sources += ['embed/trezorhal/sdcard.c', ]
+    #     sources += ['embed/extmod/modtrezorio/ff.c', ]
+    #     sources += ['embed/extmod/modtrezorio/ffunicode.c', ]
+    #     features_available.append("sd_card")
+
+    if "sbu" in features_wanted:
+        sources += [
+            "embed/trezorhal/stm32u5/sbu.c",
+        ]
+        features_available.append("sbu")
+
+    if "usb" in features_wanted:
+        sources += [
+            "embed/trezorhal/stm32u5/usb.c",
+            "embed/trezorhal/stm32u5/usbd_conf.c",
+            "embed/trezorhal/stm32u5/usbd_core.c",
+            "embed/trezorhal/stm32u5/usbd_ctlreq.c",
+            "embed/trezorhal/stm32u5/usbd_ioreq.c",
+            "vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_usb.c",
+        ]
+        features_available.append("usb")
+
+    defines += ["USE_DMA2D", "FRAMEBUFFER", "FRAMEBUFFER32BIT"]
+    sources += [
+        "embed/trezorhal/stm32u5/dma2d.c",
+    ]
+    features_available.append("dma2d")
+    features_available.append("framebuffer")
+    features_available.append("framebuffer32bit")
+
+    env.get("ENV")["TREZOR_BOARD"] = board
+    env.get("ENV")["MCU_TYPE"] = mcu
+    env.get("ENV")["LINKER_SCRIPT"] = linker_script
+
+    return features_available

core/site_scons/tools.py

@@ -6,6 +6,7 @@ from pathlib import Path
 
 from boards import (
     discovery,
+    discovery2,
     trezor_1,
     trezor_r_v3,
     trezor_r_v4,
@@ -59,6 +60,8 @@ def configure_board(
         raise Exception("Unknown model_r_version")
     elif model in ("DISC1",):
         return discovery.configure(env, features_wanted, defines, sources, paths)
+    elif model in ("DISC2",):
+        return discovery2.configure(env, features_wanted, defines, sources, paths)
     raise Exception("Unknown model")
 
 
@@ -71,6 +74,8 @@ def get_model_identifier(model: str) -> str:
         return "T2B1"
     elif model == "DISC1":
         return "D001"
+    elif model == "DISC2":
+        return "D002"
     else:
         raise Exception("Unknown model")
 

python/src/trezorlib/firmware/models.py

@@ -32,12 +32,14 @@ class Model(Enum):
     T2T1 = b"T2T1"
     T2B1 = b"T2B1"
     D001 = b"D001"
+    D002 = b"D002"
 
     # legacy aliases
     ONE = b"T1B1"
     T = b"T2T1"
     R = b"T2B1"
     DISC1 = b"D001"
+    DISC2 = b"D002"
 
     @classmethod
     def from_hw_model(cls, hw_model: t.Union["Self", bytes]) -> "Model":
@@ -232,11 +234,18 @@ T2T1_HASH_PARAMS = FirmwareHashParameters(
     padding_byte=None,
 )
 
+D002_HASH_PARAMS = FirmwareHashParameters(
+    hash_function=hashlib.blake2s,
+    chunk_size=1024 * 256,
+    padding_byte=None,
+)
+
 MODEL_MAP = {
     Model.T1B1: LEGACY_V3,
     Model.T2T1: T2T1,
     Model.T2B1: T2B1,
     Model.D001: TREZOR_CORE_DEV,
+    Model.D002: TREZOR_CORE_DEV,
 }
 
 MODEL_MAP_DEV = {
@@ -244,6 +253,7 @@ MODEL_MAP_DEV = {
     Model.T2T1: TREZOR_CORE_DEV,
     Model.T2B1: TREZOR_CORE_DEV,
     Model.D001: TREZOR_CORE_DEV,
+    Model.D002: TREZOR_CORE_DEV,
 }
 
 MODEL_HASH_PARAMS_MAP = {
@@ -251,6 +261,7 @@ MODEL_HASH_PARAMS_MAP = {
     Model.T2T1: T2T1_HASH_PARAMS,
     Model.T2B1: T2T1_HASH_PARAMS,
     Model.D001: T2T1_HASH_PARAMS,
+    Model.D002: D002_HASH_PARAMS,
 }
 
 # aliases
@@ -269,3 +280,5 @@ DISC1 = TREZOR_CORE_DEV
 DISC1_DEV = TREZOR_CORE_DEV
 D001 = TREZOR_CORE_DEV
 D001_DEV = TREZOR_CORE_DEV
+D002 = TREZOR_CORE_DEV
+D002_DEV = TREZOR_CORE_DEV

python/src/trezorlib/models.py

@@ -72,6 +72,15 @@ DISC1 = TrezorModel(
     default_mapping=mapping.DEFAULT_MAPPING,
 )
 
+DISC2 = TrezorModel(
+    name="DISC2",
+    internal_name="D002",
+    minimum_version=(2, 1, 0),
+    vendors=VENDORS,
+    usb_ids=((0x1209, 0x53C1), (0x1209, 0x53C0)),
+    default_mapping=mapping.DEFAULT_MAPPING,
+)
+
 # ==== model based names ====
 
 TREZOR_ONE = T1B1
@@ -79,8 +88,9 @@ TREZOR_T = T2T1
 TREZOR_R = T2B1
 TREZOR_SAFE3 = T2B1
 TREZOR_DISC1 = DISC1
+TREZOR_DISC2 = DISC2
 
-TREZORS = {T1B1, T2T1, T2B1, DISC1}
+TREZORS = {T1B1, T2T1, T2B1, DISC1, DISC2}
 
 
 def by_name(name: Optional[str]) -> Optional[TrezorModel]: