streamline layout definitions

core/Makefile

@@ -73,33 +73,39 @@ $(error Unknown TREZOR_MODEL: $(TREZOR_MODEL))
 endif
 
 
-FLASH_START              = $(shell layout_parser ${TREZOR_MODEL} FLASH_START)
+FLASH_START		         = $(shell layout_parser ${TREZOR_MODEL} FLASH_START)
 BOARDLOADER_START        = $(shell layout_parser ${TREZOR_MODEL} BOARDLOADER_START)
 BOOTLOADER_START         = $(shell layout_parser ${TREZOR_MODEL} BOOTLOADER_START)
 KERNEL_START             = $(shell layout_parser ${TREZOR_MODEL} KERNEL_START)
 FIRMWARE_START           = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_START)
 FIRMWARE_P2_START        = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_P2_START)
-STORAGE_1_OFFSET         = $(shell layout_parser ${TREZOR_MODEL} STORAGE_1_OFFSET)
-STORAGE_2_OFFSET         = $(shell layout_parser ${TREZOR_MODEL} STORAGE_2_OFFSET)
+STORAGE_1_START          = $(shell layout_parser ${TREZOR_MODEL} STORAGE_1_START)
+STORAGE_2_START	         = $(shell layout_parser ${TREZOR_MODEL} STORAGE_2_START)
 STORAGE_SIZE             = $(shell layout_parser ${TREZOR_MODEL} NORCOW_SECTOR_SIZE)
-BOARDLOADER_MAXSIZE      = $(shell layout_parser ${TREZOR_MODEL} BOARDLOADER_IMAGE_MAXSIZE)
-BOOTLOADER_MAXSIZE       = $(shell layout_parser ${TREZOR_MODEL} BOOTLOADER_IMAGE_MAXSIZE)
-FIRMWARE_MAXSIZE         = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_IMAGE_MAXSIZE)
-FIRMWARE_P1_MAXSIZE      = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_P1_IMAGE_MAXSIZE)
-FIRMWARE_P2_MAXSIZE      = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_P2_IMAGE_MAXSIZE)
+BOARDLOADER_MAXSIZE      = $(shell layout_parser ${TREZOR_MODEL} BOARDLOADER_MAXSIZE)
+BOOTLOADER_MAXSIZE       = $(shell layout_parser ${TREZOR_MODEL} BOOTLOADER_MAXSIZE)
+FIRMWARE_MAXSIZE         = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_MAXSIZE)
+FIRMWARE_P1_MAXSIZE      = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_P1_MAXSIZE)
+FIRMWARE_P2_MAXSIZE      = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_P2_MAXSIZE)
 BOARDLOADER_SECTOR_START = $(shell layout_parser ${TREZOR_MODEL} BOARDLOADER_SECTOR_START)
 BOARDLOADER_SECTOR_END   = $(shell layout_parser ${TREZOR_MODEL} BOARDLOADER_SECTOR_END)
 BOOTLOADER_SECTOR_START  = $(shell layout_parser ${TREZOR_MODEL} BOOTLOADER_SECTOR_START)
 BOOTLOADER_SECTOR_END    = $(shell layout_parser ${TREZOR_MODEL} BOOTLOADER_SECTOR_END)
 FIRMWARE_SECTOR_START    = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_SECTOR_START)
 FIRMWARE_SECTOR_END      = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_SECTOR_END)
+FIRMWARE_P1_SECTOR_START = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_P1_SECTOR_START)
+FIRMWARE_P1_SECTOR_END   = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_P1_SECTOR_END)
 FIRMWARE_P2_SECTOR_START = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_P2_SECTOR_START)
 FIRMWARE_P2_SECTOR_END   = $(shell layout_parser ${TREZOR_MODEL} FIRMWARE_P2_SECTOR_END)
 STORAGE_1_SECTOR_START   = $(shell layout_parser ${TREZOR_MODEL} STORAGE_1_SECTOR_START)
 STORAGE_1_SECTOR_END     = $(shell layout_parser ${TREZOR_MODEL} STORAGE_1_SECTOR_END)
 STORAGE_2_SECTOR_START   = $(shell layout_parser ${TREZOR_MODEL} STORAGE_2_SECTOR_START)
 STORAGE_2_SECTOR_END     = $(shell layout_parser ${TREZOR_MODEL} STORAGE_2_SECTOR_END)
 
