From 26bde154291ab5e2e3f6d681b39075a9e233eb98 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Tue, 14 Jan 2025 22:34:44 +0100 Subject: [PATCH] refactor(core): extract model specific definitions from Makefile [no changelog] --- core/Makefile | 31 ++----------------------------- core/embed/models/D001/config.mk | 3 +++ core/embed/models/D002/config.mk | 3 +++ core/embed/models/T2B1/config.mk | 3 +++ core/embed/models/T2T1/config.mk | 3 +++ core/embed/models/T3B1/config.mk | 3 +++ core/embed/models/T3T1/config.mk | 3 +++ core/embed/models/T3W1/config.mk | 3 +++ 8 files changed, 23 insertions(+), 29 deletions(-) create mode 100644 core/embed/models/D001/config.mk create mode 100644 core/embed/models/D002/config.mk create mode 100644 core/embed/models/T2B1/config.mk create mode 100644 core/embed/models/T2T1/config.mk create mode 100644 core/embed/models/T3B1/config.mk create mode 100644 core/embed/models/T3T1/config.mk create mode 100644 core/embed/models/T3W1/config.mk diff --git a/core/Makefile b/core/Makefile index 2246c15db4..07b826e7e1 100644 --- a/core/Makefile +++ b/core/Makefile @@ -50,35 +50,8 @@ OPENOCD_INTERFACE ?= stlink # OpenOCD transport default. Alternative: jtag OPENOCD_TRANSPORT ?= hla_swd -ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),T2T1)) -MCU = STM32F4 -OPENOCD_TARGET = target/stm32f4x.cfg -LAYOUT_FEATURE = layout_bolt -else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),T2B1)) -MCU = STM32F4 -OPENOCD_TARGET = target/stm32f4x.cfg -LAYOUT_FEATURE = layout_caesar -else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),T3T1)) -MCU = STM32U5 -OPENOCD_TARGET = target/stm32u5x.cfg -LAYOUT_FEATURE = layout_delizia -else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),T3B1)) -MCU = STM32U5 -OPENOCD_TARGET = target/stm32u5x.cfg -LAYOUT_FEATURE = layout_caesar -else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),T3W1)) -MCU = STM32U5 -OPENOCD_TARGET = target/stm32u5x.cfg -LAYOUT_FEATURE = layout_bolt -else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),D001)) -MCU = STM32F4 -OPENOCD_TARGET = target/stm32f4x.cfg -else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),D002)) -MCU = STM32U5 -OPENOCD_TARGET = target/stm32u5x.cfg -else -$(error Unknown TREZOR_MODEL: $(TREZOR_MODEL)) -endif +# Include the device-specific definitions. +include embed/models/$(TREZOR_MODEL)/config.mk FLASH_START = $(shell layout_parser ${TREZOR_MODEL} FLASH_START) diff --git a/core/embed/models/D001/config.mk b/core/embed/models/D001/config.mk new file mode 100644 index 0000000000..a93e37f112 --- /dev/null +++ b/core/embed/models/D001/config.mk @@ -0,0 +1,3 @@ +MCU = STM32F4 +OPENOCD_TARGET = target/stm32f4x.cfg +LAYOUT_FEATURE = layout_bolt diff --git a/core/embed/models/D002/config.mk b/core/embed/models/D002/config.mk new file mode 100644 index 0000000000..61898195f3 --- /dev/null +++ b/core/embed/models/D002/config.mk @@ -0,0 +1,3 @@ +MCU = STM32U5 +OPENOCD_TARGET = target/stm32u5x.cfg +LAYOUT_FEATURE = layout_bolt diff --git a/core/embed/models/T2B1/config.mk b/core/embed/models/T2B1/config.mk new file mode 100644 index 0000000000..e282a42cc8 --- /dev/null +++ b/core/embed/models/T2B1/config.mk @@ -0,0 +1,3 @@ +MCU = STM32F4 +OPENOCD_TARGET = target/stm32f4x.cfg +LAYOUT_FEATURE = layout_caesar diff --git a/core/embed/models/T2T1/config.mk b/core/embed/models/T2T1/config.mk new file mode 100644 index 0000000000..a93e37f112 --- /dev/null +++ b/core/embed/models/T2T1/config.mk @@ -0,0 +1,3 @@ +MCU = STM32F4 +OPENOCD_TARGET = target/stm32f4x.cfg +LAYOUT_FEATURE = layout_bolt diff --git a/core/embed/models/T3B1/config.mk b/core/embed/models/T3B1/config.mk new file mode 100644 index 0000000000..30658d2088 --- /dev/null +++ b/core/embed/models/T3B1/config.mk @@ -0,0 +1,3 @@ +MCU = STM32U5 +OPENOCD_TARGET = target/stm32u5x.cfg +LAYOUT_FEATURE = layout_caesar diff --git a/core/embed/models/T3T1/config.mk b/core/embed/models/T3T1/config.mk new file mode 100644 index 0000000000..c3bbe98f51 --- /dev/null +++ b/core/embed/models/T3T1/config.mk @@ -0,0 +1,3 @@ +MCU = STM32U5 +OPENOCD_TARGET = target/stm32u5x.cfg +LAYOUT_FEATURE = layout_delizia diff --git a/core/embed/models/T3W1/config.mk b/core/embed/models/T3W1/config.mk new file mode 100644 index 0000000000..61898195f3 --- /dev/null +++ b/core/embed/models/T3W1/config.mk @@ -0,0 +1,3 @@ +MCU = STM32U5 +OPENOCD_TARGET = target/stm32u5x.cfg +LAYOUT_FEATURE = layout_bolt