+
+STORAGE_1_OFFSET := $(shell expr $(STORAGE_1_START) - $(FLASH_START))
+STORAGE_2_OFFSET := $(shell expr $(STORAGE_2_START) - $(FLASH_START))
+
 OPENOCD = openocd -f interface/$(OPENOCD_INTERFACE).cfg -c "transport select $(OPENOCD_TRANSPORT)" -f $(OPENOCD_TARGET)
 
 CFLAGS += -DSCM_REVISION='\"$(shell git rev-parse HEAD | sed 's:\(..\):\\x\1:g')\"'
@@ -374,7 +380,7 @@ flash_erase_bootloader: ## erase bootloader
 
 flash_erase_firmware: ## erase bootloader
 ifeq ($(MCU),$(filter $(MCU),STM32F4))
-	$(OPENOCD) -c "init; reset halt; flash info 0; flash erase_sector 0 $(FIRMWARE_SECTOR_START) $(FIRMWARE_SECTOR_END);  flash erase_sector 0 $(FIRMWARE_P2_SECTOR_START) $(FIRMWARE_P2_SECTOR_END); exit"
+	$(OPENOCD) -c "init; reset halt; flash info 0; flash erase_sector 0 $(FIRMWARE_P1_SECTOR_START) $(FIRMWARE_P1_SECTOR_END);  flash erase_sector 0 $(FIRMWARE_P2_SECTOR_START) $(FIRMWARE_P2_SECTOR_END); exit"
 
 else
 	$(OPENOCD) -c "init; reset halt; flash info 0; flash erase_sector 0 $(FIRMWARE_SECTOR_START) $(FIRMWARE_SECTOR_END); exit"

core/SConscript.boardloader

@@ -9,18 +9,6 @@ HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
 NEW_RENDERING = ARGUMENTS.get('NEW_RENDERING', '1') == '1'
 MODEL_IDENTIFIER = models.get_model_identifier(TREZOR_MODEL)
 
-if TREZOR_MODEL in ('1', ):
-    # skip boardloader build
-    env = Environment()
-    def build_boardloader(target,source,env):
-        print(f'Boardloader: nothing to build for Model {TREZOR_MODEL}')
-    program_bin = env.Command(
-                 target='boardloader.bin',
-                 source=None,
-                 action=build_boardloader
-             )
-    Return()
-
 FEATURES_WANTED = ["sd_card"]
 
 if NEW_RENDERING:

core/SConscript.bootloader

@@ -11,18 +11,6 @@ HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
 NEW_RENDERING = ARGUMENTS.get('NEW_RENDERING', '1') == '1' or TREZOR_MODEL in ('T3T1',)
 MODEL_IDENTIFIER = models.get_model_identifier(TREZOR_MODEL)
 
-if TREZOR_MODEL in ('1', ):
-    # skip bootloader build
-    env = Environment()
-    def build_bootloader(target,source,env):
-        print(f'Bootloader: nothing to build for Model {TREZOR_MODEL}')
-    program_bin = env.Command(
-                 target='bootloader.bin',
-                 source=None,
-                 action=build_bootloader
-             )
-    Return()
-
 FEATURES_WANTED = ["input", "rgb_led", "consumption_mask", "usb", "optiga", "dma2d"]
 
 if NEW_RENDERING:
@@ -258,9 +246,7 @@ def cargo_build():
         profile = '--release'
     else:
         profile = ''
-    if TREZOR_MODEL in ("1",):
-        features = ["model_t1"]
-    elif TREZOR_MODEL in ("R", "T3B1"):
+    if TREZOR_MODEL in ("R", "T3B1"):
         features = ["model_tr"]
     elif TREZOR_MODEL in ("T3T1",):
         features = ["model_mercury"]

core/SConscript.bootloader_ci

@@ -9,18 +9,6 @@ HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
 NEW_RENDERING = ARGUMENTS.get('NEW_RENDERING', '1') == '1' or TREZOR_MODEL in ('T3T1',)
 MODEL_IDENTIFIER = models.get_model_identifier(TREZOR_MODEL)
 
-if TREZOR_MODEL in ('1', 'DISC1', 'DISC2'):
-    # skip bootloader_ci build
-    env = Environment()
-    def build_bootloader_ci(target,source,env):
-        print(f'Bootloader_ci: nothing to build for Model {TREZOR_MODEL}')
-    program_bin = env.Command(
-                 target='bootloader.bin',
-                 source=None,
-                 action=build_bootloader_ci
-             )
-    Return()
-
 FEATURES_WANTED = ["input", "rgb_led", "consumption_mask", "usb", "optiga"]
 
 if NEW_RENDERING:
@@ -35,7 +23,7 @@ CPPDEFINES_HAL = []
 SOURCE_HAL = []
 PATH_HAL = []
 
-if TREZOR_MODEL in ('1', 'R', 'T3B1'):
+if TREZOR_MODEL in ('R', 'T3B1'):
     FONT_NORMAL='Font_PixelOperator_Regular_8'
     FONT_DEMIBOLD=None
     FONT_BOLD=None
@@ -44,7 +32,7 @@ if TREZOR_MODEL in ('1', 'R', 'T3B1'):
     FONT_NORMAL_UPPER='Font_PixelOperator_Regular_8_upper'
     FONT_BOLD_UPPER=None
     FONT_SUB=None
-elif TREZOR_MODEL in ('T',):
+elif TREZOR_MODEL in ('T', 'DISC1', 'DISC2'):
     FONT_NORMAL='Font_Roboto_Regular_20'
     FONT_DEMIBOLD=None
     FONT_BOLD=None

core/SConscript.bootloader_emu

@@ -8,7 +8,7 @@ CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 HW_REVISION = 'emulator'
 NEW_RENDERING = ARGUMENTS.get('NEW_RENDERING', '1') == '1' or TREZOR_MODEL in ('T3T1',)
 
-if TREZOR_MODEL in ('1', 'DISC1', 'DISC2'):
+if not models.has_emulator(TREZOR_MODEL):
     # skip bootloader build
     env = Environment()
     def build_bootloader(target,source,env):
@@ -33,7 +33,7 @@ CPPDEFINES_MOD = []
 SOURCE_MOD = []
 SOURCE_MOD_CRYPTO = []
 
-if TREZOR_MODEL in ('1', 'R', 'T3B1'):
+if TREZOR_MODEL in ('R', 'T3B1'):
     FONT_NORMAL='Font_PixelOperator_Regular_8'
     FONT_DEMIBOLD='Font_PixelOperator_Regular_8'
     FONT_BOLD='Font_PixelOperator_Bold_8'
@@ -276,9 +276,7 @@ else:
 RUST_LIBPATH = f'{RUST_LIBDIR}/lib{RUST_LIB}.a'
 
 def cargo_build():
-    if TREZOR_MODEL in ("1",):
-        features = ["model_t1"]
-    elif TREZOR_MODEL in ("R", "T3B1"):
+    if TREZOR_MODEL in ("R", "T3B1"):
         features = ["model_tr"]
     elif TREZOR_MODEL in ("T3T1",):
         features = ["model_mercury"]

core/SConscript.firmware

@@ -41,7 +41,7 @@ PATH_HAL = []
 
 FROZEN = True
 
-if TREZOR_MODEL in ('1', 'R', 'T3B1'):
+if TREZOR_MODEL in ('R', 'T3B1'):
     FONT_NORMAL='Font_PixelOperator_Regular_8'
     FONT_DEMIBOLD='Font_Unifont_Bold_16'
     FONT_BOLD='Font_PixelOperator_Bold_8'
@@ -254,11 +254,7 @@ else:
 CPPDEFINES_MOD += [
     'TREZOR_UI2',
     'TRANSLATIONS',
-]
-
-if TREZOR_MODEL not in ('1', ):
-    CPPDEFINES_MOD += [
-        'FANCY_FATAL_ERROR',
+    'FANCY_FATAL_ERROR',
     ]
 
 # modtrezorutils
@@ -442,7 +438,7 @@ SOURCE_FIRMWARE = [
 if TREZOR_MODEL in ('T', 'DISC1', 'DISC2'):
     UI_LAYOUT = 'UI_LAYOUT_TT'
     ui_layout_feature = 'model_tt'
-elif TREZOR_MODEL in ('1', 'R', 'T3B1'):
+elif TREZOR_MODEL in ('R', 'T3B1'):
     UI_LAYOUT = 'UI_LAYOUT_TR'
     ui_layout_feature = 'model_tr'
 elif TREZOR_MODEL in ('T3T1',):
@@ -869,15 +865,13 @@ else:
 
 VENDORHEADER = f'embed/models/{MODEL_IDENTIFIER}/vendorheader/vendorheader_{vendor}.bin'
 
-
-obj_program.extend(
-    env.Command(
-        target='embed/firmware/vendorheader.o',
-        source=VENDORHEADER,
-        action='$OBJCOPY -I binary -O elf32-littlearm -B arm'
-        ' --rename-section .data=.vendorheader,alloc,load,readonly,contents'
-        ' $SOURCE $TARGET', ))
-
+tools.embed_raw_binary(
+        obj_program,
+        env,
+        'vendorheader',
+        'embed/firmware/vendorheader.o',
+        VENDORHEADER,
+        )
 
 tools.embed_raw_binary(
         obj_program,

core/SConscript.kernel

@@ -386,15 +386,14 @@ obj_program.extend(
         ' --rename-section .data=.vendorheader,alloc,load,readonly,contents'
         ' $SOURCE $TARGET', ))
 
-if TREZOR_MODEL not in ('DISC1', 'DISC2'):
-    tools.embed_compressed_binary(
-            obj_program,
-            env,
-            'bootloader',
-            'embed/bootloaders/bootloader.o',
-            f'embed/models/{MODEL_IDENTIFIER}/bootloaders/bootloader_{BOOTLOADER_SUFFIX}.bin',
-            'kernel'
-            )
+tools.embed_compressed_binary(
+        obj_program,
+        env,
+        'bootloader',
+        'embed/bootloaders/bootloader.o',
+        f'embed/models/{MODEL_IDENTIFIER}/bootloaders/bootloader_{BOOTLOADER_SUFFIX}.bin',
+        'kernel'
+        )
 
 linkerscript_gen = env.Command(
     target='memory.ld',

core/SConscript.prodtest

@@ -10,17 +10,6 @@ BOOTLOADER_DEVEL = ARGUMENTS.get('BOOTLOADER_DEVEL', '0') == '1'
 HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
 NEW_RENDERING = ARGUMENTS.get('NEW_RENDERING', '1') == '1'
 
-if TREZOR_MODEL in ('DISC1', 'DISC2'):
-    # skip prodtest build
-    env = Environment()
-    def build_prodtest(target,source,env):
-        print(f'Prodtest: nothing to build for Model {TREZOR_MODEL}')
-    program_bin = env.Command(
-                 target='prodtest.bin',
-                 source=None,
-                 action=build_prodtest)
-    Return()
-
 FEATURES_WANTED = ["input", "sbu", "sd_card", "rdb_led", "usb", "consumption_mask", "optiga", "haptic"]
 
 if NEW_RENDERING:
@@ -39,7 +28,7 @@ CPPDEFINES_HAL = []
 SOURCE_HAL = []
 PATH_HAL = []
 
-if TREZOR_MODEL in ('1', 'R', 'T3B1'):
+if TREZOR_MODEL in ('R', 'T3B1'):
     FONT_NORMAL=None
     FONT_DEMIBOLD=None
     FONT_BOLD='Font_PixelOperator_Bold_8'
@@ -48,7 +37,7 @@ if TREZOR_MODEL in ('1', 'R', 'T3B1'):
     FONT_NORMAL_UPPER=None
     FONT_BOLD_UPPER=None
     FONT_SUB=None
-elif TREZOR_MODEL in ('T',):
+elif TREZOR_MODEL in ('T', 'DISC1', 'DISC2'):
     FONT_NORMAL=None
     FONT_DEMIBOLD=None
     FONT_BOLD='Font_Roboto_Bold_20'
@@ -257,14 +246,13 @@ else:
     VENDORHEADER = f'embed/models/{MODEL_IDENTIFIER}/vendorheader/vendorheader_unsafe_signed_prod.bin'
 
 
-
-obj_program.extend(
-    env.Command(
-        target='embed/prodtest/vendorheader.o',
-        source=VENDORHEADER,
-        action='$OBJCOPY -I binary -O elf32-littlearm -B arm'
-        ' --rename-section .data=.vendorheader,alloc,load,readonly,contents'
-        ' $SOURCE $TARGET', ))
+tools.embed_raw_binary(
+        obj_program,
+        env,
+        'vendorheader',
+        'embed/firmware/vendorheader.o',
+        VENDORHEADER,
+        )
 
 linkerscript_gen = env.Command(
     target='memory.ld',

core/SConscript.reflash

@@ -33,7 +33,7 @@ CPPDEFINES_HAL = []
 SOURCE_HAL = []
 PATH_HAL = []
 
-if TREZOR_MODEL in ('1', 'R', 'T3B1'):
+if TREZOR_MODEL in ('R', 'T3B1'):
     FONT_NORMAL=None
     FONT_DEMIBOLD=None
     FONT_BOLD='Font_PixelOperator_Bold_8'
@@ -206,13 +206,13 @@ MODEL_IDENTIFIER = models.get_model_identifier(TREZOR_MODEL)
 
 VENDORHEADER = f'embed/models/{MODEL_IDENTIFIER}/vendorheader/vendorheader_' + ('unsafe_signed_dev.bin' if ARGUMENTS.get('PRODUCTION', '0') == '0' else 'satoshilabs_signed_prod.bin')
 
-obj_program.extend(
-    env.Command(
-        target='embed/reflash/vendorheader.o',
-        source=VENDORHEADER,
-        action='$OBJCOPY -I binary -O elf32-littlearm -B arm'
-        ' --rename-section .data=.vendorheader,alloc,load,readonly,contents'
-        ' $SOURCE $TARGET', ))
+tools.embed_raw_binary(
+        obj_program,
+        env,
+        'vendorheader',
+        'embed/firmware/vendorheader.o',
+        VENDORHEADER,
+        )
 
 linkerscript_gen = env.Command(
     target='memory.ld',

core/SConscript.unix

@@ -17,7 +17,7 @@ FEATURES_WANTED = ["input", "sd_card", "dma2d", "optiga", "sbu"]
 if NEW_RENDERING:
     FEATURES_WANTED.append("new_rendering")
 
-if TREZOR_MODEL in ('DISC1', 'DISC2'):
+if not models.has_emulator(TREZOR_MODEL):
     # skip unix build
     env = Environment()
     def build_unix(target,source,env):
@@ -47,7 +47,7 @@ PYOPT = ARGUMENTS.get('PYOPT', '1')
 FROZEN = ARGUMENTS.get('TREZOR_EMULATOR_FROZEN', 0)
 RASPI = os.getenv('TREZOR_EMULATOR_RASPI') == '1'
 
-if TREZOR_MODEL in ('1', 'R', 'T3B1'):
+if TREZOR_MODEL in ('R', 'T3B1'):
     FONT_NORMAL='Font_PixelOperator_Regular_8'
     FONT_DEMIBOLD='Font_Unifont_Bold_16'
     FONT_BOLD='Font_PixelOperator_Bold_8'
@@ -264,10 +264,7 @@ else:
 CPPDEFINES_MOD += [
     'TREZOR_UI2',
     'TRANSLATIONS',
-]
-if TREZOR_MODEL not in ('1', ):
-    CPPDEFINES_MOD += [
-        'FANCY_FATAL_ERROR',
+    'FANCY_FATAL_ERROR',
     ]
 
 if FROZEN:
@@ -485,7 +482,7 @@ FEATURES_AVAILABLE = models.configure_board(TREZOR_MODEL, HW_REVISION, FEATURES_
 if TREZOR_MODEL in ('T',):
     UI_LAYOUT = 'UI_LAYOUT_TT'
     ui_layout_feature = 'model_tt'
-elif TREZOR_MODEL in ('1', 'R', 'T3B1'):
+elif TREZOR_MODEL in ('R', 'T3B1'):
     UI_LAYOUT = 'UI_LAYOUT_TR'
     ui_layout_feature = 'model_tr'
 elif TREZOR_MODEL in ('T3T1',):